Sandro Bonazzola has uploaded a new change for review. Change subject: packaging: require epel-release on el6 ......................................................................
packaging: require epel-release on el6 - Requires epel-release rpm on el6 based distributions. Change-Id: I5cf52629b4ba8cbe2e1fd48a9f6b1393163a1641 Bug-Url: https://bugzilla.redhat.com/1018947 Signed-off-by: Sandro Bonazzola <[email protected]> --- M Makefile.am M configure.ac D ovirt-epel.repo M ovirt-release.spec.in 4 files changed, 13 insertions(+), 16 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-release refs/changes/82/25882/1 diff --git a/Makefile.am b/Makefile.am index 10a2948..46e7a4b 100644 --- a/Makefile.am +++ b/Makefile.am @@ -29,7 +29,6 @@ dist_pkgdata_DATA = \ $(srcdir)/fedora-virt-preview.repo \ $(srcdir)/glusterfs-epel.repo \ - $(srcdir)/ovirt-epel.repo \ $(srcdir)/ovirt-nightly.repo.in \ $(srcdir)/ovirt.repo.in \ $(NULL) diff --git a/configure.ac b/configure.ac index 709e945..f1e224c 100644 --- a/configure.ac +++ b/configure.ac @@ -19,7 +19,7 @@ define([VERSION_MAJOR], [11]) define([VERSION_MINOR], [1]) -define([VERSION_FIX], [0]) +define([VERSION_FIX], [1]) define([VERSION_NUMBER], VERSION_MAJOR[.]VERSION_MINOR[.]VERSION_FIX) define([VERSION_SUFFIX], []) diff --git a/ovirt-epel.repo b/ovirt-epel.repo deleted file mode 100644 index 15aec31..0000000 --- a/ovirt-epel.repo +++ /dev/null @@ -1,7 +0,0 @@ -[ovirt-epel] -name=Extra Packages for Enterprise Linux 6 - $basearch -#baseurl=http://download.fedoraproject.org/pub/epel/6/$basearch -mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=epel-6&arch=$basearch -failovermethod=priority -enabled=1 -includepkgs=epel-release diff --git a/ovirt-release.spec.in b/ovirt-release.spec.in index 8593f16..ce4ddeb 100644 --- a/ovirt-release.spec.in +++ b/ovirt-release.spec.in @@ -60,7 +60,14 @@ touch "%{buildroot}%{_sysconfdir}"/yum.repos.d/ovirt.repo touch "%{buildroot}%{_sysconfdir}"/yum.repos.d/fedora-virt-preview.repo touch "%{buildroot}%{_sysconfdir}"/yum.repos.d/glusterfs-epel.repo -touch "%{buildroot}%{_sysconfdir}"/yum.repos.d/ovirt-epel.repo + +%pre +if rpm --eval "%%dist" | grep -qFi 'el'; then + if ! rpm -q --quiet epel-release ; then + echo "you need epel-release rpm!" >&2 + exit 1 + fi +fi %post @@ -88,11 +95,6 @@ install -m 644 "%{_datadir}/%{package_name}/$ADDITIONAL_REPO" "%{_sysconfdir}/yum.repos.d/$ADDITIONAL_REPO" -if [ "$DIST" == "EL" ] ; then -#Can't explicitly require epel-release, so adding epel-release to available packages -#This will allow "yum install epel-release". - install -m 644 "%{_datadir}/%{package_name}/ovirt-epel.repo" "%{_sysconfdir}/yum.repos.d/ovirt-epel.repo" -fi %files %defattr(-,root,root,-) @@ -101,9 +103,12 @@ %ghost %config(noreplace) %{_sysconfdir}/yum.repos.d/ovirt.repo %ghost %config(noreplace,missingok) %{_sysconfdir}/yum.repos.d/fedora-virt-preview.repo %ghost %config(noreplace,missingok) %{_sysconfdir}/yum.repos.d/glusterfs-epel.repo -%ghost %config(noreplace,missingok) %{_sysconfdir}/yum.repos.d/ovirt-epel.repo %changelog +* Wed Mar 19 2014 Sandro Bonazzola <[email protected]> - 11.1.1-1 +- Requires epel-release rpm on el6 based distributions. +- Resolves: BZ#1018947 + * Mon Mar 10 2014 Sandro Bonazzola <[email protected]> - 11.1.0-1 - Splitted nightly builds in separate ovirt-nightly.repo file. - Added ovirt-3.4-stable and ovirt-3.3-stable repositories. -- To view, visit http://gerrit.ovirt.org/25882 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I5cf52629b4ba8cbe2e1fd48a9f6b1393163a1641 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
