rpms/pyactivemq/F-11 pyactivemq-use-activemq-cpp-config.patch, NONE, 1.1 pyactivemq.spec, NONE, 1.1 sources, 1.1, 1.2

[stevetraylen]

Author: stevetraylen

Update of /cvs/pkgs/rpms/pyactivemq/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22776/F-11

Modified Files:
	sources 
Added Files:
	pyactivemq-use-activemq-cpp-config.patch pyactivemq.spec 
Log Message:
First release with snapshot 20100214


pyactivemq-use-activemq-cpp-config.patch:
 setup.py |   22 ++++++++++++++++------
 1 file changed, 16 insertions(+), 6 deletions(-)

--- NEW FILE pyactivemq-use-activemq-cpp-config.patch ---
diff -uNr pyactivemq-20100214.ORIG/setup.py pyactivemq-20100214/setup.py
--- pyactivemq-20100214.ORIG/setup.py	2010-02-14 18:49:15.769950379 +0100
+++ pyactivemq-20100214/setup.py	2010-02-14 18:53:11.046432658 +0100
@@ -17,6 +17,8 @@
 from distutils.util import get_platform
 import os.path
 import sys
+import subprocess
+from subprocess import Popen, PIPE
 
 if get_platform().startswith('win'):
     include_dirs = [
@@ -66,17 +68,25 @@
         ('PYACTIVEMQ_ENABLE_DOCSTRINGS', 0)
         ]
 else:
-    include_dirs = [
-        '/opt/activemq-cpp-3.0.1/include/activemq-cpp-3.0.1'
-        ]
+    if os.path.exists('/usr/bin/activemqcpp-config'):
+        include_dirs = [ subprocess.Popen(['/usr/bin/activemqcpp-config','--includes'],stdout=PIPE).communicate()[0][2:-1] ]
+        library_dirs = [ subprocess.Popen(['/usr/bin/activemqcpp-config','--libs'],stdout=PIPE).communicate()[0][2:-1] ]
+        extra_link_args = [] 
+    else:
+        include_dirs = [
+              '/opt/activemq-cpp-2.2.1/include/activemq-cpp-2.2.1'
+               ]
+        library_dirs = [
+              '/opt/activemq-cpp-2.2.1/lib'
+               ]
+        extra_link_args = [
+             '-Wl,-rpath,/opt/activemq-cpp-2.2.1/lib' ]
+
     libraries = [
         'activemq-cpp',
         'uuid',
         'boost_python'
         ]
-    library_dirs = [
-        '/opt/activemq-cpp-3.0.1/lib'
-        ]
     extra_compile_args = []
     extra_link_args = [
         '-Wl,-rpath,/opt/activemq-cpp-3.0.1/lib'


--- NEW FILE pyactivemq.spec ---
%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}

Name:           pyactivemq
Version:        0.1.0
Release:        2.20100214svn209%{?dist}
Summary:        Python wrapper around activemq-cpp for messaging

Group:          Development/Languages
License:        ASL 2.0
URL:            http://code.google.com/p/pyactivemq/
#SVN Snapshot Release:
# svn checkout http://pyactivemq.googlecode.com/svn/trunk/ pyactivemq-YYYYMMD
# tar cfz pyactivemq-YYYYMMD.tar.gz pyactivemq-YYYYMMD
Source0:        pyactivemq-20100214.tar.gz
# Allow setup.py to use activemq-cpp-config to file include paths etc.
# http://code.google.com/p/pyactivemq/issues/detail?id=30
Patch0:         pyactivemq-use-activemq-cpp-config.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  python-devel
BuildRequires:  boost-devel
BuildRequires:  activemq-cpp-devel

%description
pyactivemq is a Python module for communicating with the 
message brokers which implement the Java Message Service 
specification or stomp.

%prep
%setup -q -n pyactivemq-20100214
%patch0 -p1

%build
CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build

%install
rm -rf $RPM_BUILD_ROOT
%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
 
%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc CHANGES.txt LICENSE.txt
%{python_sitearch}/*

%changelog
* Sun Feb 14 2010 Steve Traylen <steve.traylen at cern.ch> - 0.1.0-2.20100214svn209
- Update to snapshot from SVN. Early support for activemq-cpp 3.1

* Tue Nov 17 2009 Steve Traylen <steve.traylen at cern.ch> - 0.1.0-1
First version of package.



Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pyactivemq/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	14 Dec 2009 17:30:14 -0000	1.1
+++ sources	14 Feb 2010 18:11:01 -0000	1.2
@@ -0,0 +1 @@
+55260abdcaca8ff646d6466894bb9130  pyactivemq-20100214.tar.gz