Sandro Bonazzola has uploaded a new change for review. Change subject: packaging: added snapshot release rpms ......................................................................
packaging: added snapshot release rpms - added snapshot rpm for 3.4 and 3.5 - added initial 3.6/master rpm Change-Id: I0ac9ff1c0ce204ed9578114d5b0a4281a6c696ce Ticket: https://fedorahosted.org/ovirt/ticket/217 Signed-off-by: Sandro Bonazzola <[email protected]> --- M ovirt-release-3.4/Makefile.am M ovirt-release-3.4/configure.ac M ovirt-release-3.4/ovirt-release34.spec.in A ovirt-release-3.4/ovirt-snapshot.repo.in M ovirt-release-3.5/Makefile.am M ovirt-release-3.5/configure.ac M ovirt-release-3.5/ovirt-release35.spec.in A ovirt-release-3.5/ovirt-snapshot.repo.in A ovirt-release-3.6/Makefile.am A ovirt-release-3.6/RPM-GPG-ovirt A ovirt-release-3.6/autogen.sh A ovirt-release-3.6/configure.ac A ovirt-release-3.6/ovirt-el6-deps.repo.in A ovirt-release-3.6/ovirt-el7-deps.repo.in A ovirt-release-3.6/ovirt-f19-deps.repo.in A ovirt-release-3.6/ovirt-f20-deps.repo.in A ovirt-release-3.6/ovirt-release36.spec.in A ovirt-release-3.6/ovirt-snapshot.repo.in 18 files changed, 461 insertions(+), 6 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-release refs/changes/78/30278/1 diff --git a/ovirt-release-3.4/Makefile.am b/ovirt-release-3.4/Makefile.am index 23dafac..3560093 100644 --- a/ovirt-release-3.4/Makefile.am +++ b/ovirt-release-3.4/Makefile.am @@ -29,6 +29,7 @@ $(srcdir)/ovirt-el-deps.repo \ $(srcdir)/ovirt-f19-deps.repo \ $(srcdir)/ovirt.repo \ + $(srcdir)/ovirt-snapshot.repo \ $(NULL) diff --git a/ovirt-release-3.4/configure.ac b/ovirt-release-3.4/configure.ac index 5051083..ccf49ba 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], [1]) +define([VERSION_FIX], [2]) define([VERSION_NUMBER], VERSION_MAJOR[.]VERSION_MINOR[.]VERSION_FIX) define([VERSION_SUFFIX], []) define([OVIRT_VERSION_MAJOR], [3]) @@ -43,5 +43,6 @@ ovirt-f19-deps.repo ovirt-release34.spec ovirt.repo + ovirt-snapshot.repo ]) AC_OUTPUT diff --git a/ovirt-release-3.4/ovirt-release34.spec.in b/ovirt-release-3.4/ovirt-release34.spec.in index 1c0ba4b..b3fb0ab 100644 --- a/ovirt-release-3.4/ovirt-release34.spec.in +++ b/ovirt-release-3.4/ovirt-release34.spec.in @@ -43,6 +43,15 @@ %description This package contains the yum configuration for oVirt repositories +%package snapshot +Summary: oVirt snapshot repository configuration +Group: System Environment/Base +Requires: %{package_name} + + +%description snapshot +This package contains the yum configuration for oVirt snapshot repositories + %prep %setup -q -n "%{package_name}-%{package_version}" @@ -60,6 +69,7 @@ install -d "%{buildroot}%{_sysconfdir}/pki/rpm-gpg" install -m 644 "%{SOURCE1}" "%{buildroot}%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-ovirt" touch "%{buildroot}%{_sysconfdir}/yum.repos.d/ovirt-%{ovirt_version}.repo" +touch "%{buildroot}%{_sysconfdir}/yum.repos.d/ovirt-%{ovirt_version}-snapshot.repo" touch "%{buildroot}%{_sysconfdir}/yum.repos.d/ovirt-%{ovirt_version}-dependencies.repo" %post @@ -83,17 +93,41 @@ install -m 644 "%{_datadir}/%{package_name}/ovirt-f19-deps.repo" "%{_sysconfdir}/yum.repos.d/ovirt-%{ovirt_version}-dependencies.repo" fi +%post snapshot + +# Adjust repos as per dist and version +DIST=fc +#Fedora is good for both Fedora and Generic (and probably other based on Fedora) +#Handling EL exception only (for now) +DISTVER="$(rpm --eval "%%dist"|cut -c2-)" +if rpm --eval "%%dist" | grep -qFi 'el'; then + DIST=el +fi + +sed \ + -e "s/@DIST@/${DIST}/g" \ + <"%{_datadir}/%{package_name}/ovirt-snapshot.repo" > "%{_sysconfdir}/yum.repos.d/ovirt-%{ovirt_version}-snapshot.repo" + + %files %defattr(-,root,root,-) %{_datadir}/%{package_name}/ %{_sysconfdir}/pki/rpm-gpg/RPM-GPG-ovirt # We do not know what distribution we are installed at, -# we copy the actual files at %post, but still wants this package to own them. -# %ghost in this case solves that issue +# we copy the actual files at post, but still wants this package to own them. +# ghost in this case solves that issue %ghost %config(noreplace) %{_sysconfdir}/yum.repos.d/ovirt-%{ovirt_version}.repo %ghost %config(noreplace) %{_sysconfdir}/yum.repos.d/ovirt-%{ovirt_version}-dependencies.repo +%files snapshot +%defattr(-,root,root,-) +%ghost %config(noreplace) %{_sysconfdir}/yum.repos.d/ovirt-%{ovirt_version}-snapshot.repo + + %changelog +* Fri Jul 18 2014 Sandro Bonazzola <[email protected]> - 1.0.2-1 +- 1.0.2 - provide snapshot repositories + * Wed May 14 2014 Sandro Bonazzola <[email protected]> - 1.0.1-1 - 1.0.1 - provide mirrorlist for oVirt repo diff --git a/ovirt-release-3.4/ovirt-snapshot.repo.in b/ovirt-release-3.4/ovirt-snapshot.repo.in new file mode 100644 index 0000000..c698829 --- /dev/null +++ b/ovirt-release-3.4/ovirt-snapshot.repo.in @@ -0,0 +1,15 @@ +[ovirt-@OVIRT_SLOT@-snapshot] +name=Latest oVirt @OVIRT_SLOT@ nightly snapshot +#baseurl=http://resources.ovirt.org/pub/ovirt-@OVIRT_SLOT@-snapshot/rpm/@DIST@$releasever/ +mirrorlist=http://resources.ovirt.org/pub/yum-repo/mirrorlist-ovirt-@OVIRT_SLOT@-snapshot-@DIST@$releasever +enabled=1 +skip_if_unavailable=1 +gpgcheck=0 + +[ovirt-@OVIRT_SLOT@-snapshot-static] +name=Latest oVirt @OVIRT_SLOT@ additional nightly snapshot +#baseurl=http://resources.ovirt.org/pub/ovirt-@OVIRT_SLOT@-snapshot-static/rpm/@DIST@$releasever/ +mirrorlist=http://resources.ovirt.org/pub/yum-repo/mirrorlist-ovirt-@OVIRT_SLOT@-snapshot-static-@DIST@$releasever +enabled=1 +skip_if_unavailable=1 +gpgcheck=0 diff --git a/ovirt-release-3.5/Makefile.am b/ovirt-release-3.5/Makefile.am index 3e7f9aa..9123dae 100644 --- a/ovirt-release-3.5/Makefile.am +++ b/ovirt-release-3.5/Makefile.am @@ -30,6 +30,7 @@ $(srcdir)/ovirt-f19-deps.repo \ $(srcdir)/ovirt-f20-deps.repo \ $(srcdir)/ovirt.repo \ + $(srcdir)/ovirt-snapshot.repo \ $(NULL) diff --git a/ovirt-release-3.5/configure.ac b/ovirt-release-3.5/configure.ac index d6e4f3e..7c691fe 100644 --- a/ovirt-release-3.5/configure.ac +++ b/ovirt-release-3.5/configure.ac @@ -26,7 +26,7 @@ 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.2.$(echo VERSION_SUFFIX | sed 's/^_//')" +PACKAGE_RPM_RELEASE="0.3.$(echo VERSION_SUFFIX | sed 's/^_//')" OVIRT_SLOT="OVIRT_VERSION_MAJOR.OVIRT_VERSION_MINOR" AC_SUBST([PACKAGE_RPM_VERSION]) AC_SUBST([PACKAGE_RPM_RELEASE]) @@ -42,5 +42,6 @@ ovirt-f20-deps.repo ovirt-release35.spec ovirt.repo + ovirt-snapshot.repo ]) AC_OUTPUT diff --git a/ovirt-release-3.5/ovirt-release35.spec.in b/ovirt-release-3.5/ovirt-release35.spec.in index 66aaaef..cae7931 100644 --- a/ovirt-release-3.5/ovirt-release35.spec.in +++ b/ovirt-release-3.5/ovirt-release35.spec.in @@ -43,6 +43,15 @@ %description This package contains the yum configuration for oVirt repositories +%package snapshot +Summary: oVirt snapshot repository configuration +Group: System Environment/Base +Requires: %{package_name} + + +%description snapshot +This package contains the yum configuration for oVirt snapshot repositories + %prep %setup -q -n "%{package_name}-%{package_version}" @@ -60,6 +69,7 @@ install -d "%{buildroot}%{_sysconfdir}/pki/rpm-gpg" install -m 644 "%{SOURCE1}" "%{buildroot}%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-ovirt-%{ovirt_version}" touch "%{buildroot}%{_sysconfdir}/yum.repos.d/ovirt-%{ovirt_version}.repo" +touch "%{buildroot}%{_sysconfdir}/yum.repos.d/ovirt-%{ovirt_version}-snapshot.repo" touch "%{buildroot}%{_sysconfdir}/yum.repos.d/ovirt-%{ovirt_version}-dependencies.repo" %post @@ -85,17 +95,41 @@ install -m 644 "%{_datadir}/%{package_name}/ovirt-f20-deps.repo" "%{_sysconfdir}/yum.repos.d/ovirt-%{ovirt_version}-dependencies.repo" fi +%post snapshot + +# Adjust repos as per dist and version +DIST=fc +#Fedora is good for both Fedora and Generic (and probably other based on Fedora) +#Handling EL exception only (for now) +DISTVER="$(rpm --eval "%%dist"|cut -c2-)" +if rpm --eval "%%dist" | grep -qFi 'el'; then + DIST=el +fi + +sed \ + -e "s/@DIST@/${DIST}/g" \ + <"%{_datadir}/%{package_name}/ovirt-snapshot.repo" > "%{_sysconfdir}/yum.repos.d/ovirt-%{ovirt_version}-snapshot.repo" + + %files %defattr(-,root,root,-) %{_datadir}/%{package_name}/ %{_sysconfdir}/pki/rpm-gpg/RPM-GPG-ovirt-%{ovirt_version} # We do not know what distribution we are installed at, -# we copy the actual files at %post, but still wants this package to own them. -# %ghost in this case solves that issue +# we copy the actual files at post, but still wants this package to own them. +# ghost in this case solves that issue %ghost %config(noreplace) %{_sysconfdir}/yum.repos.d/ovirt-%{ovirt_version}.repo %ghost %config(noreplace) %{_sysconfdir}/yum.repos.d/ovirt-%{ovirt_version}-dependencies.repo +%files snapshot +%defattr(-,root,root,-) +%ghost %config(noreplace) %{_sysconfdir}/yum.repos.d/ovirt-%{ovirt_version}-snapshot.repo + + %changelog +* Fri Jul 18 2014 Sandro Bonazzola <[email protected]> - 001-0.3.beta2 +- provide snapshot repositories + * Wed Jul 16 2014 Sandro Bonazzola <[email protected]> - 001-0.2.beta2 - add python-IPy from EPEL repository for ovirt-node. diff --git a/ovirt-release-3.5/ovirt-snapshot.repo.in b/ovirt-release-3.5/ovirt-snapshot.repo.in new file mode 100644 index 0000000..c698829 --- /dev/null +++ b/ovirt-release-3.5/ovirt-snapshot.repo.in @@ -0,0 +1,15 @@ +[ovirt-@OVIRT_SLOT@-snapshot] +name=Latest oVirt @OVIRT_SLOT@ nightly snapshot +#baseurl=http://resources.ovirt.org/pub/ovirt-@OVIRT_SLOT@-snapshot/rpm/@DIST@$releasever/ +mirrorlist=http://resources.ovirt.org/pub/yum-repo/mirrorlist-ovirt-@OVIRT_SLOT@-snapshot-@DIST@$releasever +enabled=1 +skip_if_unavailable=1 +gpgcheck=0 + +[ovirt-@OVIRT_SLOT@-snapshot-static] +name=Latest oVirt @OVIRT_SLOT@ additional nightly snapshot +#baseurl=http://resources.ovirt.org/pub/ovirt-@OVIRT_SLOT@-snapshot-static/rpm/@DIST@$releasever/ +mirrorlist=http://resources.ovirt.org/pub/yum-repo/mirrorlist-ovirt-@OVIRT_SLOT@-snapshot-static-@DIST@$releasever +enabled=1 +skip_if_unavailable=1 +gpgcheck=0 diff --git a/ovirt-release-3.6/Makefile.am b/ovirt-release-3.6/Makefile.am new file mode 100644 index 0000000..c27149f --- /dev/null +++ b/ovirt-release-3.6/Makefile.am @@ -0,0 +1,37 @@ +# +# ovirt-release -- repo files for oVirt projects +# Copyright (C) 2012-2014 Red Hat, Inc. +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License, or (at your option) any later version. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA +# + +AUTOMAKE_OPTIONS = foreign 1.9 + +EXTRA_DIST = \ + autogen.sh \ + ovirt-release36.spec \ + ovirt-release36.spec.in \ + $(NULL) + +pkgdata_DATA = \ + $(srcdir)/ovirt-el6-deps.repo \ + $(srcdir)/ovirt-el7-deps.repo \ + $(srcdir)/ovirt-f19-deps.repo \ + $(srcdir)/ovirt-f20-deps.repo \ + $(srcdir)/ovirt-snapshot.repo \ + $(NULL) + + +# vim: ts=2 diff --git a/ovirt-release-3.6/RPM-GPG-ovirt b/ovirt-release-3.6/RPM-GPG-ovirt new file mode 100644 index 0000000..790ecf5 --- /dev/null +++ b/ovirt-release-3.6/RPM-GPG-ovirt @@ -0,0 +1,30 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- +Version: GnuPG v1.4.13 (GNU/Linux) + +mQENBFM3+3YBCADTLqGw5hI0whRPeN0hSjpaZ2yNNtVzgqj8/EFQ9IfR7GasHz/4 +kkT3cpKXZygo0AIVEe5dkrcYXF+9C6bowiuGZG+9G6j8MXneunRv7S0mv1mnx7MW +7S1A6MUJ9tyW+4SukDfXYuhTB4o+GrrXJFfZNZza9LoZ7JLVQiqbZFH8qGfnCKuH +0c8u8LOnmYIgzPIlFlYpCOSu6TmETjcif+YLWzJlgrg3DMpnxVLQGDYFlAcxKw1g +MB3IV4s3cYtyAPcH5alKa4VKZ0SZgjvZQb7zs7dm6z2EVUcAyz7Yb6lQpvAM4vKj +blwjwhOTd0WFpTWhNHLG9cev/aQein+hT2NvABEBAAG0F29WaXJ0IDxpbmZyYUBv +dmlydC5vcmc+iQE+BBMBAgAoAhsDBgsJCAcDAgYVCAIJCgsEFgIDAQIeAQIXgAUC +Uz137gUJA8fjWQAKCRCrjE+d/lkMt9W1CAC4rTJ+ExFeFSSzd/CatyCF+ldcmY1x +VRGzuzgVunOiXEwNLu79gCe1lE6GKElv2IWkZovCWCi8ne4dldDNaZuUw4ihqHeY +yeRqcMBnlPoFHAW5dOM+YZlPlwb7UDFWVU7silC5DaKeAhVYNYdgHXgTRDdFq9sh +Sx+6dd4qc1uNajMebTF0TlY8wwhGewkJNBotEYm9ry3a5RgvV1k+JNtQDDC6sgRO +qBheEAoh/nwMETNhaupXbYtoErB+hSY+FO7VLLpnVCNnnU7VZsiCWSUslHCXAiRt +tVtSa3G7pSPOBg071h4U7ZHUa4N2LMW/O+rmzWeqTBY9a5rGJMr6B2KxuQENBFM3 ++3YBCADW+3urGrfjX7PKteKlaHZxQdg4t2XEyB3u/HG9W/yCwqxE2zc7m+DymIyi +jOEHattXBMSgp1CXvJICMhqJDCCtqe3EhHfVAUgJOij/vAX6EAU+vi7j/b6OQyuj +qzSyfZineQLswpuO3nGqH0dXzlQR5DmK+Pkqxi1VQUJWrY/+JvmZ1lhfBdV2NxKY +UMmbBpD1huh/Y/Qm+7zjUm76Z86NdIWBGYTJlqo7znqusInH2/Ar3z4ie6Rhh6e0 +I2BI7PpL/VWhrL2TKOQrU1XUK3JbEun9iYEX2sTBg88AiYfs+dxI6Gv6oYO2pLsv +WiJa3kWBBh8g0tG3V59RL5qQY1bbABEBAAGJAR8EGAECAAkFAlM3+3YCGwwACgkQ +q4xPnf5ZDLe5OAgAqcxzuu6MmEz6HoDZsj57mLoellmGjr6qnCovjzJ8FVPD73z0 +GARPjMeYVGtXB0eZ7WxnpMKroXyrSpHRYky4XYhx73J9iDbZRdO7UUjpQarIRl24 +bW61cMmK7uAxVadpDkJlxlncuukCk7VS3l+3EUK3sus9ChpubPTCWIoyI1/zkNXx +8C964Rih3DcVHIbApaapqKA1C2pyTsWi6mUBVConpDw3wwfiwmj/Kx7yzaK+mmPh ++GVHu66abA6y9KoRhPboJWg4zReZVpQS5JOoy7bEoOuSIu8TRsmB40dVtI5int5z +5cIS/KrfrABkIuGOKpTqnRTsMuSlZSsPwcms6Q== +=EjRa +-----END PGP PUBLIC KEY BLOCK----- diff --git a/ovirt-release-3.6/autogen.sh b/ovirt-release-3.6/autogen.sh new file mode 100755 index 0000000..cc5a567 --- /dev/null +++ b/ovirt-release-3.6/autogen.sh @@ -0,0 +1,7 @@ +#!/bin/sh + +# you probably need: +# - autoconf +# - automake + +autoreconf -ivf diff --git a/ovirt-release-3.6/configure.ac b/ovirt-release-3.6/configure.ac new file mode 100644 index 0000000..b01765d --- /dev/null +++ b/ovirt-release-3.6/configure.ac @@ -0,0 +1,47 @@ +dnl +dnl ovirt-release -- repo files for oVirt projects +dnl Copyright (C) 2014 Red Hat, Inc. +dnl +dnl This library is free software; you can redistribute it and/or +dnl modify it under the terms of the GNU Lesser General Public +dnl License as published by the Free Software Foundation; either +dnl version 2.1 of the License, or (at your option) any later version. +dnl +dnl This library is distributed in the hope that it will be useful, +dnl but WITHOUT ANY WARRANTY; without even the implied warranty of +dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +dnl Lesser General Public License for more details. +dnl +dnl You should have received a copy of the GNU Lesser General Public +dnl License along with this library; if not, write to the Free Software +dnl Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA +dnl + + +define([VERSION_NUMBER], [001]) +define([VERSION_SUFFIX], [_master]) +define([OVIRT_VERSION_MAJOR], [3]) +define([OVIRT_VERSION_MINOR], [6]) + +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.0.$(echo VERSION_SUFFIX | sed 's/^_//')" +OVIRT_SLOT="OVIRT_VERSION_MAJOR.OVIRT_VERSION_MINOR" +AC_SUBST([PACKAGE_RPM_VERSION]) +AC_SUBST([PACKAGE_RPM_RELEASE]) +AC_SUBST([OVIRT_SLOT]) + +AC_CONFIG_AUX_DIR([.]) +AM_INIT_AUTOMAKE + +AC_CONFIG_FILES([ + Makefile + ovirt-el6-deps.repo + ovirt-el7-deps.repo + ovirt-f19-deps.repo + ovirt-f20-deps.repo + ovirt-release36.spec + ovirt-snapshot.repo +]) +AC_OUTPUT diff --git a/ovirt-release-3.6/ovirt-el6-deps.repo.in b/ovirt-release-3.6/ovirt-el6-deps.repo.in new file mode 100644 index 0000000..8ca4b7b --- /dev/null +++ b/ovirt-release-3.6/ovirt-el6-deps.repo.in @@ -0,0 +1,38 @@ +[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 +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 +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 + +[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 + +[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/ +enabled=1 +skip_if_unavailable=1 +gpgcheck=0 diff --git a/ovirt-release-3.6/ovirt-el7-deps.repo.in b/ovirt-release-3.6/ovirt-el7-deps.repo.in new file mode 100644 index 0000000..03ec0c3 --- /dev/null +++ b/ovirt-release-3.6/ovirt-el7-deps.repo.in @@ -0,0 +1,30 @@ +[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 +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 + +[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-7-$basearch/ +enabled=1 +skip_if_unavailable=1 +gpgcheck=0 diff --git a/ovirt-release-3.6/ovirt-f19-deps.repo.in b/ovirt-release-3.6/ovirt-f19-deps.repo.in new file mode 100644 index 0000000..5e3b655 --- /dev/null +++ b/ovirt-release-3.6/ovirt-f19-deps.repo.in @@ -0,0 +1,15 @@ +[ovirt-@OVIRT_SLOT@-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* + +[ovirt-@OVIRT_SLOT@-patternfly1] +name=Copr repo for patternfly1 owned by patternfly +baseurl=http://copr-be.cloud.fedoraproject.org/results/patternfly/patternfly1/fedora-$releasever-$basearch/ +enabled=1 +skip_if_unavailable=1 +gpgcheck=0 + diff --git a/ovirt-release-3.6/ovirt-f20-deps.repo.in b/ovirt-release-3.6/ovirt-f20-deps.repo.in new file mode 100644 index 0000000..5ea2a95 --- /dev/null +++ b/ovirt-release-3.6/ovirt-f20-deps.repo.in @@ -0,0 +1,7 @@ +[ovirt-@OVIRT_SLOT@-patternfly1] +name=Copr repo for patternfly1 owned by patternfly +baseurl=http://copr-be.cloud.fedoraproject.org/results/patternfly/patternfly1/fedora-$releasever-$basearch/ +enabled=1 +skip_if_unavailable=1 +gpgcheck=0 + diff --git a/ovirt-release-3.6/ovirt-release36.spec.in b/ovirt-release-3.6/ovirt-release36.spec.in new file mode 100644 index 0000000..f50ad00 --- /dev/null +++ b/ovirt-release-3.6/ovirt-release36.spec.in @@ -0,0 +1,127 @@ +# +# ovirt-release -- repo files for oVirt projects +# Copyright (C) 2014 Red Hat, Inc. +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License, or (at your option) any later version. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA +# + +%global package_version @PACKAGE_VERSION@ +%global package_name @PACKAGE_NAME@ +%global ovirt_version @OVIRT_SLOT@ + +Name: %{package_name} +Version: @PACKAGE_RPM_VERSION@ +Release: @PACKAGE_RPM_RELEASE@%{?release_suffix} +Summary: oVirt repository configuration +Group: System Environment/Base + +License: ASL 2.0 +URL: http://www.ovirt.org +Source0: http://resources.ovirt.org/pub/src/%{package_name}/%{package_name}-%{package_version}.tar.gz +Source1: http://resources.ovirt.org/pub/keys/RPM-GPG-ovirt + +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release} +BuildArch: noarch + +BuildRequires: automake +BuildRequires: autoconf +Requires: system-release +Requires: tar + +%description +This package contains the yum configuration for oVirt repositories + +%package snapshot +Summary: oVirt snapshot repository configuration +Group: System Environment/Base +Requires: %{package_name} + + +%description snapshot +This package contains the yum configuration for oVirt snapshot repositories + + +%prep +%setup -q -n "%{package_name}-%{package_version}" + +%build +%configure +make "%{?_smp_mflags}" + + +%install +rm -rf "%{buildroot}" +%make_install +#Allow ghost files +install -d 755 "%{buildroot}%{_sysconfdir}/yum.repos.d" +install -d "%{buildroot}%{_sysconfdir}/pki/rpm-gpg" +install -m 644 "%{SOURCE1}" "%{buildroot}%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-ovirt-%{ovirt_version}" +touch "%{buildroot}%{_sysconfdir}/yum.repos.d/ovirt-%{ovirt_version}-snapshot.repo" +touch "%{buildroot}%{_sysconfdir}/yum.repos.d/ovirt-%{ovirt_version}-dependencies.repo" + +%post + +# Adjust repos as per dist and version +DIST=fc +#Fedora is good for both Fedora and Generic (and probably other based on Fedora) +#Handling EL exception only (for now) +DISTVER="$(rpm --eval "%%dist"|cut -c2-)" +if rpm --eval "%%dist" | grep -qFi 'el'; then + DIST=el +fi + +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 + install -m 644 "%{_datadir}/%{package_name}/ovirt-f20-deps.repo" "%{_sysconfdir}/yum.repos.d/ovirt-%{ovirt_version}-dependencies.repo" +fi + +%post snapshot + +# Adjust repos as per dist and version +DIST=fc +#Fedora is good for both Fedora and Generic (and probably other based on Fedora) +#Handling EL exception only (for now) +DISTVER="$(rpm --eval "%%dist"|cut -c2-)" +if rpm --eval "%%dist" | grep -qFi 'el'; then + DIST=el +fi + +sed \ + -e "s/@DIST@/${DIST}/g" \ + <"%{_datadir}/%{package_name}/ovirt-snapshot.repo" > "%{_sysconfdir}/yum.repos.d/ovirt-%{ovirt_version}-snapshot.repo" + + +%files +%defattr(-,root,root,-) +%{_datadir}/%{package_name}/ +%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-ovirt-%{ovirt_version} +# We do not know what distribution we are installed at, +# we copy the actual files at post, but still wants this package to own them. +# ghost in this case solves that issue +%ghost %config(noreplace) %{_sysconfdir}/yum.repos.d/ovirt-%{ovirt_version}-dependencies.repo + +%files snapshot +%defattr(-,root,root,-) +%ghost %config(noreplace) %{_sysconfdir}/yum.repos.d/ovirt-%{ovirt_version}-snapshot.repo + + +%changelog +* Fri May 16 2014 Sandro Bonazzola <[email protected]> - 001-0.0.master +- Provide oVirt 3.6.0 development repositories diff --git a/ovirt-release-3.6/ovirt-snapshot.repo.in b/ovirt-release-3.6/ovirt-snapshot.repo.in new file mode 100644 index 0000000..65ed112 --- /dev/null +++ b/ovirt-release-3.6/ovirt-snapshot.repo.in @@ -0,0 +1,15 @@ +[ovirt-@OVIRT_SLOT@-snapshot] +name=Latest oVirt @OVIRT_SLOT@ nightly snapshot +#baseurl=http://resources.ovirt.org/pub/ovirt-master-snapshot/rpm/@DIST@$releasever/ +mirrorlist=http://resources.ovirt.org/pub/yum-repo/mirrorlist-ovirt-master-snapshot-@DIST@$releasever +enabled=1 +skip_if_unavailable=1 +gpgcheck=0 + +[ovirt-@OVIRT_SLOT@-snapshot-static] +name=Latest oVirt @OVIRT_SLOT@ additional nightly snapshot +#baseurl=http://resources.ovirt.org/pub/ovirt-master-snapshot-static/rpm/@DIST@$releasever/ +mirrorlist=http://resources.ovirt.org/pub/yum-repo/mirrorlist-ovirt-master-snapshot-static-@DIST@$releasever +enabled=1 +skip_if_unavailable=1 +gpgcheck=0 -- To view, visit http://gerrit.ovirt.org/30278 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I0ac9ff1c0ce204ed9578114d5b0a4281a6c696ce 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
