rpms/subversion/F-7 subversion-1.4.4-swig1333.patch, NONE, 1.1 subversion.spec, 1.97, 1.98

[Joe Orton (jorton)]

Author: jorton

Update of /cvs/extras/rpms/subversion/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18302

Modified Files:
	subversion.spec 
Added Files:
	subversion-1.4.4-swig1333.patch 
Log Message:
* Wed Feb 13 2008 Joe Orton <jorton at redhat.com> 1.4.6-3.fc7
- fix swig build


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/F-7/subversion.spec,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -r1.97 -r1.98
--- subversion.spec	13 Feb 2008 14:41:44 -0000	1.97
+++ subversion.spec	13 Feb 2008 14:59:43 -0000	1.98
@@ -15,7 +15,7 @@
 Summary: Modern Version Control System designed to replace CVS
 Name: subversion
 Version: 1.4.6
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: BSD
 Group: Development/Tools
 URL: http://subversion.tigris.org/
@@ -27,6 +27,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-swig1333.patch
 BuildRequires: autoconf, libtool, python, python-devel, texinfo, which
 BuildRequires: db4-devel >= 4.1.25, swig >= 1.3.24, gettext, perl-devel
 BuildRequires: apr-devel >= 0.9.7, apr-util-devel >= 0.9.7
@@ -107,6 +108,7 @@
 %if %{with_java}
 %patch7 -p1 -b .java
 %endif
+%patch8 -p1 -b .swig1333
 
 %build
 ./autogen.sh
@@ -263,6 +265,9 @@
 %endif
 
 %changelog
+* Wed Feb 13 2008 Joe Orton <jorton at redhat.com> 1.4.6-3.fc7
+- fix swig build
+
 * Wed Feb 13 2008 Joe Orton <jorton at redhat.com> 1.4.6-2.fc7
 - BuildRequire: perl-devel