From 69857115bea748b0d92ecdbadc1177e599c65815 Mon Sep 17 00:00:00 2001 From: Joe Orton Date: Thu, 2 Jun 2011 11:03:58 +0100 Subject: [PATCH] drop old java patch --- subversion.spec | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/subversion.spec b/subversion.spec index a6d7188..7920b87 100644 --- a/subversion.spec +++ b/subversion.spec @@ -32,7 +32,6 @@ Patch0: subversion-1.6.5-newlines.patch Patch2: subversion-1.6.0-deplibs.patch Patch3: subversion-1.6.1-rpath.patch Patch6: subversion-1.6.11-pie.patch -Patch7: subversion-1.1.3-java.patch Patch8: subversion-1.6.6-kwallet.patch Patch9: subversion-1.6.12-disable-client-test.patch BuildRequires: autoconf, libtool, python, python-devel, texinfo, which @@ -169,9 +168,6 @@ cd ../../.. %patch2 -p1 -b .deplibs %patch3 -p1 -b .rpath %patch6 -p1 -b .pie -%if %{with_java} -%patch7 -p1 -b .java -%endif %patch8 -p1 -b .kwallet %patch9 -p1 -b .disable-client-test @@ -191,6 +187,8 @@ mv tools/client-side/bash_completion . # Regenerate the buildsystem, so that: # 1) patches applied to configure.in take effect # 2) the swig bindings are regenerated using the system swig +# (2) is not ideal since typically upstream test with a different +# swig version ./autogen.sh --release # fix shebang lines, #111498