Sandro Bonazzola has uploaded a new change for review. Change subject: Updated EL dependencies repo ......................................................................
Updated EL dependencies repo - provide EL7 dependencies for 3.5 - add python-ioprocess from EPEL repository for vdsm on 3.5 and master Change-Id: I1c2dba4d15c807635911c41724329c0e02669df4 Bug-Url: https://bugzilla.redhat.com/1124802 Signed-off-by: Sandro Bonazzola <[email protected]> --- M ovirt-release-3.5/Makefile.am M ovirt-release-3.5/configure.ac R ovirt-release-3.5/ovirt-el6-deps.repo.in C ovirt-release-3.5/ovirt-el7-deps.repo.in M ovirt-release-3.5/ovirt-release35.spec.in M ovirt-release-master/ovirt-el6-deps.repo.in M ovirt-release-master/ovirt-el7-deps.repo.in 7 files changed, 23 insertions(+), 23 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-release refs/changes/21/30921/1 diff --git a/ovirt-release-3.5/Makefile.am b/ovirt-release-3.5/Makefile.am index 9123dae..82a0e17 100644 --- a/ovirt-release-3.5/Makefile.am +++ b/ovirt-release-3.5/Makefile.am @@ -26,7 +26,8 @@ $(NULL) pkgdata_DATA = \ - $(srcdir)/ovirt-el-deps.repo \ + $(srcdir)/ovirt-el6-deps.repo \ + $(srcdir)/ovirt-el7-deps.repo \ $(srcdir)/ovirt-f19-deps.repo \ $(srcdir)/ovirt-f20-deps.repo \ $(srcdir)/ovirt.repo \ diff --git a/ovirt-release-3.5/configure.ac b/ovirt-release-3.5/configure.ac index 7c691fe..84a9295 100644 --- a/ovirt-release-3.5/configure.ac +++ b/ovirt-release-3.5/configure.ac @@ -19,14 +19,14 @@ define([VERSION_NUMBER], [001]) -define([VERSION_SUFFIX], [_beta2]) +define([VERSION_SUFFIX], [_rc1]) define([OVIRT_VERSION_MAJOR], [3]) define([OVIRT_VERSION_MINOR], [5]) AC_INIT([ovirt-release][]OVIRT_VERSION_MAJOR[]OVIRT_VERSION_MINOR, VERSION_NUMBER[]VERSION_SUFFIX, [[email protected]]) PACKAGE_RPM_VERSION="VERSION_NUMBER" -PACKAGE_RPM_RELEASE="0.3.$(echo VERSION_SUFFIX | sed 's/^_//')" +PACKAGE_RPM_RELEASE="0.4.$(echo VERSION_SUFFIX | sed 's/^_//')" OVIRT_SLOT="OVIRT_VERSION_MAJOR.OVIRT_VERSION_MINOR" AC_SUBST([PACKAGE_RPM_VERSION]) AC_SUBST([PACKAGE_RPM_RELEASE]) @@ -37,7 +37,8 @@ AC_CONFIG_FILES([ Makefile - ovirt-el-deps.repo + ovirt-el6-deps.repo + ovirt-el7-deps.repo ovirt-f19-deps.repo ovirt-f20-deps.repo ovirt-release35.spec diff --git a/ovirt-release-3.5/ovirt-el-deps.repo.in b/ovirt-release-3.5/ovirt-el6-deps.repo.in similarity index 95% rename from ovirt-release-3.5/ovirt-el-deps.repo.in rename to ovirt-release-3.5/ovirt-el6-deps.repo.in index 8ca4b7b..de144a1 100644 --- a/ovirt-release-3.5/ovirt-el-deps.repo.in +++ b/ovirt-release-3.5/ovirt-el6-deps.repo.in @@ -4,7 +4,7 @@ mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=epel-6&arch=$basearch failovermethod=priority enabled=1 -includepkgs=epel-release,python-uinput,puppet,python-lockfile,python-cpopen,python-ordereddict,python-pthreading,python-inotify,python-argparse,novnc,python-ply,python-kitchen,python-daemon,python-websockify,livecd-tools,spice-html5,mom,python-IPy +includepkgs=epel-release,python-uinput,puppet,python-lockfile,python-cpopen,python-ordereddict,python-pthreading,python-inotify,python-argparse,novnc,python-ply,python-kitchen,python-daemon,python-websockify,livecd-tools,spice-html5,mom,python-IPy,python-ioprocess gpgcheck=1 gpgkey=https://dl.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-6 diff --git a/ovirt-release-3.5/ovirt-el-deps.repo.in b/ovirt-release-3.5/ovirt-el7-deps.repo.in similarity index 60% copy from ovirt-release-3.5/ovirt-el-deps.repo.in copy to ovirt-release-3.5/ovirt-el7-deps.repo.in index 8ca4b7b..2ccf0cc 100644 --- a/ovirt-release-3.5/ovirt-el-deps.repo.in +++ b/ovirt-release-3.5/ovirt-el7-deps.repo.in @@ -1,20 +1,12 @@ [ovirt-@OVIRT_SLOT@-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 +name=Extra Packages for Enterprise Linux 7 - $basearch +#baseurl=http://download.fedoraproject.org/pub/epel/7/$basearch +mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=epel-7&arch=$basearch failovermethod=priority enabled=1 -includepkgs=epel-release,python-uinput,puppet,python-lockfile,python-cpopen,python-ordereddict,python-pthreading,python-inotify,python-argparse,novnc,python-ply,python-kitchen,python-daemon,python-websockify,livecd-tools,spice-html5,mom,python-IPy +includepkgs=epel-release,python-uinput,puppet,python-lockfile,python-cpopen,python-ordereddict,python-pthreading,python-inotify,python-argparse,novnc,python-ply,python-kitchen,python-daemon,python-websockify,livecd-tools,spice-html5,mom,python-IPy,python-ioprocess gpgcheck=1 -gpgkey=https://dl.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-6 - -[ovirt-@[email protected]] -name=JPackage 6.0, for generic -mirrorlist=http://www.jpackage.org/mirrorlist.php?dist=generic&type=free&release=6.0 -enabled=1 -gpgcheck=1 -includepkgs=dom4j,isorelax,jaxen,jdom,msv,msv-xsdlib,relaxngDatatype,servicemix-specs,tomcat5-servlet-2.4-api,ws-jaxme,xalan-j2,xml-commons,xml-commons-jaxp-1.2-apis,xml-commons-resolver11,xom,xpp2,xpp3 -gpgkey=http://www.jpackage.org/jpackage.asc +gpgkey=https://dl.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-7 [ovirt-@OVIRT_SLOT@-glusterfs-epel] name=GlusterFS is a clustered file-system capable of scaling to several petabytes. @@ -32,7 +24,7 @@ [ovirt-@OVIRT_SLOT@-patternfly1-noarch-epel] name=Copr repo for patternfly1 owned by patternfly -baseurl=http://copr-be.cloud.fedoraproject.org/results/patternfly/patternfly1/epel-6-$basearch/ +baseurl=http://copr-be.cloud.fedoraproject.org/results/patternfly/patternfly1/epel-7-$basearch/ enabled=1 skip_if_unavailable=1 gpgcheck=0 diff --git a/ovirt-release-3.5/ovirt-release35.spec.in b/ovirt-release-3.5/ovirt-release35.spec.in index cae7931..5ccd0e5 100644 --- a/ovirt-release-3.5/ovirt-release35.spec.in +++ b/ovirt-release-3.5/ovirt-release35.spec.in @@ -87,8 +87,10 @@ -e "s/@DIST@/${DIST}/g" \ <"%{_datadir}/%{package_name}/ovirt.repo" > "%{_sysconfdir}/yum.repos.d/ovirt-%{ovirt_version}.repo" -if [ "${DIST}" == "el" ] ; then - install -m 644 "%{_datadir}/%{package_name}/ovirt-el-deps.repo" "%{_sysconfdir}/yum.repos.d/ovirt-%{ovirt_version}-dependencies.repo" +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 + 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" elif [ "${DISTVER}" == "fc20" ]; then @@ -127,6 +129,10 @@ %changelog +* Fri Aug 1 2014 Sandro Bonazzola <[email protected]> - 001-0.4.rc1 +- provide EL7 dependencies +- add python-ioprocess from EPEL repository for vdsm. + * Fri Jul 18 2014 Sandro Bonazzola <[email protected]> - 001-0.3.beta2 - provide snapshot repositories diff --git a/ovirt-release-master/ovirt-el6-deps.repo.in b/ovirt-release-master/ovirt-el6-deps.repo.in index 8ca4b7b..de144a1 100644 --- a/ovirt-release-master/ovirt-el6-deps.repo.in +++ b/ovirt-release-master/ovirt-el6-deps.repo.in @@ -4,7 +4,7 @@ mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=epel-6&arch=$basearch failovermethod=priority enabled=1 -includepkgs=epel-release,python-uinput,puppet,python-lockfile,python-cpopen,python-ordereddict,python-pthreading,python-inotify,python-argparse,novnc,python-ply,python-kitchen,python-daemon,python-websockify,livecd-tools,spice-html5,mom,python-IPy +includepkgs=epel-release,python-uinput,puppet,python-lockfile,python-cpopen,python-ordereddict,python-pthreading,python-inotify,python-argparse,novnc,python-ply,python-kitchen,python-daemon,python-websockify,livecd-tools,spice-html5,mom,python-IPy,python-ioprocess gpgcheck=1 gpgkey=https://dl.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-6 diff --git a/ovirt-release-master/ovirt-el7-deps.repo.in b/ovirt-release-master/ovirt-el7-deps.repo.in index 03ec0c3..2ccf0cc 100644 --- a/ovirt-release-master/ovirt-el7-deps.repo.in +++ b/ovirt-release-master/ovirt-el7-deps.repo.in @@ -4,7 +4,7 @@ mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=epel-7&arch=$basearch failovermethod=priority enabled=1 -includepkgs=epel-release,python-uinput,puppet,python-lockfile,python-cpopen,python-ordereddict,python-pthreading,python-inotify,python-argparse,novnc,python-ply,python-kitchen,python-daemon,python-websockify,livecd-tools,spice-html5,mom,python-IPy +includepkgs=epel-release,python-uinput,puppet,python-lockfile,python-cpopen,python-ordereddict,python-pthreading,python-inotify,python-argparse,novnc,python-ply,python-kitchen,python-daemon,python-websockify,livecd-tools,spice-html5,mom,python-IPy,python-ioprocess gpgcheck=1 gpgkey=https://dl.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-7 -- To view, visit http://gerrit.ovirt.org/30921 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I1c2dba4d15c807635911c41724329c0e02669df4 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
