rpms/pyactivemq/devel .cvsignore, 1.2, 1.3 pyactivemq-use-activemq-cpp-config.patch, 1.1, 1.2 pyactivemq.spec, 1.1, 1.2 sources, 1.2, 1.3

[stevetraylen]

Author: stevetraylen

Update of /cvs/pkgs/rpms/pyactivemq/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21734

Modified Files:
	.cvsignore pyactivemq-use-activemq-cpp-config.patch 
	pyactivemq.spec sources 
Log Message:
Update to svn snapshot 20100214.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pyactivemq/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	14 Dec 2009 18:46:23 -0000	1.2
+++ .cvsignore	14 Feb 2010 18:06:13 -0000	1.3
@@ -1 +1 @@
-pyactivemq-0.1.0.tar.gz
+pyactivemq-20100214.tar.gz

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

Index: pyactivemq-use-activemq-cpp-config.patch
===================================================================
RCS file: /cvs/pkgs/rpms/pyactivemq/devel/pyactivemq-use-activemq-cpp-config.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- pyactivemq-use-activemq-cpp-config.patch	14 Dec 2009 18:46:23 -0000	1.1
+++ pyactivemq-use-activemq-cpp-config.patch	14 Feb 2010 18:06:14 -0000	1.2
@@ -1,6 +1,6 @@
-diff -uNr pyactivemq-0.1.0.ORIG/setup.py pyactivemq-0.1.0/setup.py
---- pyactivemq-0.1.0.ORIG/setup.py	2009-11-14 11:58:55.567999708 +0100
-+++ pyactivemq-0.1.0/setup.py	2009-11-17 20:53:58.450618046 +0100
+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
@@ -10,12 +10,12 @@ diff -uNr pyactivemq-0.1.0.ORIG/setup.py
  
  if get_platform().startswith('win'):
      include_dirs = [
-@@ -66,21 +68,26 @@
+@@ -66,17 +68,25 @@
          ('PYACTIVEMQ_ENABLE_DOCSTRINGS', 0)
          ]
  else:
 -    include_dirs = [
--        '/opt/activemq-cpp-2.2.1/include/activemq-cpp-2.2.1'
+-        '/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] ]
@@ -37,12 +37,8 @@ diff -uNr pyactivemq-0.1.0.ORIG/setup.py
          'boost_python'
          ]
 -    library_dirs = [
--        '/opt/activemq-cpp-2.2.1/lib'
+-        '/opt/activemq-cpp-3.0.1/lib'
 -        ]
      extra_compile_args = []
--    extra_link_args = [
--        '-Wl,-rpath,/opt/activemq-cpp-2.2.1/lib'
--        ]
-     define_macros = [
-         ('BOOST_PYTHON_NO_PY_SIGNATURES', 1),
-         ('PYACTIVEMQ_ENABLE_DOCSTRINGS', 0)
+     extra_link_args = [
+         '-Wl,-rpath,/opt/activemq-cpp-3.0.1/lib'


Index: pyactivemq.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pyactivemq/devel/pyactivemq.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- pyactivemq.spec	14 Dec 2009 18:46:23 -0000	1.1
+++ pyactivemq.spec	14 Feb 2010 18:06:14 -0000	1.2
@@ -2,13 +2,16 @@
 
 Name:           pyactivemq
 Version:        0.1.0
-Release:        1%{?dist}
+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/
-Source0:        http://pyactivemq.googlecode.com/files/pyactivemq-%{version}.tar.gz
+#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
@@ -24,7 +27,7 @@ message brokers which implement the Java
 specification or stomp.
 
 %prep
-%setup -q
+%setup -q -n pyactivemq-20100214
 %patch0 -p1
 
 %build
@@ -43,6 +46,9 @@ rm -rf $RPM_BUILD_ROOT
 %{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/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	14 Dec 2009 18:46:23 -0000	1.2
+++ sources	14 Feb 2010 18:06:14 -0000	1.3
@@ -1 +1 @@
-2ba32ab034c91a6fc6d0deb581d6ea27  pyactivemq-0.1.0.tar.gz
+55260abdcaca8ff646d6466894bb9130  pyactivemq-20100214.tar.gz