From 34ea54b1a1578bc6e976bb478ac703779f077f13 Mon Sep 17 00:00:00 2001
From: "Darryl L. Pierce" <mcpierce@gmail.com>
Date: Tue, 28 Oct 2014 08:42:40 -0400
Subject: [PATCH] Rebased on Proton 0.8.

---
 .gitignore                                    |  1 +
 ...lling-Python-requires-Proton-be-inst.patch | 40 +++++++++++++++++++
 qpid-proton.spec                              | 16 ++++++--
 sources                                       |  2 +-
 4 files changed, 55 insertions(+), 4 deletions(-)
 create mode 100644 0001-PROTON-731-Installing-Python-requires-Proton-be-inst.patch

diff --git a/.gitignore b/.gitignore
index 53757c2..bce9dd9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@
 /qpid-proton-0.5.tar.gz
 /qpid-proton-0.6.tar.gz
 /qpid-proton-0.7.tar.gz
+/qpid-proton-0.8.tar.gz
diff --git a/0001-PROTON-731-Installing-Python-requires-Proton-be-inst.patch b/0001-PROTON-731-Installing-Python-requires-Proton-be-inst.patch
new file mode 100644
index 0000000..26de0c0
--- /dev/null
+++ b/0001-PROTON-731-Installing-Python-requires-Proton-be-inst.patch
@@ -0,0 +1,40 @@
+From a0670dd53c9d3b444656917e0b663364f6f20aa5 Mon Sep 17 00:00:00 2001
+From: "Darryl L. Pierce" <mcpierce@gmail.com>
+Date: Mon, 27 Oct 2014 15:01:52 -0400
+Subject: [PATCH] PROTON-731: Installing Python requires Proton be installed
+ already.
+
+The CHECK_SYSINSTALL_PYTHON variable was not being set, so it's now
+being set by default but can be overridden from the command line.
+
+Also changed the PYTHON_SITEARCH_PACKAGES variable a cache done that can
+also be overridden from the command line as well.
+---
+ proton-c/bindings/python/CMakeLists.txt | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/proton-c/bindings/python/CMakeLists.txt b/proton-c/bindings/python/CMakeLists.txt
+index b8cdb57..ff8c706 100644
+--- a/proton-c/bindings/python/CMakeLists.txt
++++ b/proton-c/bindings/python/CMakeLists.txt
+@@ -22,6 +22,8 @@
+ 
+ set(CMAKE_SWIG_FLAGS "-threads")
+ 
++set(CHECK_SYSINSTALL_PYTHON ON CACHE INTERNAL "")
++
+ include_directories (${PYTHON_INCLUDE_PATH})
+ if (BUILD_WITH_CXX)
+    SET_SOURCE_FILES_PROPERTIES(cproton.i PROPERTIES CPLUSPLUS ON)
+@@ -74,7 +76,7 @@ if (CHECK_SYSINSTALL_PYTHON)
+ 
+ else ()
+   # install the bindings using the CMAKE path variables:
+-  set (PYTHON_SITEARCH_PACKAGES ${BINDINGS_DIR}/python)
++  set (PYTHON_SITEARCH_PACKAGES ${BINDINGS_DIR}/python CACHE INTERNAL "")
+ 
+   install(CODE "execute_process(COMMAND ${PYTHON_EXECUTABLE} -m py_compile cproton.py
+                                 WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})")
+-- 
+1.9.3
+
diff --git a/qpid-proton.spec b/qpid-proton.spec
index 0d47f0a..0dcd4a9 100644
--- a/qpid-proton.spec
+++ b/qpid-proton.spec
@@ -1,14 +1,15 @@
 %global proton_datadir %{_datadir}/proton-%{version}
 
 Name:           qpid-proton
-Version:        0.7
-Release:        4%{?dist}
+Version:        0.8
+Release:        1%{?dist}
 Summary:        A high performance, lightweight messaging library
 
 License:        ASL 2.0
 URL:            http://qpid.apache.org/proton/
 
 Source0:        http://www.apache.org/dist/qpid/proton/%{version}/%{name}-%{version}.tar.gz
+Patch0001:      0001-PROTON-731-Installing-Python-requires-Proton-be-inst.patch
 
 %if (0%{?fedora} || 0%{?rhel} == 7)
 BuildRequires:  cmake >= 2.6
@@ -134,9 +135,13 @@ BuildArch: noarch
 %defattr(-,root,root,-)
 %doc %{proton_datadir}/docs/api-py
 
+
+
 %prep
 %setup -q -n %{name}-%{version}
 
+%patch0001 -p1
+
 
 %build
 
@@ -144,8 +149,10 @@ BuildArch: noarch
     -DPROTON_DISABLE_RPATH=true \
     -DPYTHON_SITEARCH_PACKAGES=%{python_sitearch} \
     -DNOBUILD_RUBY=1 \
-    -DNOBUILD_PERL=1 \
     -DNOBUILD_PHP=1 \
+    -DSYSINSTALL_PYTHON=1 \
+    -DSYSINSTALL_PERL=0 \
+    -DCHECK_SYSINSTALL_PYTHON=0 \
     .
 make all docs %{?_smp_mflags}
 
@@ -163,6 +170,9 @@ rm -rf %{buildroot}%{_datarootdir}/java
 rm -rf %{buildroot}%{_libdir}/proton.cmake
 
 %changelog
+* Tue Nov 18 2014 Darryl L. Pierce <dpierce@redhat.com> - 0.8-1
+- Rebased on Proton 0.8.
+
 * Sun Aug 17 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.7-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
 
diff --git a/sources b/sources
index 7dc1201..4071aca 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-ec46fd02f1ac9f4b03e08aad22ab2506  qpid-proton-0.7.tar.gz
+48bfbd7ba5a639760bb28380f4d68208  qpid-proton-0.8.tar.gz