- fix build with swig 1.3.33 (patch by Torsten Landschoff)

subversion-1.4.4-swig1333.patch

@@ -0,0 +1,21 @@
+
+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>

subversion.spec

@@ -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 @@ Patch3: subversion-0.31.0-rpath.patch
 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 @@ This package includes the Ruby bindings to the Subversion libraries.
 %patch7 -p1 -b .java
 %endif
 %patch8 -p1 -b .macropen
+%patch9 -p1 -b .swig133
 
 %build
 ./autogen.sh
@@ -274,6 +276,9 @@ rm -rf ${RPM_BUILD_ROOT}
 %endif
 
 %changelog
+* Thu Dec  6 2007 Joe Orton <jorton@redhat.com> 1.4.4-10
+- fix build with swig 1.3.33 (patch by Torsten Landschoff)
+
 * Wed Dec  5 2007 Joe Orton <jorton@redhat.com> 1.4.4-9
 - rebuild for OpenLDAP soname bump