[qpid-proton] Rebased on Proton 0.5.

Wed Aug 28 16:06:45 UTC 2013

commit a4d0de41569b2bcc50d47b1d231c2b45754020e9
Author: Darryl L. Pierce <mcpierce at gmail.com>
Date:   Wed Aug 28 12:06:24 2013 -0400

    Rebased on Proton 0.5.
    
    - Resolves: BZ#1000620

 .gitignore                                         |    1 +
 01-NO-JIRA-Fixed-RHEL5-build-errors.patch          |   40 -
 ...Fix-the-include-and-lib-directories-in-li.patch |   50 +
 ...Platform-neutral-helper-functions-for-exa.patch |  994 --------------------
 03-PROTON-364-Install-C-examples.patch             |   76 --
 qpid-proton.spec                                   |   16 +-
 sources                                            |    2 +-
 7 files changed, 60 insertions(+), 1119 deletions(-)
---

diff --git a/.gitignore b/.gitignore
index f9e5562..0f02224 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 /qpid-proton-c-0.3.tar.gz
 /qpid-proton-0.4.tar.gz
+/qpid-proton-0.5.tar.gz
diff --git a/01-PROTON-412-Fix-the-include-and-lib-directories-in-li.patch b/01-PROTON-412-Fix-the-include-and-lib-directories-in-li.patch
new file mode 100644
index 0000000..0f1277a
--- /dev/null
+++ b/01-PROTON-412-Fix-the-include-and-lib-directories-in-li.patch
@@ -0,0 +1,50 @@
+From 47a7169e007de34d720a50f415b70006664634f6 Mon Sep 17 00:00:00 2001
+From: mcpierce <mcpierce at 13f79535-47bb-0310-9956-ffa450edef68>
+Date: Mon, 26 Aug 2013 20:07:22 +0000
+Subject: [PATCH] PROTON-412: Fix the include and lib directories in
+ libqpid-proton.pc
+
+If the paths aren't passed in from the command line as absolute then
+prepends them with CMAKE_INSTALL_PREFIX before generated the package
+config file.
+
+git-svn-id: https://svn.apache.org/repos/asf/qpid/proton/trunk@1517673 13f79535-47bb-0310-9956-ffa450edef68
+---
+ proton-c/CMakeLists.txt | 21 ++++++++++++++++-----
+ 1 file changed, 16 insertions(+), 5 deletions(-)
+
+diff --git a/proton-c/CMakeLists.txt b/proton-c/CMakeLists.txt
+index dacc9f8..42211ba 100644
+--- a/proton-c/CMakeLists.txt
++++ b/proton-c/CMakeLists.txt
+@@ -331,11 +331,22 @@ install (FILES  ${CMAKE_CURRENT_BINARY_DIR}/include/proton/version.h
+          DESTINATION ${INCLUDE_INSTALL_DIR}/proton)
+ 
+ # Pkg config file
+-# Compatible variable names used in the pkg config files also for autoconf
+-get_filename_component (PREFIX ${CMAKE_INSTALL_PREFIX} ABSOLUTE)
+-get_filename_component (EXEC_PREFIX ${CMAKE_INSTALL_PREFIX} ABSOLUTE)
+-get_filename_component (LIBDIR ${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR} ABSOLUTE)
+-get_filename_component (INCLUDEDIR ${CMAKE_INSTALL_PREFIX}/${INCLUDE_INSTALL_DIR} ABSOLUTE)
++# make sure the install prefix is absolute
++set(INSTALL_PREFIX ${CMAKE_INSTALL_PREFIX})
++
++macro (pn_pkgconfig_dir NAME VALUE PREFIX)
++  if(IS_ABSOLUTE ${VALUE})
++    set(${NAME} "${VALUE}")
++  else(IS_ABSOLUTE ${VALUE})
++    set(${NAME} "${PREFIX}/${VALUE}")
++  endif(IS_ABSOLUTE ${VALUE})
++  get_filename_component(${NAME} ${${NAME}} ABSOLUTE)
++endmacro(pn_pkgconfig_dir)
++
++pn_pkgconfig_dir(PREFIX ${INSTALL_PREFIX} ${INSTALL_PREFIX})
++pn_pkgconfig_dir(EXEC_PREFIX ${INSTALL_PREFIX} ${INSTALL_PREFIX})
++pn_pkgconfig_dir(LIBDIR ${LIB_INSTALL_DIR} ${INSTALL_PREFIX})
++pn_pkgconfig_dir(INCLUDEDIR ${INCLUDE_INSTALL_DIR} ${INSTALL_PREFIX})
+ 
+ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/src/libqpid-proton.pc.in
+   ${CMAKE_CURRENT_BINARY_DIR}/libqpid-proton.pc @ONLY)
+-- 
+1.8.3.1
+
diff --git a/qpid-proton.spec b/qpid-proton.spec
index 9636fd1..6683ab8 100644
--- a/qpid-proton.spec
+++ b/qpid-proton.spec
@@ -1,8 +1,8 @@
 %global proton_datadir %{_datadir}/proton-%{version}
 
 Name:           qpid-proton
-Version:        0.4
-Release:        5%{?dist}
+Version:        0.5
+Release:        1%{?dist}
 Summary:        A high performance, lightweight messaging library
 
 License:        ASL 2.0
@@ -19,10 +19,8 @@ BuildRequires:  python-devel
 BuildRequires:  epydoc
 
 
-Patch1: 01-NO-JIRA-Fixed-RHEL5-build-errors.patch
-# BZ#975723
-Patch2: 02-PROTON-348-Platform-neutral-helper-functions-for-exa.patch
-Patch3: 03-PROTON-364-Install-C-examples.patch
+# BZ#1000620
+Patch1: 01-PROTON-412-Fix-the-include-and-lib-directories-in-li.patch
 
 %description
 Proton is a high performance, lightweight messaging library. It can be used in
@@ -129,8 +127,6 @@ Summary: Documentation for the Python language bindings for Qpid Proton
 %setup -q -n %{name}-%{version}
 
 %patch1 -p1
-%patch2 -p1
-%patch3 -p1
 
 %build
 %cmake -DPROTON_DISABLE_RPATH=true .
@@ -153,6 +149,10 @@ rm -rf %{buildroot}%{_datarootdir}/java
 rm -rf %{buildroot}%{_sysconfdir}/php.d
 
 %changelog
+* Wed Aug 28 2013 Darryl L. Pierce <dpierce at redhat.com> - 0.5-5
+- Rebased on Proton 0.5.
+- Resolves: BZ#1000620
+
 * Mon Aug 26 2013 Darryl L. Pierce <dpierce at redhat.com> - 0.4-5
 - Created the qpid-proton-c-devel-doc subpackage.
 - Resolves: BZ#1000615
diff --git a/sources b/sources
index b090d36..4cb15ca 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-73d1a18017010934b2780ccc820f0773  qpid-proton-0.4.tar.gz
+fb2dc704e4d2727d664966f301bfb017  qpid-proton-0.5.tar.gz
