drop old java patch
This commit is contained in:
parent
b2eee59779
commit
69857115be
|
@ -32,7 +32,6 @@ Patch0: subversion-1.6.5-newlines.patch
|
||||||
Patch2: subversion-1.6.0-deplibs.patch
|
Patch2: subversion-1.6.0-deplibs.patch
|
||||||
Patch3: subversion-1.6.1-rpath.patch
|
Patch3: subversion-1.6.1-rpath.patch
|
||||||
Patch6: subversion-1.6.11-pie.patch
|
Patch6: subversion-1.6.11-pie.patch
|
||||||
Patch7: subversion-1.1.3-java.patch
|
|
||||||
Patch8: subversion-1.6.6-kwallet.patch
|
Patch8: subversion-1.6.6-kwallet.patch
|
||||||
Patch9: subversion-1.6.12-disable-client-test.patch
|
Patch9: subversion-1.6.12-disable-client-test.patch
|
||||||
BuildRequires: autoconf, libtool, python, python-devel, texinfo, which
|
BuildRequires: autoconf, libtool, python, python-devel, texinfo, which
|
||||||
|
@ -169,9 +168,6 @@ cd ../../..
|
||||||
%patch2 -p1 -b .deplibs
|
%patch2 -p1 -b .deplibs
|
||||||
%patch3 -p1 -b .rpath
|
%patch3 -p1 -b .rpath
|
||||||
%patch6 -p1 -b .pie
|
%patch6 -p1 -b .pie
|
||||||
%if %{with_java}
|
|
||||||
%patch7 -p1 -b .java
|
|
||||||
%endif
|
|
||||||
%patch8 -p1 -b .kwallet
|
%patch8 -p1 -b .kwallet
|
||||||
%patch9 -p1 -b .disable-client-test
|
%patch9 -p1 -b .disable-client-test
|
||||||
|
|
||||||
|
@ -191,6 +187,8 @@ mv tools/client-side/bash_completion .
|
||||||
# Regenerate the buildsystem, so that:
|
# Regenerate the buildsystem, so that:
|
||||||
# 1) patches applied to configure.in take effect
|
# 1) patches applied to configure.in take effect
|
||||||
# 2) the swig bindings are regenerated using the system swig
|
# 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
|
./autogen.sh --release
|
||||||
|
|
||||||
# fix shebang lines, #111498
|
# fix shebang lines, #111498
|
||||||
|
|
Loading…
Reference in New Issue