rpms/qpid-cpp/F-13 swig.patch,NONE,1.1 qpid-cpp.spec,1.11,1.12

[Nuno Santos]

Author: nsantos

Update of /cvs/pkgs/rpms/qpid-cpp/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv3742

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

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

--- NEW FILE swig.patch ---
--- 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


Index: qpid-cpp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qpid-cpp/F-13/qpid-cpp.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- qpid-cpp.spec	26 Jul 2010 18:50:44 -0000	1.11
+++ qpid-cpp.spec	27 Jul 2010 20:29:41 -0000	1.12
@@ -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.
@@ -95,7 +95,7 @@ Source2:        qpidd.pp
 %if %{fedora}
 #Patch0:         so_number.patch
 Patch0:         boost_system.patch
-#Patch1:         swig.patch
+Patch1:         swig.patch
 %endif
 
 %if %{rhel_4}
@@ -678,7 +678,7 @@ popd
 
 %if %{fedora}
 %patch0
-#%patch1
+%patch1
 %endif
 
 # apply qpid patch
@@ -944,7 +944,10 @@ rm -rf %{buildroot}
 %postun -p /sbin/ldconfig
 
 %changelog
-* Tue Jul 22 2010 Nuno Santos <nsantos at nsantos-laptop> - 0.7.946106-1
+* Tue Jul 27 2010 Nuno Santos <nsantos at redhat.com> - 0.7.946106-2
+- Patch for autoconf swig version comparison macro
+
+* Tue Jul 22 2010 Nuno Santos <nsantos at redhat.com> - 0.7.946106-1
 - Rebased to sync with mrg
 
 * Mon May  3 2010 Nuno Santos <nsantos at redhat.com> - 0.6.895736-4