Sandro Bonazzola has uploaded a new change for review. Change subject: packaging: add required packages... ......................................................................
packaging: add required packages... Add packages required for oVirt repository closure. Add also libvirt from Fedora Virt Preview on Fedora 19 allowing 3.4 cluster compatibility for VDSM. Change-Id: Ib357d7066970496e94f45e19b931fe7b381ef1bc Signed-off-by: Sandro Bonazzola <[email protected]> --- M Makefile.am M configure.ac D fedora-virt-preview.repo D glusterfs-epel.repo A ovirt-el-deps.repo D ovirt-epel.repo A ovirt-f19-deps.repo M ovirt-release.spec.in 8 files changed, 54 insertions(+), 69 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-release refs/changes/30/26330/1 diff --git a/Makefile.am b/Makefile.am index 10a2948..6009a19 100644 --- a/Makefile.am +++ b/Makefile.am @@ -27,9 +27,8 @@ $(NULL) dist_pkgdata_DATA = \ - $(srcdir)/fedora-virt-preview.repo \ - $(srcdir)/glusterfs-epel.repo \ - $(srcdir)/ovirt-epel.repo \ + $(srcdir)/ovirt-el-deps.repo \ + $(srcdir)/ovirt-f19-deps.repo \ $(srcdir)/ovirt-nightly.repo.in \ $(srcdir)/ovirt.repo.in \ $(NULL) diff --git a/configure.ac b/configure.ac index 709e945..f5c87b2 100644 --- a/configure.ac +++ b/configure.ac @@ -18,7 +18,7 @@ dnl define([VERSION_MAJOR], [11]) -define([VERSION_MINOR], [1]) +define([VERSION_MINOR], [2]) define([VERSION_FIX], [0]) define([VERSION_NUMBER], VERSION_MAJOR[.]VERSION_MINOR[.]VERSION_FIX) define([VERSION_SUFFIX], []) diff --git a/fedora-virt-preview.repo b/fedora-virt-preview.repo deleted file mode 100644 index 654d40a..0000000 --- a/fedora-virt-preview.repo +++ /dev/null @@ -1,23 +0,0 @@ -# Place this file in your /etc/yum.repos.d/ directory - -[fedora-virt-preview] -name=Virtualization packages from Rawhide built for latest Fedora -baseurl=http://fedorapeople.org/groups/virt/virt-preview/fedora-$releasever/$basearch -enabled=0 -skip_if_unavailable=1 -gpgcheck=0 - -[fedora-virt-preview-debuginfo] -name=Fedora $releasever - $basearch - Debug -name=Virtualization packages from Rawhide built for latest Fedora - Debug -baseurl=http://fedorapeople.org/groups/virt/virt-preview/fedora-$releasever/debuginfo -enabled=0 -skip_if_unavailable=1 -gpgcheck=0 - -[fedora-virt-preview-source] -name=Virtualization packages from Rawhide built for latest Fedora - Source -baseurl=http://fedorapeople.org/groups/virt/virt-preview/fedora-$releasever/SRPMS -enabled=0 -skip_if_unavailable=1 -gpgcheck=0 diff --git a/glusterfs-epel.repo b/glusterfs-epel.repo deleted file mode 100644 index 015ad0b..0000000 --- a/glusterfs-epel.repo +++ /dev/null @@ -1,22 +0,0 @@ -# Place this file in your /etc/yum.repos.d/ directory - -[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 - -[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 - -[glusterfs-source-epel] -name=GlusterFS is a clustered file-system capable of scaling to several petabytes. - Source -baseurl=http://download.gluster.org/pub/gluster/glusterfs/LATEST/EPEL.repo/epel-$releasever/SRPMS -enabled=0 -skip_if_unavailable=1 -gpgcheck=0 diff --git a/ovirt-el-deps.repo b/ovirt-el-deps.repo new file mode 100644 index 0000000..fd5c02e --- /dev/null +++ b/ovirt-el-deps.repo @@ -0,0 +1,29 @@ +[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,python-inotify +gpgcheck=1 + +[jpackage-6.0-generic] +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 + +[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 + +[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-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-f19-deps.repo b/ovirt-f19-deps.repo new file mode 100644 index 0000000..3f47b52 --- /dev/null +++ b/ovirt-f19-deps.repo @@ -0,0 +1,8 @@ + +[ovirt-fedora-virt-preview] +name=Virtualization packages from Rawhide built for latest Fedora +baseurl=http://fedorapeople.org/groups/virt/virt-preview/fedora-$releasever/$basearch +enabled=1 +skip_if_unavailable=1 +gpgcheck=0 +includepkgs=libvirt* diff --git a/ovirt-release.spec.in b/ovirt-release.spec.in index 8593f16..90522af 100644 --- a/ovirt-release.spec.in +++ b/ovirt-release.spec.in @@ -58,9 +58,8 @@ #Allow ghost files install -d 755 "%{buildroot}%{_sysconfdir}"/yum.repos.d 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 +touch "%{buildroot}%{_sysconfdir}"/yum.repos.d/ovirt-el-deps.repo +touch "%{buildroot}%{_sysconfdir}"/yum.repos.d/ovirt-f19-deps.repo %post @@ -83,27 +82,29 @@ -e "s/@DISTVER@/${DISTVER}/g" \ <"%{_datadir}/%{package_name}/ovirt-nightly.repo.in" >%{_sysconfdir}/yum.repos.d/ovirt-nightly.repo -ADDITIONAL_REPO="fedora-virt-preview.repo" -[ "$DIST" == "EL" ] && ADDITIONAL_REPO="glusterfs-epel.repo" - -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" + install -m 644 "%{_datadir}/%{package_name}/ovirt-el-deps.repo" "%{_sysconfdir}/yum.repos.d/ovirt-el-deps.repo" fi + +if rpm --eval "%%dist" | grep -qFi 'fc19'; then + install -m 644 "%{_datadir}/%{package_name}/ovirt-f19-deps.repo" "%{_sysconfdir}/yum.repos.d/ovirt-f19-deps.repo" +fi + + %files %defattr(-,root,root,-) %doc COPYING %{_datadir}/%{package_name}/ %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 +%ghost %config(noreplace,missingok) %{_sysconfdir}/yum.repos.d/ovirt-f19-deps.repo +%ghost %config(noreplace,missingok) %{_sysconfdir}/yum.repos.d/ovirt-el-deps.repo %changelog +* Tue Apr 1 2014 Sandro Bonazzola <[email protected]> - 11.2.0-1 +- Added repos for allowing dep resolution on packages in external repos + * 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/26330 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ib357d7066970496e94f45e19b931fe7b381ef1bc 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
