Sandro Bonazzola has uploaded a new change for review.
Change subject: packaging: provide EPEL7 repos on 3.4.
......................................................................
packaging: provide EPEL7 repos on 3.4.
Change-Id: I326a28fb17fcf0a5b30e38f11f20712e970a207f
Signed-off-by: Sandro Bonazzola <sbona...@redhat.com>
---
M ovirt-release-3.4/Makefile.am
M ovirt-release-3.4/configure.ac
R ovirt-release-3.4/ovirt-el6-deps.repo.in
A ovirt-release-3.4/ovirt-el7-deps.repo.in
M ovirt-release-3.4/ovirt-release34.spec.in
5 files changed, 38 insertions(+), 7 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-release refs/changes/87/32587/1
diff --git a/ovirt-release-3.4/Makefile.am b/ovirt-release-3.4/Makefile.am
index 3560093..c890b70 100644
--- a/ovirt-release-3.4/Makefile.am
+++ b/ovirt-release-3.4/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.repo \
$(srcdir)/ovirt-snapshot.repo \
diff --git a/ovirt-release-3.4/configure.ac b/ovirt-release-3.4/configure.ac
index ccf49ba..d9b2e09 100644
--- a/ovirt-release-3.4/configure.ac
+++ b/ovirt-release-3.4/configure.ac
@@ -19,7 +19,7 @@
define([VERSION_MAJOR], [1])
define([VERSION_MINOR], [0])
-define([VERSION_FIX], [2])
+define([VERSION_FIX], [3])
define([VERSION_NUMBER], VERSION_MAJOR[.]VERSION_MINOR[.]VERSION_FIX)
define([VERSION_SUFFIX], [])
define([OVIRT_VERSION_MAJOR], [3])
@@ -39,7 +39,8 @@
AC_CONFIG_FILES([
Makefile
- ovirt-el-deps.repo
+ ovirt-el6-deps.repo
+ ovirt-el7-deps.repo
ovirt-f19-deps.repo
ovirt-release34.spec
ovirt.repo
diff --git a/ovirt-release-3.4/ovirt-el-deps.repo.in
b/ovirt-release-3.4/ovirt-el6-deps.repo.in
similarity index 91%
rename from ovirt-release-3.4/ovirt-el-deps.repo.in
rename to ovirt-release-3.4/ovirt-el6-deps.repo.in
index 0b4e5a0..c8d732c 100644
--- a/ovirt-release-3.4/ovirt-el-deps.repo.in
+++ b/ovirt-release-3.4/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
+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,ioprocess,rubygem-rgen
gpgcheck=1
gpgkey=https://dl.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-6
@@ -13,7 +13,7 @@
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
+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,antlr3,stringtemplate
gpgkey=http://www.jpackage.org/jpackage.asc
[ovirt-@OVIRT_SLOT@-glusterfs-epel]
diff --git a/ovirt-release-3.4/ovirt-el7-deps.repo.in
b/ovirt-release-3.4/ovirt-el7-deps.repo.in
new file mode 100644
index 0000000..bae49de
--- /dev/null
+++ b/ovirt-release-3.4/ovirt-el7-deps.repo.in
@@ -0,0 +1,23 @@
+[ovirt-@OVIRT_SLOT@-epel]
+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,python-ioprocess,ioprocess,python-paramiko,rubygem-rgen
+gpgcheck=1
+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.
+baseurl=http://download.gluster.org/pub/gluster/glusterfs/LATEST/EPEL.repo/epel-$releasever/$basearch/
+enabled=1
+skip_if_unavailable=1
+gpgcheck=0
+
+[ovirt-@OVIRT_SLOT@-glusterfs-noarch-epel]
+name=GlusterFS is a clustered file-system capable of scaling to several
petabytes.
+baseurl=http://download.gluster.org/pub/gluster/glusterfs/LATEST/EPEL.repo/epel-$releasever/noarch
+enabled=1
+skip_if_unavailable=1
+gpgcheck=0
diff --git a/ovirt-release-3.4/ovirt-release34.spec.in
b/ovirt-release-3.4/ovirt-release34.spec.in
index b3fb0ab..3beb5ef 100644
--- a/ovirt-release-3.4/ovirt-release34.spec.in
+++ b/ovirt-release-3.4/ovirt-release34.spec.in
@@ -87,8 +87,11 @@
-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
+ # 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"
fi
@@ -125,6 +128,9 @@
%changelog
+* Mon Sep 8 2014 Sandro Bonazzola <sbona...@redhat.com> - 1.0.3-1
+-1.0.3 - provide EPEL 7 repositories
+
* Fri Jul 18 2014 Sandro Bonazzola <sbona...@redhat.com> - 1.0.2-1
- 1.0.2 - provide snapshot repositories
--
To view, visit http://gerrit.ovirt.org/32587
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I326a28fb17fcf0a5b30e38f11f20712e970a207f
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-release
Gerrit-Branch: master
Gerrit-Owner: Sandro Bonazzola <sbona...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
