Sandro Bonazzola has uploaded a new change for review. Change subject: packaging: spec: fix EL7 detection ......................................................................
packaging: spec: fix EL7 detection Change-Id: I04146665776c8ddb223cf42b85f1de9f7e36d320 Signed-off-by: Sandro Bonazzola <[email protected]> --- M ovirt-release-3.5/ovirt-release35.spec.in M ovirt-release-master/ovirt-release-master.spec.in 2 files changed, 4 insertions(+), 2 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-release refs/changes/30/31030/1 diff --git a/ovirt-release-3.5/ovirt-release35.spec.in b/ovirt-release-3.5/ovirt-release35.spec.in index 5ccd0e5..14e63ad 100644 --- a/ovirt-release-3.5/ovirt-release35.spec.in +++ b/ovirt-release-3.5/ovirt-release35.spec.in @@ -89,7 +89,8 @@ if [ "${DISTVER}" == "el6" ] ; then install -m 644 "%{_datadir}/%{package_name}/ovirt-el6-deps.repo" "%{_sysconfdir}/yum.repos.d/ovirt-%{ovirt_version}-dependencies.repo" -elif [ "${DISTVER}" == "el7" ] ; then +elif [ "${DISTVER/.*/}" == "el7" ] ; then + # On CentOS 7 ${DISTVER} is "el7.centos" install -m 644 "%{_datadir}/%{package_name}/ovirt-el7-deps.repo" "%{_sysconfdir}/yum.repos.d/ovirt-%{ovirt_version}-dependencies.repo" elif [ "${DISTVER}" == "fc19" ]; then install -m 644 "%{_datadir}/%{package_name}/ovirt-f19-deps.repo" "%{_sysconfdir}/yum.repos.d/ovirt-%{ovirt_version}-dependencies.repo" diff --git a/ovirt-release-master/ovirt-release-master.spec.in b/ovirt-release-master/ovirt-release-master.spec.in index 780b4d3..3343949 100644 --- a/ovirt-release-master/ovirt-release-master.spec.in +++ b/ovirt-release-master/ovirt-release-master.spec.in @@ -72,7 +72,8 @@ if [ "${DISTVER}" == "el6" ] ; then install -m 644 "%{_datadir}/%{package_name}/ovirt-el6-deps.repo" "%{_sysconfdir}/yum.repos.d/ovirt-%{ovirt_version}-dependencies.repo" -elif [ "${DISTVER}" == "el7" ] ; then +elif [ "${DISTVER/.*/}" == "el7" ] ; then + # On CentOS 7 ${DISTVER} is "el7.centos" install -m 644 "%{_datadir}/%{package_name}/ovirt-el7-deps.repo" "%{_sysconfdir}/yum.repos.d/ovirt-%{ovirt_version}-dependencies.repo" elif [ "${DISTVER}" == "fc19" ]; then install -m 644 "%{_datadir}/%{package_name}/ovirt-f19-deps.repo" "%{_sysconfdir}/yum.repos.d/ovirt-%{ovirt_version}-dependencies.repo" -- To view, visit http://gerrit.ovirt.org/31030 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I04146665776c8ddb223cf42b85f1de9f7e36d320 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
