- further swig bindings fix (upstream via Max Bowsher, #151798)

- fix perl File::Path dependency in filter-requires.sh

filter-requires.sh

@@ -1,3 +1,9 @@
 #!/bin/sh
+# Munge Perl requirements:
+# - remove dependency on Config::Inifiles
+# - only require File::Path >= 1.04, not >= 1.404
+/usr/lib/rpm/perl.req $* | 
+sed -e '/perl(Config::IniFiles)/d' \
+    -e 's/perl(File::Path) >= 1.0404/perl(File::Path) >= 1.04/'
 
-/usr/lib/rpm/perl.req $* | sed -e '/perl(Config::IniFiles)/d'
+    

subversion.spec

@@ -10,7 +10,7 @@
 Summary: Modern Version Control System designed to replace CVS
 Name: subversion
 Version: 1.1.3
-Release: 7
+Release: 8
 License: BSD
 Group: Development/Tools
 URL: http://subversion.tigris.org/
@@ -21,10 +21,9 @@ Source4: http://www.xsteve.at/prg/emacs/psvn.el
 Patch1: subversion-0.24.2-swig.patch
 Patch2: subversion-0.20.1-deplibs.patch
 Patch3: subversion-0.31.0-rpath.patch
-Patch4: subversion-1.1.3-newswig.patch
 Patch6: subversion-1.0.3-pie.patch
 Patch7: subversion-1.1.3-java.patch
-Patch8: subversion-1.1.3-filepathver.patch
+Patch9: subversion-1.1.3-newswig.patch
 BuildPreReq: autoconf, libtool, python, python-devel, texinfo
 BuildPreReq: db4-devel >= 4.1.25, swig >= 1.3.20-1, docbook-style-xsl
 BuildPreReq: apr-devel, apr-util-devel, neon-devel >= 0:0.24.7-1
@@ -91,12 +90,11 @@ This package includes the JNI bindings to the Subversion libraries.
 %patch1 -p1 -b .swig
 %patch2 -p1 -b .deplibs
 %patch3 -p1 -b .rpath
-%patch4 -p1 -b .newswig
 %patch6 -p1 -b .pie
 %if %{with_java}
 %patch7 -p1 -b .java
 %endif
-%patch8 -p1 -b .filepath
+%patch9 -p1 -b .newswig
 
 rm -rf neon apr apr-util db4
 
@@ -113,7 +111,7 @@ export CC=gcc CXX=g++ JAVA_HOME=%{jdk_path}
 %configure --with-apr=%{_prefix} --with-apr-util=%{_prefix} \
 	--with-swig --with-neon=%{_prefix} \
         --with-apxs=%{_sbindir}/apxs --disable-mod-activation \
-        --enable-swig-bindings=perl,python%{?_with_java:,java}
+        --enable-swig-bindings=perl,python
 make %{?_smp_mflags} all
 make swig-pl swig-py %{?_with_java:javahl} %{swigdirs}
 
@@ -222,6 +220,10 @@ rm -rf ${RPM_BUILD_ROOT}
 %endif
 
 %changelog
+* Tue Mar 22 2005 Joe Orton <jorton@redhat.com> 1.1.3-8
+- further swig bindings fix (upstream via Max Bowsher, #151798)
+- fix perl File::Path dependency in filter-requires.sh
+
 * Tue Mar 22 2005 Joe Orton <jorton@redhat.com> 1.1.3-7
 - restore swig bindings support (from upstream via Max Bowsher, #141343)
 - tweak SELinux commentary in default subversion.conf