Sandro Bonazzola has uploaded a new change for review.
Change subject: Unify ovirt-release-fedora and ovirt-release-el6
......................................................................
Unify ovirt-release-fedora and ovirt-release-el6
- detect and configure repositories in %post
- updated build scripts conforming to the new structure
- cleaned up build scripts
Change-Id: Ib6b1c775e7afe36ef146fcfc2b7fed37f054a0c5
Signed-off-by: Sandro Bonazzola <sbona...@redhat.com>
---
M .gitignore
M Makefile.am
M configure.ac
D el6-ovirt.repo
D fedora-ovirt.repo
A ovirt-epel.repo
M ovirt-release.spec.in
A ovirt.repo.in
8 files changed, 126 insertions(+), 170 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-release refs/changes/61/23661/1
diff --git a/.gitignore b/.gitignore
index 1a90b9b..c33e22d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,5 +7,4 @@
configure
install-sh
missing
-*tar.gz
ovirt-release.spec
diff --git a/Makefile.am b/Makefile.am
index 4b9b666..a73eeb5 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -19,31 +19,18 @@
AUTOMAKE_OPTIONS = foreign 1.9
-OVIRT_CACHE_DIR ?= $(HOME)/ovirt-cache
-
EXTRA_DIST = \
+ autogen.sh \
COPYING \
- fedora-ovirt.repo \
- fedora-virt-preview.repo \
- el6-ovirt.repo \
- glusterfs-epel.repo \
- ovirt-release.spec \
- ovirt-release.spec.in
+ ovirt-release.spec \
+ ovirt-release.spec.in \
+ $(NULL)
-DISTCLEANFILES = $(PACKAGE)-$(VERSION).tar.gz
-
-rpms: dist
- rpmbuild $(RPM_FLAGS) -ta $(distdir).tar.gz
-
-srpms: dist
- rpmbuild $(RPM_FLAGS) -ts $(distdir).tar.gz
-
-publish: rpms
- mkdir -p $(OVIRT_CACHE_DIR)
- rsync -aq $(shell rpm --eval '%{_rpmdir}')/ $(OVIRT_CACHE_DIR)/ovirt/
- rsync -aq $(shell rpm --eval '%{_srcrpmdir}')/
$(OVIRT_CACHE_DIR)/ovirt/src
- createrepo $(OVIRT_CACHE_DIR)/ovirt
-
-.PHONY: rpms publish srpms
+dist_pkgdata_DATA = \
+ $(srcdir)/fedora-virt-preview.repo \
+ $(srcdir)/glusterfs-epel.repo \
+ $(srcdir)/ovirt-epel.repo \
+ $(srcdir)/ovirt.repo.in \
+ $(NULL)
# vim: ts=2
diff --git a/configure.ac b/configure.ac
index 4003e4a..0b4f5ea 100644
--- a/configure.ac
+++ b/configure.ac
@@ -17,16 +17,16 @@
dnl Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
USA
dnl
-define([VERSION_MAJOR], [10])
+define([VERSION_MAJOR], [11])
define([VERSION_MINOR], [0])
-define([VERSION_FIX], [1])
+define([VERSION_FIX], [0])
define([VERSION_NUMBER], VERSION_MAJOR[.]VERSION_MINOR[.]VERSION_FIX)
define([VERSION_SUFFIX], [])
AC_INIT([ovirt-release], VERSION_NUMBER[]VERSION_SUFFIX, [us...@ovirt.org])
PACKAGE_RPM_VERSION="VERSION_NUMBER"
-PACKAGE_RPM_RELEASE="2$(echo VERSION_SUFFIX | sed 's/^_//')"
+PACKAGE_RPM_RELEASE="1$(echo VERSION_SUFFIX | sed 's/^_//')"
AC_SUBST([PACKAGE_RPM_VERSION])
AC_SUBST([PACKAGE_RPM_RELEASE])
diff --git a/el6-ovirt.repo b/el6-ovirt.repo
deleted file mode 100644
index 4fd6361..0000000
--- a/el6-ovirt.repo
+++ /dev/null
@@ -1,48 +0,0 @@
-[ovirt-stable]
-name=Older Stable builds of the oVirt project
-baseurl=http://ovirt.org/releases/stable/rpm/EL/$releasever/
-enabled=1
-skip_if_unavailable=1
-gpgcheck=0
-
-[ovirt-3.3.2]
-name=oVirt 3.3.2 release
-baseurl=http://resources.ovirt.org/releases/3.3.2/rpm/EL/$releasever/
-enabled=1
-skip_if_unavailable=1
-gpgcheck=0
-
-[ovirt-updates-testing]
-name=Test Updates builds of the oVirt project
-baseurl=http://ovirt.org/releases/updates-testing/rpm/EL/$releasever/
-enabled=0
-skip_if_unavailable=1
-gpgcheck=0
-
-[ovirt-beta]
-name=Beta builds of the oVirt project
-baseurl=http://ovirt.org/releases/beta/rpm/EL/$releasever/
-enabled=0
-skip_if_unavailable=1
-gpgcheck=0
-
-[ovirt-nightly]
-name=Nightly builds of the oVirt project
-baseurl=http://ovirt.org/releases/nightly/rpm/EL/$releasever/
-enabled=0
-skip_if_unavailable=1
-gpgcheck=0
-
-[ovirt-3.4.0-alpha]
-name=3.4.0 alpha testing repo for the oVirt project
-baseurl=http://ovirt.org/releases/3.4.0-alpha/rpm/EL/$releasever/
-enabled=0
-skip_if_unavailable=1
-gpgcheck=0
-
-[ovirt-3.4.0-prerelease]
-name=Pre release builds of the oVirt 3.4 project
-baseurl=http://resources.ovirt.org/releases/3.4.0_pre/rpm/EL/$releasever/
-enabled=0
-skip_if_unavailable=1
-gpgcheck=0
diff --git a/fedora-ovirt.repo b/fedora-ovirt.repo
deleted file mode 100644
index 0cc0d3d..0000000
--- a/fedora-ovirt.repo
+++ /dev/null
@@ -1,48 +0,0 @@
-[ovirt-stable]
-name=Older Stable builds of the oVirt project
-baseurl=http://ovirt.org/releases/stable/rpm/Fedora/$releasever/
-enabled=1
-skip_if_unavailable=1
-gpgcheck=0
-
-[ovirt-3.3.2]
-name=oVirt 3.3.2 release
-baseurl=http://resources.ovirt.org/releases/3.3.2/rpm/Fedora/$releasever/
-enabled=1
-skip_if_unavailable=1
-gpgcheck=0
-
-[ovirt-updates-testing]
-name=Test Updates builds of the oVirt project
-baseurl=http://ovirt.org/releases/updates-testing/rpm/Fedora/$releasever/
-enabled=0
-skip_if_unavailable=1
-gpgcheck=0
-
-[ovirt-beta]
-name=Beta builds of the oVirt project
-baseurl=http://ovirt.org/releases/beta/rpm/Fedora/$releasever/
-enabled=0
-skip_if_unavailable=1
-gpgcheck=0
-
-[ovirt-nightly]
-name=Nightly builds of the oVirt project
-baseurl=http://ovirt.org/releases/nightly/rpm/Fedora/$releasever/
-enabled=0
-skip_if_unavailable=1
-gpgcheck=0
-
-[ovirt-3.4.0-alpha]
-name=3.4.0 alpha testing repo for the oVirt project
-baseurl=http://ovirt.org/releases/3.4.0-alpha/rpm/Fedora/$releasever/
-enabled=0
-skip_if_unavailable=1
-gpgcheck=0
-
-[ovirt-3.4.0-prerelease]
-name=Pre release builds of the oVirt 3.4 project
-baseurl=http://resources.ovirt.org/releases/3.4.0_pre/rpm/Fedora/$releasever/
-enabled=0
-skip_if_unavailable=1
-gpgcheck=0
diff --git a/ovirt-epel.repo b/ovirt-epel.repo
new file mode 100644
index 0000000..15aec31
--- /dev/null
+++ b/ovirt-epel.repo
@@ -0,0 +1,7 @@
+[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 7773ded..dbb6ed3 100644
--- a/ovirt-release.spec.in
+++ b/ovirt-release.spec.in
@@ -17,78 +17,89 @@
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
#
-%global package_version @PACKAGE_VERSION@
-%global package_name @PACKAGE_NAME@
+%global package_version @PACKAGE_VERSION@
+%global package_name @PACKAGE_NAME@
-Summary: oVirt repository files
Name: %{package_name}
Version: @PACKAGE_RPM_VERSION@
Release: @PACKAGE_RPM_RELEASE@%{?release_suffix}
+Summary: oVirt repository configuration
+Epoch: 0
+Group: System Environment/Base
+
License: ASL 2.0
URL: http://ovirt.org
-Source: %{package_name}-%{package_version}.tar.gz
+Source0:
http://ovirt.org/releases/stable/src/%{package_name}-%{package_version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}
BuildArch: noarch
-Requires: tar
-BuildRequires: automake autoconf
-Epoch: 0
-%package fedora
-Summary: oVirt Repository Files for Fedora systems
-Group: System Environment/Base
-Requires: fedora-release
-Obsoletes: ovirt-release <= 0:4-1
-Provides: ovirt-release = %{epoch}:%{version}-%{release}
-Requires: tar
-
-%package el6
-Summary: oVirt Repository Files for EL6 systems
-Group: System Environment/Base
-Requires: /etc/system-release
-Requires: tar
-Requires: epel-release
+BuildRequires: automake
+BuildRequires: autoconf
+Requires: system-release
+Requires: tar
%description
-should be nothing...
+This package contains the yum configuration for oVirt repositories
-%description fedora
-oVirt repository file required to obtain stable releases, beta,
-and nightly versions for Fedora systems.
-
-%description el6
-oVirt repository file required to obtain stable releases, beta,
-and nightly versions for EL6 based systems.
%prep
-%setup -q -n %{package_name}-%{package_version}
+%setup -q
+
%build
+%configure
+make %{?_smp_mflags}
+
%install
-rm -rf "%{buildroot}"
-install -d 755 "%{buildroot}"/etc/yum.repos.d
-install -m 644 fedora-ovirt.repo "%{buildroot}"/etc/yum.repos.d/ovirt.repo
-install -m 644 fedora-virt-preview.repo
"%{buildroot}"/etc/yum.repos.d/fedora-virt-preview.repo
-install -m 644 el6-ovirt.repo "%{buildroot}"/etc/yum.repos.d
-install -m 644 glusterfs-epel.repo "%{buildroot}"/etc/yum.repos.d
+rm -rf $RPM_BUILD_ROOT
+%make_install
+#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
-%clean
-rm -rf "%{buildroot}"
+%post
-%files fedora
+# Adjust repos as per dist and version
+DIST=Fedora
+#Fedora is good for both Fedora and Generic (and probably other based on
Fedora)
+#Handling EL exception only (for now)
+if grep -qFi 'CentOS' /etc/system-release; then
+ DIST=EL
+elif grep -qFi 'Red Hat' /etc/system-release; then
+ DIST=EL
+fi
+
+sed -e "s/@DIST@/$DIST/g" <"%{_datadir}/%{package_name}/ovirt.repo.in"
>%{_sysconfdir}/yum.repos.d/ovirt.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"
+fi
+
+%files
%defattr(-,root,root,-)
%doc COPYING
-%config(noreplace) /etc/yum.repos.d/ovirt.repo
-%config(noreplace) /etc/yum.repos.d/fedora-virt-preview.repo
-
-%files el6
-%defattr(-,root,root,-)
-%doc COPYING
-%config(noreplace) /etc/yum.repos.d/el6-ovirt.repo
-%config(noreplace) /etc/yum.repos.d/glusterfs-epel.repo
+%{_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
%changelog
+* Fri Jan 24 2014 Sandro Bonazzola <sbona...@redhat.com> - 11.0.0-1
+- Unify ovirt-release-fedora and ovirt-release-el6
+
* Wed Jan 22 2014 Sandro Bonazzola <sbona...@redhat.com> - 10.0.1-2
- Update the repositories with 3.4.0_pre for testing (disabled by default)
diff --git a/ovirt.repo.in b/ovirt.repo.in
new file mode 100644
index 0000000..a18cfbd
--- /dev/null
+++ b/ovirt.repo.in
@@ -0,0 +1,48 @@
+[ovirt-stable]
+name=oVirt Latest Releases
+baseurl=http://ovirt.org/releases/stable/rpm/@DIST@/$releasever/
+enabled=1
+skip_if_unavailable=0
+gpgcheck=0
+
+[ovirt-3.3.2]
+name=oVirt 3.3.2 Release
+baseurl=http://resources.ovirt.org/releases/3.3.2/rpm/@DIST@/$releasever/
+enabled=1
+skip_if_unavailable=1
+gpgcheck=0
+
+[ovirt-updates-testing]
+name=oVirt 3.3.z Latest Pre Releases (Release Candidate)
+baseurl=http://ovirt.org/releases/updates-testing/rpm/@DIST@/$releasever/
+enabled=0
+skip_if_unavailable=1
+gpgcheck=0
+
+[ovirt-beta]
+name=oVirt 3.3.z Beta Test Releases
+baseurl=http://ovirt.org/releases/beta/rpm/@DIST@/$releasever/
+enabled=0
+skip_if_unavailable=1
+gpgcheck=0
+
+[ovirt-nightly]
+name=oVirt Nightly Test Releases
+baseurl=http://ovirt.org/releases/nightly/rpm/@DIST@/$releasever/
+enabled=0
+skip_if_unavailable=1
+gpgcheck=0
+
+[ovirt-3.4.0-alpha]
+name=oVirt 3.4.0 Alpha Test Releases
+baseurl=http://ovirt.org/releases/3.4.0-alpha/rpm/@DIST@/$releasever/
+enabled=0
+skip_if_unavailable=1
+gpgcheck=0
+
+[ovirt-3.4.0-prerelease]
+name=oVirt 3.4.0 Latest Pre Releases (Beta to Release Candidate)
+baseurl=http://resources.ovirt.org/releases/3.4.0_pre/rpm/@DIST@/$releasever/
+enabled=0
+skip_if_unavailable=1
+gpgcheck=0
--
To view, visit http://gerrit.ovirt.org/23661
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib6b1c775e7afe36ef146fcfc2b7fed37f054a0c5
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
