diff --git a/subversion-1.4.4-swig1333.patch b/subversion-1.4.4-swig1333.patch new file mode 100644 index 0000000..022ad3a --- /dev/null +++ b/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 diff --git a/subversion.spec b/subversion.spec index 3546d97..da42858 100644 --- a/subversion.spec +++ b/subversion.spec @@ -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 @@ Patch2: subversion-0.20.1-deplibs.patch 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 @@ This package includes the Ruby bindings to the Subversion libraries. %if %{with_java} %patch7 -p1 -b .java %endif +%patch8 -p1 -b .swig1333 %build ./autogen.sh @@ -263,6 +265,9 @@ rm -rf ${RPM_BUILD_ROOT} %endif %changelog +* Wed Feb 13 2008 Joe Orton 1.4.6-3.fc7 +- fix swig build + * Wed Feb 13 2008 Joe Orton 1.4.6-2.fc7 - BuildRequire: perl-devel