rpms/subversion/devel subversion-1.4.4-swig1333.patch, NONE, 1.1 subversion.spec, 1.102, 1.103

[Joe Orton (jorton)]

Author: jorton

Update of /cvs/extras/rpms/subversion/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12608

Modified Files:
	subversion.spec 
Added Files:
	subversion-1.4.4-swig1333.patch 
Log Message:
* Thu Dec  6 2007 Joe Orton <jorton at redhat.com> 1.4.4-10
- fix build with swig 1.3.33 (patch by Torsten Landschoff)


subversion-1.4.4-swig1333.patch:

--- NEW FILE subversion-1.4.4-swig1333.patch ---

http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=453166

# For some reason, rubyhead.swg is included without being needed (at least 
# for the current swig 1.3.33 version). This leads to a redefinition of 
# _mSWIG. The documentation of SWIG only talks about including just 
# the external_runtime file, not any additional includes. Also, the other
# bindings do not include anything from SWIG apart from the external 
# runtime. So I think this patch should suffice.  
#
#  -- Torsten Landschoff

Index: subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb.c
===================================================================
--- subversion-1.4.4/subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb.c.swig133
+++ subversion-1.4.4/subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb.c
@@ -1,4 +1,3 @@
-#include "rubyhead.swg"
 #include "swig_ruby_external_runtime.swg"
 #include "swigutil_rb.h"
 #include <st.h>


Index: subversion.spec
===================================================================
RCS file: /cvs/extras/rpms/subversion/devel/subversion.spec,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -r1.102 -r1.103
--- subversion.spec	5 Dec 2007 19:51:30 -0000	1.102
+++ subversion.spec	6 Dec 2007 11:16:21 -0000	1.103
@@ -15,7 +15,7 @@
 Summary: Modern Version Control System designed to replace CVS
 Name: subversion
 Version: 1.4.4
-Release: 9
+Release: 10
 License: ASL 1.1
 Group: Development/Tools
 URL: http://subversion.tigris.org/
@@ -28,6 +28,7 @@
 Patch6: subversion-1.0.3-pie.patch
 Patch7: subversion-1.1.3-java.patch
 Patch8: subversion-1.4.4-macropen.patch
+Patch9: subversion-1.4.4-swig1333.patch
 BuildRequires: autoconf, libtool, python, python-devel, texinfo, which
 BuildRequires: db4-devel >= 4.1.25, swig >= 1.3.24, gettext
 BuildRequires: apr-devel >= 0.9.7, apr-util-devel >= 0.9.7
@@ -110,6 +111,7 @@
 %patch7 -p1 -b .java
 %endif
 %patch8 -p1 -b .macropen
+%patch9 -p1 -b .swig133
 
 %build
 ./autogen.sh
@@ -274,6 +276,9 @@
 %endif
 
 %changelog
+* Thu Dec  6 2007 Joe Orton <jorton at redhat.com> 1.4.4-10
+- fix build with swig 1.3.33 (patch by Torsten Landschoff)
+
 * Wed Dec  5 2007 Joe Orton <jorton at redhat.com> 1.4.4-9
 - rebuild for OpenLDAP soname bump