Sandro Bonazzola has uploaded a new change for review. Change subject: packaging: fix conflicts with ovirt-release34 ......................................................................
packaging: fix conflicts with ovirt-release34 fixes file /etc/pki/rpm-gpg/RPM-GPG-ovirt from install of ovirt-release35-001-0.0.alpha1.noarch conflicts with file from package ovirt-release34-1.0.0-1.noarch Change-Id: I0b07bd273b9dc88224d4582e3d9c976230ce0c73 Signed-off-by: Sandro Bonazzola <[email protected]> --- M ovirt-release-3.5/ovirt-release35.spec.in M ovirt-release-3.5/ovirt.repo.in 2 files changed, 3 insertions(+), 3 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-release refs/changes/59/27759/1 diff --git a/ovirt-release-3.5/ovirt-release35.spec.in b/ovirt-release-3.5/ovirt-release35.spec.in index 02cb178..5299346 100644 --- a/ovirt-release-3.5/ovirt-release35.spec.in +++ b/ovirt-release-3.5/ovirt-release35.spec.in @@ -58,7 +58,7 @@ #Allow ghost files install -d 755 "%{buildroot}%{_sysconfdir}/yum.repos.d" install -d "%{buildroot}%{_sysconfdir}/pki/rpm-gpg" -install -m 644 "%{SOURCE1}" "%{buildroot}%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-ovirt" +install -m 644 "%{SOURCE1}" "%{buildroot}%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-ovirt-%{ovirt_version}" touch "%{buildroot}%{_sysconfdir}/yum.repos.d/ovirt-%{ovirt_version}.repo" touch "%{buildroot}%{_sysconfdir}/yum.repos.d/ovirt-%{ovirt_version}-dependencies.repo" @@ -86,7 +86,7 @@ %files %defattr(-,root,root,-) %{_datadir}/%{package_name}/ -%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-ovirt +%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-ovirt-%{ovirt_version} # We do not know what distribution we are installed at, # we copy the actual files at %post, but still wants this package to own them. # %ghost in this case solves that issue diff --git a/ovirt-release-3.5/ovirt.repo.in b/ovirt-release-3.5/ovirt.repo.in index bea8351..7327562 100644 --- a/ovirt-release-3.5/ovirt.repo.in +++ b/ovirt-release-3.5/ovirt.repo.in @@ -5,4 +5,4 @@ enabled=1 skip_if_unavailable=1 gpgcheck=1 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-ovirt +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-ovirt-@OVIRT_SLOT@ -- To view, visit http://gerrit.ovirt.org/27759 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I0b07bd273b9dc88224d4582e3d9c976230ce0c73 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-release Gerrit-Branch: master Gerrit-Owner: Sandro Bonazzola <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
