rpms/qpid-cpp/devel qpid-cpp.spec,1.14,1.15 swig.patch,1.1,1.2

[Nuno Santos]

Author: nsantos

Update of /cvs/pkgs/rpms/qpid-cpp/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv31718

Modified Files:
	qpid-cpp.spec swig.patch 
Log Message:
patch for AC_PROG_SWIG macro


Index: qpid-cpp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qpid-cpp/devel/qpid-cpp.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- qpid-cpp.spec	26 Jul 2010 18:09:41 -0000	1.14
+++ qpid-cpp.spec	27 Jul 2010 20:09:30 -0000	1.15
@@ -26,7 +26,7 @@
 %global qpid_svnrev  946106
 %global store_svnrev 3975
 # Change this release number for each build of the same qpid_svnrev, otherwise set back to 1.
-%global release_num         1
+%global release_num  2
 
 # NOTE: these flags should not both be set at the same time!
 # RHEL-6 builds should have all flags set to 0.

swig.patch:
 ac_pkg_swig.m4 |    9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

Index: swig.patch
===================================================================
RCS file: /cvs/pkgs/rpms/qpid-cpp/devel/swig.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- swig.patch	26 Jul 2010 18:09:53 -0000	1.1
+++ swig.patch	27 Jul 2010 20:09:30 -0000	1.2
@@ -1,11 +1,25 @@
---- cpp/configure.ac	2010-07-26 13:45:55.158378547 -0400
-+++ cpp/configure.ac	2010-07-26 14:00:02.937354780 -0400
-@@ -144,7 +144,7 @@
- AC_CHECK_PROG([RUBY], [ruby], [ruby])
- 
- # Swig binding generator is needed for the script (Ruby, Python, etc.) bindings.
--AC_PROG_SWIG(1.3.26)
-+AC_PROG_SWIG(2.0.0)
- test ! -x "$SWIG" && SWIG=""
- AC_ARG_WITH([swig],
-   [AS_HELP_STRING([--with-swig], [Use swig to generate qmf bindings.])],
+--- cpp/m4/ac_pkg_swig.m4	2009-07-08 09:50:09.000000000 -0400
++++ cpp/m4/ac_pkg_swig.m4	2010-07-27 16:05:22.725331918 -0400
+@@ -24,6 +24,9 @@
+ #     SWIG_MULTI_MODULE_SUPPORT
+ #     SWIG_PYTHON
+ #
++dnl
++dnl Fixed by Sandro Santilli to consider 2.0.0 > 1.3.37 (2010-06-15)
++dnl
+ # LICENSE
+ #
+ #   Copyright (c) 2008 Sebastian Huber <sebastian-huber at web.de>
+@@ -99,9 +102,9 @@
+                         if test -z "$available_patch" ; then
+                                 [available_patch=0]
+                         fi
+-                        if test $available_major -ne $required_major \
+-                                -o $available_minor -ne $required_minor \
+-                                -o $available_patch -lt $required_patch ; then
++			[required_full=`printf %2.2d%2.2d%2.2d%2.2d $required_major $required_minor $required_patch]`
++			[available_full=`printf %2.2d%2.2d%2.2d%2.2d $available_major $available_minor $available_patch]`
++                        if test $available_full -lt $required_full; then
+                                 AC_MSG_WARN([SWIG version >= $1 is required.  You have $swig_version.  You should look at http://www.swig.org])
+                                 SWIG='echo "Error: SWIG version >= $1 is required.  You have '"$swig_version"'.  You should look at http://www.swig.org" ; false'
+                         else