Merge "Update RPM-specs to 2013.1.2 version" into openstack-ci/build/grizzly

[openstack-build/cinder-build.git] / rpm / SPECS / openstack-cinder.spec

diff --git a/rpm/SPECS/openstack-cinder.spec b/rpm/SPECS/openstack-cinder.spec
index 7cfa80fd2b0c87d6d6b7edccb23175e850ede50d..43c20171b4886f3b899b22648da569d9280e3689 100644 (file)
--- a/rpm/SPECS/openstack-cinder.spec
+++ b/rpm/SPECS/openstack-cinder.spec
@@ -1,8 +1,8 @@
 %global with_doc %{!?_without_doc:1}%{?_without_doc:0}
 
 Name:             openstack-cinder
-Version:          2013.1
-Release:          0.4.g3%{?dist}
+Version:          2013.1.1
+Release:          1%{?dist}
 Summary:          OpenStack Volume service
 
 Group:            Applications/System
@@ -23,12 +23,11 @@ Source120:        openstack-cinder-volume.upstart
 Source20:         cinder-sudoers
 
 #
-# patches_base=grizzly-3
+# patches_base=2013.1.1
 #
 Patch0001: 0001-Ensure-we-don-t-access-the-net-when-building-docs.patch
-
-# This is EPEL specific and not upstream
-Patch100:         openstack-cinder-newdeps.patch
+Patch0002: 0002-Use-updated-parallel-install-versions-of-epel-packag.patch
+Patch0003: 0003-remove-deprecated-assert_unicode-sqlalchemy-attribut.patch
 
 BuildArch:        noarch
 BuildRequires:    intltool
@@ -127,9 +126,8 @@ This package contains documentation files for cinder.
 %setup -q -n cinder-%{version}
 
 %patch0001 -p1
-
-# Apply EPEL patch
-%patch100 -p1
+%patch0002 -p1
+%patch0003 -p1
 
 find . \( -name .gitignore -o -name .placeholder \) -delete
 
@@ -284,7 +282,26 @@ fi
 %endif
 
 %changelog
-* Tue Mar 05 2013 Pádraig Brady <P@draigBrady.com> - 2013.1.0.4.g3
+* Fri May 10 2013 Eric Harney <eharney@redhat.com> - 2013.1.1-1
+- Update to Grizzly stable release 1
+
+* Mon Apr 08 2013 Eric Harney <eharney@redhat.com> - 2013.1-2
+- Backport fix for GlusterFS driver get_volume_stats
+- Adjust to support sqlalchemy-0.8.0
+
+* Thu Apr 04 2013 Eric Harney <eharney@redhat.com> - 2013.1-1
+- Update to Grizzly final release
+
+* Mon Mar 27 2013 Eric Harney <eharney@redhat.com> - 2013.1-0.5.rc3
+- Update to Grizzly RC3 release
+
+* Mon Mar 25 2013 Eric Harney <eharney@redhat.com> - 2013.1-0.5.rc2
+- Update to Grizzly RC2 release
+
+* Mon Mar 18 2013 Eric Harney <eharney@redhat.com> - 2013.1-0.5.rc1
+- Update to Grizzly RC1 release
+
+* Tue Mar 05 2013 Pádraig Brady <P@draigBrady.com> - 2013.1-0.4.g3
 - Add dependency on python-stevedore
 
 * Wed Feb 27 2013 Eric Harney <eharney@redhat.com> - 2013.1-0.2.g3