[qpid-cpp] Rebased to sync with upstream's official 0.12 release

[Nuno Santos]

commit cd570166466c37626af1cc88c89b7a8ce5f07437
Author: Nuno Santos <nsantos at redhat.com>
Date:   Tue Aug 30 11:23:00 2011 -0400

    Rebased to sync with upstream's official 0.12 release

 .gitignore    |    2 ++
 qpid-cpp.spec |   19 +++++++++++--------
 sources       |    4 ++--
 3 files changed, 15 insertions(+), 10 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 4088ba3..1db9f36 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,5 @@ store-0.7.3975.tar.gz
 /store-0.8.4411.tar.gz
 /store-0.10.4446.tar.gz
 /qpid-0.10.tar.gz
+/qpid-0.12.tar.gz
+/store-0.12.4463.tar.gz
diff --git a/qpid-cpp.spec b/qpid-cpp.spec
index f488537..32662ba 100644
--- a/qpid-cpp.spec
+++ b/qpid-cpp.spec
@@ -22,11 +22,11 @@
 %global MRG_non_core 1
 
 # Release numbers
-%global qpid_release 0.10
-%global qpid_svnrev  1091571
-%global store_svnrev 4446
+%global qpid_release 0.12
+%global qpid_svnrev  1154981
+%global store_svnrev 4463
 # Change this release number for each build of the same qpid_svnrev, otherwise set back to 1.
-%global release_num  4
+%global release_num  1
 
 # NOTE: these flags should not both be set at the same time!
 # RHEL-6 builds should have all flags set to 0.
@@ -106,9 +106,9 @@ Source1:        store-%{qpid_release}.%{store_svnrev}.tar.gz
 Patch1:         store-4411.patch
 
 %if %{fedora}
-Patch2:         qpid-3159.patch
+#Patch2:         qpid-3159.patch
 Patch6:         boost_filesystem_v2.patch
-Patch7:         mutable.patch
+#Patch7:         mutable.patch
 %endif
 
 %if %{rhel_4}
@@ -842,9 +842,9 @@ popd
 %endif
 
 %if %{fedora}
-%patch2 -p2
+#%patch2 -p2
 ###%patch6
-%patch7
+#%patch7
 %endif
 
 # apply store patch
@@ -1147,6 +1147,9 @@ rm -rf %{buildroot}
 %postun -p /sbin/ldconfig
 
 %changelog
+* Tue Aug 30 2011 Nuno Santos <nsantos at redhat.com> - 0.12-1.1
+- Rebased to sync with upstream's official 0.12 release
+
 * Sun Aug 14 2011 Rex Dieter <rdieter at fedoraproject.org> - 0.10-4.1
 - Rebuilt for rpm (#728707)
 
diff --git a/sources b/sources
index bac7d79..8da7c8b 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-7b0e4a9a0a3e9681685ffec4bac64d16  store-0.10.4446.tar.gz
-75f7e1076fddc08baaee386f9af61897  qpid-0.10.tar.gz
+19eb7a39985aef1574ec2244a22204a4  qpid-0.12.tar.gz
+663a2fffe206ff218264f99000e29db4  store-0.12.4463.tar.gz