Sandro Bonazzola has uploaded a new change for review. Change subject: build: master and 3.6; repository changes ......................................................................
build: master and 3.6; repository changes - Drop Gluster 3.7 Nightly repository since 3.7.0 GA is available - Add VirtIO-Win Stable repository Change-Id: I2e45ce5899471eb6d9781006700d0807e1df9681 Signed-off-by: Sandro Bonazzola <[email protected]> --- M ovirt-release-3.6/configure.ac M ovirt-release-3.6/ovirt-el6-deps.repo.in M ovirt-release-3.6/ovirt-el7-deps.repo.in M ovirt-release-3.6/ovirt-f20-deps.repo.in M ovirt-release-3.6/ovirt-f21-deps.repo.in M ovirt-release-3.6/ovirt-f22-deps.repo.in M ovirt-release-3.6/ovirt-release36.spec.in M ovirt-release-master/configure.ac M ovirt-release-master/ovirt-el6-deps.repo.in M ovirt-release-master/ovirt-el7-deps.repo.in M ovirt-release-master/ovirt-f20-deps.repo.in M ovirt-release-master/ovirt-f21-deps.repo.in M ovirt-release-master/ovirt-f22-deps.repo.in M ovirt-release-master/ovirt-release-master.spec.in 14 files changed, 19 insertions(+), 83 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-release refs/changes/05/41305/1 diff --git a/ovirt-release-3.6/configure.ac b/ovirt-release-3.6/configure.ac index 3270255..a3cccd7 100644 --- a/ovirt-release-3.6/configure.ac +++ b/ovirt-release-3.6/configure.ac @@ -28,38 +28,38 @@ PACKAGE_RPM_VERSION="VERSION_NUMBER" AC_SUBST([PACKAGE_RPM_VERSION]) -PACKAGE_RPM_RELEASE="0.1.$(echo VERSION_SUFFIX | sed 's/^_//')" +PACKAGE_RPM_RELEASE="0.2.$(echo VERSION_SUFFIX | sed 's/^_//')" AC_SUBST([PACKAGE_RPM_RELEASE]) OVIRT_SLOT="OVIRT_VERSION_MAJOR.OVIRT_VERSION_MINOR" AC_SUBST([OVIRT_SLOT]) AC_ARG_WITH([ovirt-yum-repo],[AC_HELP_STRING([--with-ovirt-yum-repo], - [Specify yum repo, defaults to: http://resources.ovirt.org/])], + [Specify yum repo. default: "http://resources.ovirt.org";])], [OVIRT_YUM_REPO="$withval"], [OVIRT_YUM_REPO="http://resources.ovirt.org";]) AC_SUBST([OVIRT_YUM_REPO]) AC_ARG_WITH([repo-url-key],[AC_HELP_STRING([--with-repo-url-key], - [Specify yum repo, defaults to: mirrorlist])], + [Specify yum repo. default: "mirrorlist"])], [REPO_URL_KEY="$withval"], [REPO_URL_KEY="mirrorlist"]) AC_SUBST([REPO_URL_KEY]) AC_ARG_WITH([repo-path-normal],[AC_HELP_STRING([--with-repo-path-normal], - ["Specify path on yum-repo, defaults to: /pub/yum-repo/mirrorlist-ovirt-${OVIRT_SLOT}-snapshot"])], + [Specify path on yum-repo. default: "/pub/yum-repo/mirrorlist-ovirt-${OVIRT_SLOT}-snapshot-"])], [REPO_PATH_NORMAL="$withval"], - [REPO_PATH_NORMAL="/pub/yum-repo/mirrorlist-ovirt-${OVIRT_SLOT}-snapshot"]) + [REPO_PATH_NORMAL="/pub/yum-repo/mirrorlist-ovirt-${OVIRT_SLOT}-snapshot-"]) AC_SUBST([REPO_PATH_NORMAL]) AC_ARG_WITH([repo-path-static],[AC_HELP_STRING([--with-repo-path-static], - ["Specify static path on yum-repo, defaults to: /pub/yum-repo/mirrorlist-ovirt-${OVIRT_SLOT}-snapshot-static"])], + [Specify static path on yum-repo. default: "/pub/yum-repo/mirrorlist-ovirt-${OVIRT_SLOT}-snapshot-static-"])], [REPO_PATH_STATIC="$withval"], - [REPO_PATH_STATIC="/pub/yum-repo/mirrorlist-ovirt-${OVIRT_SLOT}-snapshot-static"]) + [REPO_PATH_STATIC="/pub/yum-repo/mirrorlist-ovirt-${OVIRT_SLOT}-snapshot-static-"]) AC_SUBST([REPO_PATH_STATIC]) AC_ARG_WITH([ovirt-yum-repo],[AC_HELP_STRING([--with-ovirt-yum-repo], - [Specify yum repo, defaults to: http://resources.ovirt.org/])], + [Specify yum repo. default: "http://resources.ovirt.org";])], [OVIRT_YUM_REPO="$withval"], [OVIRT_YUM_REPO="http://resources.ovirt.org";]) AC_SUBST([OVIRT_YUM_REPO]) diff --git a/ovirt-release-3.6/ovirt-el6-deps.repo.in b/ovirt-release-3.6/ovirt-el6-deps.repo.in index 720682d..59b8e36 100644 --- a/ovirt-release-3.6/ovirt-el6-deps.repo.in +++ b/ovirt-release-3.6/ovirt-el6-deps.repo.in @@ -16,13 +16,6 @@ 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-@[email protected]] -name=Nightly Gluster builds for EPEL 6 - $basearch -baseurl=http://download.gluster.org/pub/gluster/glusterfs/nightly/glusterfs-3.7/epel-6-$basearch/ -enabled=1 -skip_if_unavailable=1 -gpgcheck=0 - [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/ @@ -52,4 +45,3 @@ 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 index f3aadf8..a2e9159 100644 --- a/ovirt-release-3.6/ovirt-el7-deps.repo.in +++ b/ovirt-release-3.6/ovirt-el7-deps.repo.in @@ -8,13 +8,6 @@ gpgcheck=1 gpgkey=https://dl.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-7 -[ovirt-@[email protected]] -name=Nightly Gluster builds for EPEL 7 - $basearch -baseurl=http://download.gluster.org/pub/gluster/glusterfs/nightly/glusterfs-3.7/epel-7-$basearch/ -enabled=1 -skip_if_unavailable=1 -gpgcheck=0 - [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/ diff --git a/ovirt-release-3.6/ovirt-f20-deps.repo.in b/ovirt-release-3.6/ovirt-f20-deps.repo.in index b45fbc2..b8065f4 100644 --- a/ovirt-release-3.6/ovirt-f20-deps.repo.in +++ b/ovirt-release-3.6/ovirt-f20-deps.repo.in @@ -1,10 +1,3 @@ -[ovirt-@[email protected]] -name=Nightly Gluster builds for Fedora $releasever - $basearch -baseurl=http://download.gluster.org/pub/gluster/glusterfs/nightly/glusterfs-3.7/fedora-$releasever-$basearch/ -enabled=1 -skip_if_unavailable=1 -gpgcheck=0 - [ovirt-@OVIRT_SLOT@-glusterfs-fedora] name=GlusterFS is a clustered file-system capable of scaling to several petabytes. baseurl=http://download.gluster.org/pub/gluster/glusterfs/LATEST/Fedora/fedora-$releasever/$basearch/ @@ -41,4 +34,3 @@ enabled=1 skip_if_unavailable=1 gpgcheck=0 - diff --git a/ovirt-release-3.6/ovirt-f21-deps.repo.in b/ovirt-release-3.6/ovirt-f21-deps.repo.in index 432f67e..f1f4a1c 100644 --- a/ovirt-release-3.6/ovirt-f21-deps.repo.in +++ b/ovirt-release-3.6/ovirt-f21-deps.repo.in @@ -1,10 +1,3 @@ -[ovirt-@[email protected]] -name=Nightly Gluster builds for Fedora $releasever - $basearch -baseurl=http://download.gluster.org/pub/gluster/glusterfs/nightly/glusterfs-3.7/fedora-$releasever-$basearch/ -enabled=1 -skip_if_unavailable=1 -gpgcheck=0 - [ovirt-@OVIRT_SLOT@-glusterfs-fedora] name=GlusterFS is a clustered file-system capable of scaling to several petabytes. baseurl=http://download.gluster.org/pub/gluster/glusterfs/LATEST/Fedora/fedora-$releasever/$basearch/ diff --git a/ovirt-release-3.6/ovirt-f22-deps.repo.in b/ovirt-release-3.6/ovirt-f22-deps.repo.in index 432f67e..f1f4a1c 100644 --- a/ovirt-release-3.6/ovirt-f22-deps.repo.in +++ b/ovirt-release-3.6/ovirt-f22-deps.repo.in @@ -1,10 +1,3 @@ -[ovirt-@[email protected]] -name=Nightly Gluster builds for Fedora $releasever - $basearch -baseurl=http://download.gluster.org/pub/gluster/glusterfs/nightly/glusterfs-3.7/fedora-$releasever-$basearch/ -enabled=1 -skip_if_unavailable=1 -gpgcheck=0 - [ovirt-@OVIRT_SLOT@-glusterfs-fedora] name=GlusterFS is a clustered file-system capable of scaling to several petabytes. baseurl=http://download.gluster.org/pub/gluster/glusterfs/LATEST/Fedora/fedora-$releasever/$basearch/ diff --git a/ovirt-release-3.6/ovirt-release36.spec.in b/ovirt-release-3.6/ovirt-release36.spec.in index aba45a2..6b9d310 100644 --- a/ovirt-release-3.6/ovirt-release36.spec.in +++ b/ovirt-release-3.6/ovirt-release36.spec.in @@ -34,7 +34,7 @@ License: ASL 2.0 URL: http://www.ovirt.org -Source0: http://resources.ovirt.org/pub/src/%{package_name}/%{package_name}-%{package_version}.tar.gz +Source0: http://resources.ovirt.org/pub/ovirt-master-snapshot-static/src/%{package_name}/%{package_name}-%{package_version}.tar.gz Source1: http://resources.ovirt.org/pub/keys/RPM-GPG-ovirt BuildRoot: %{_tmppath}/%{name}-%{version}-%{release} @@ -112,5 +112,9 @@ %changelog +* Fri May 22 2015 Sandro Bonazzola <[email protected]> - 001-0.2.alpha +- Drop Gluster 3.7 Nightly repository since 3.7.0 GA is available +- Add VirtIO-Win Stable repository + * Tue May 5 2015 Sandro Bonazzola <[email protected]> - 001-0.1.alpha - Initial packaging for oVirt 3.6.0 First Alpha release diff --git a/ovirt-release-master/configure.ac b/ovirt-release-master/configure.ac index 66048a0..2c79393 100644 --- a/ovirt-release-master/configure.ac +++ b/ovirt-release-master/configure.ac @@ -27,7 +27,7 @@ PACKAGE_RPM_VERSION="VERSION_NUMBER" AC_SUBST([PACKAGE_RPM_VERSION]) -PACKAGE_RPM_RELEASE="0.8.$(echo VERSION_SUFFIX | sed 's/^_//')" +PACKAGE_RPM_RELEASE="0.9.$(echo VERSION_SUFFIX | sed 's/^_//')" AC_SUBST([PACKAGE_RPM_RELEASE]) OVIRT_SLOT="master" diff --git a/ovirt-release-master/ovirt-el6-deps.repo.in b/ovirt-release-master/ovirt-el6-deps.repo.in index d9f1d7d..59b8e36 100644 --- a/ovirt-release-master/ovirt-el6-deps.repo.in +++ b/ovirt-release-master/ovirt-el6-deps.repo.in @@ -16,13 +16,6 @@ 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-@[email protected]] -name=Nightly Gluster builds for EPEL 6 - $basearch -baseurl=http://download.gluster.org/pub/gluster/glusterfs/nightly/glusterfs-3.7/epel-6-$basearch/ -enabled=1 -skip_if_unavailable=1 -gpgcheck=0 - [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/ diff --git a/ovirt-release-master/ovirt-el7-deps.repo.in b/ovirt-release-master/ovirt-el7-deps.repo.in index f3aadf8..a2e9159 100644 --- a/ovirt-release-master/ovirt-el7-deps.repo.in +++ b/ovirt-release-master/ovirt-el7-deps.repo.in @@ -8,13 +8,6 @@ gpgcheck=1 gpgkey=https://dl.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-7 -[ovirt-@[email protected]] -name=Nightly Gluster builds for EPEL 7 - $basearch -baseurl=http://download.gluster.org/pub/gluster/glusterfs/nightly/glusterfs-3.7/epel-7-$basearch/ -enabled=1 -skip_if_unavailable=1 -gpgcheck=0 - [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/ diff --git a/ovirt-release-master/ovirt-f20-deps.repo.in b/ovirt-release-master/ovirt-f20-deps.repo.in index 440e78c..b8065f4 100644 --- a/ovirt-release-master/ovirt-f20-deps.repo.in +++ b/ovirt-release-master/ovirt-f20-deps.repo.in @@ -1,10 +1,3 @@ -[ovirt-@[email protected]] -name=Nightly Gluster builds for Fedora $releasever - $basearch -baseurl=http://download.gluster.org/pub/gluster/glusterfs/nightly/glusterfs-3.7/fedora-$releasever-$basearch/ -enabled=1 -skip_if_unavailable=1 -gpgcheck=0 - [ovirt-@OVIRT_SLOT@-glusterfs-fedora] name=GlusterFS is a clustered file-system capable of scaling to several petabytes. baseurl=http://download.gluster.org/pub/gluster/glusterfs/LATEST/Fedora/fedora-$releasever/$basearch/ diff --git a/ovirt-release-master/ovirt-f21-deps.repo.in b/ovirt-release-master/ovirt-f21-deps.repo.in index 432f67e..f1f4a1c 100644 --- a/ovirt-release-master/ovirt-f21-deps.repo.in +++ b/ovirt-release-master/ovirt-f21-deps.repo.in @@ -1,10 +1,3 @@ -[ovirt-@[email protected]] -name=Nightly Gluster builds for Fedora $releasever - $basearch -baseurl=http://download.gluster.org/pub/gluster/glusterfs/nightly/glusterfs-3.7/fedora-$releasever-$basearch/ -enabled=1 -skip_if_unavailable=1 -gpgcheck=0 - [ovirt-@OVIRT_SLOT@-glusterfs-fedora] name=GlusterFS is a clustered file-system capable of scaling to several petabytes. baseurl=http://download.gluster.org/pub/gluster/glusterfs/LATEST/Fedora/fedora-$releasever/$basearch/ diff --git a/ovirt-release-master/ovirt-f22-deps.repo.in b/ovirt-release-master/ovirt-f22-deps.repo.in index 432f67e..f1f4a1c 100644 --- a/ovirt-release-master/ovirt-f22-deps.repo.in +++ b/ovirt-release-master/ovirt-f22-deps.repo.in @@ -1,10 +1,3 @@ -[ovirt-@[email protected]] -name=Nightly Gluster builds for Fedora $releasever - $basearch -baseurl=http://download.gluster.org/pub/gluster/glusterfs/nightly/glusterfs-3.7/fedora-$releasever-$basearch/ -enabled=1 -skip_if_unavailable=1 -gpgcheck=0 - [ovirt-@OVIRT_SLOT@-glusterfs-fedora] name=GlusterFS is a clustered file-system capable of scaling to several petabytes. baseurl=http://download.gluster.org/pub/gluster/glusterfs/LATEST/Fedora/fedora-$releasever/$basearch/ diff --git a/ovirt-release-master/ovirt-release-master.spec.in b/ovirt-release-master/ovirt-release-master.spec.in index 7f1d54d..407f66d 100644 --- a/ovirt-release-master/ovirt-release-master.spec.in +++ b/ovirt-release-master/ovirt-release-master.spec.in @@ -34,7 +34,7 @@ License: ASL 2.0 URL: http://www.ovirt.org -Source0: http://resources.ovirt.org/pub/src/%{package_name}/%{package_name}-%{package_version}.tar.gz +Source0: http://resources.ovirt.org/pub/ovirt-master-snapshot-static/src/%{package_name}/%{package_name}-%{package_version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release} BuildArch: noarch @@ -108,6 +108,10 @@ %changelog +* Fri May 22 2015 Sandro Bonazzola <[email protected]> - 001-0.9.master +- Drop Gluster 3.7 Nightly repository since 3.7.0 GA is available +- Add VirtIO-Win Stable repository + * Mon Apr 27 2015 Max Kovgan <[email protected]> - 001-0.8.master - add overrides to urls/paths serving the repositories -- To view, visit https://gerrit.ovirt.org/41305 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I2e45ce5899471eb6d9781006700d0807e1df9681 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
