- fix %changelog removed in previous commit

- rediff -rpath patch for zero-fuzz
- remove old patch

subversion-0.31.0-rpath.patch

@@ -1,28 +0,0 @@
-
-Only pass -rpath $(libdir) on the link line when linking libraries,
-not programs.
-
---- subversion-0.31.0/build/generator/gen_base.py.rpath
-+++ subversion-0.31.0/build/generator/gen_base.py
-@@ -421,6 +421,9 @@
-     tfile = '%s-%s%s' % (name, cfg.version, extmap['lib', 'target'])
-     self.filename = os.path.join(self.path, tfile)
- 
-+    ### hmm. this is Makefile-specific
-+    self.link_cmd = '$(LINK_LIB)'
-+
- class TargetApacheMod(TargetLib):
- 
-   def __init__(self, name, options, cfg, extmap):
---- subversion-0.31.0/Makefile.in.rpath
-+++ subversion-0.31.0/Makefile.in
-@@ -127,7 +127,8 @@
- COMPILE_SWIG_JAVA = $(LIBTOOL) $(LTFLAGS) --mode=compile $(CC) $(CPPFLAGS) $(CFLAGS) $(SWIG_JAVA_INCLUDES) $(INCLUDES) -o $@ -c
- COMPILE_SWIG_PL = $(LIBTOOL) $(LTFLAGS) --mode=compile $(CC) $(CPPFLAGS) $(CFLAGS) $(SWIG_PL_INCLUDES) $(INCLUDES) -o $@ -c
- 
--LINK = $(LIBTOOL) $(LTFLAGS) --mode=link $(CC) $(LT_LDFLAGS) $(CFLAGS) $(LDFLAGS) -rpath $(libdir)
-+LINK = $(LIBTOOL) $(LTFLAGS) --mode=link $(CC) $(LT_LDFLAGS) $(CFLAGS) $(LDFLAGS)
-+LINK_LIB = $(LINK) -rpath $(libdir)
- 
- # special link rule for mod_dav_svn
- LINK_APACHE_MOD = $(LIBTOOL) $(LTFLAGS) --mode=link $(CC) $(LT_LDFLAGS) $(CFLAGS) $(LDFLAGS) -rpath $(APACHE_LIBEXECDIR) -avoid-version -module

subversion-1.4.6-javadir.patch

@@ -1,19 +0,0 @@
-Make it possible for %install to specify %_javadir as destination
-Lubomir Kundrak <lkundrak@redhat.com>
-
-diff -urp subversion-1.4.6.orig/Makefile.in subversion-1.4.6/Makefile.in
---- subversion-1.4.6.orig/Makefile.in	2008-02-21 11:05:31.000000000 +0100
-+++ subversion-1.4.6/Makefile.in	2008-02-21 11:05:15.000000000 +0100
-@@ -71,9 +71,9 @@ swig_pydir_extra = @libdir@/svn-python/s
- swig_pldir = @libdir@/svn-perl
- swig_rbdir = $(SWIG_RB_SITE_ARCH_DIR)/svn/ext
- 
--javahl_javadir = @libdir@/svn-javahl
--javahl_javahdir = @libdir@/svn-javahl/include
--javahl_libdir = @libdir@
-+javahl_javadir ?= @libdir@/svn-javahl
-+javahl_javahdir ?= @libdir@/svn-javahl/include
-+javahl_libdir ?= @libdir@
- 
- MSGFMT = @MSGFMT@
- MSGFMTFLAGS = @MSGFMTFLAGS@

subversion-1.5.1-rpath.patch

@@ -0,0 +1,24 @@
+--- subversion-1.5.1/build/generator/gen_base.py.rpath
++++ subversion-1.5.1/build/generator/gen_base.py
+@@ -453,6 +453,9 @@ class TargetLib(TargetLinked):
+     self.msvc_fake = options.get('msvc-fake') == 'yes' # has fake target
+     self.msvc_export = string.split(options.get('msvc-export', ''))
+ 
++    ### hmm. this is Makefile-specific
++    self.link_cmd = '$(LINK_LIB)'
++
+ class TargetApacheMod(TargetLib):
+ 
+   def __init__(self, name, options, gen_obj):
+--- subversion-1.5.1/Makefile.in.rpath
++++ subversion-1.5.1/Makefile.in
+@@ -167,7 +167,8 @@ COMPILE_JAVAHL_CXX = $(LIBTOOL) $(LTCXXF
+ COMPILE_JAVAHL_JAVAC = $(JAVAC) $(JAVAC_FLAGS)
+ COMPILE_JAVAHL_JAVAH = $(JAVAH)
+ 
+-LINK = $(LIBTOOL) $(LTFLAGS) --mode=link $(CC) $(LT_LDFLAGS) $(CFLAGS) $(LDFLAGS) -rpath $(libdir)
++LINK = $(LIBTOOL) $(LTFLAGS) --mode=link $(CC) $(LT_LDFLAGS) $(CFLAGS) $(LDFLAGS)
++LINK_LIB = $(LINK) -rpath $(libdir)
+ 
+ # special link rule for mod_dav_svn
+ LINK_APACHE_MOD = $(LIBTOOL) $(LTFLAGS) --mode=link $(CC) $(LT_LDFLAGS) $(CFLAGS) $(LDFLAGS) -rpath $(APACHE_LIBEXECDIR) -avoid-version -module $(APACHE_LDFLAGS)

subversion.spec

@@ -24,7 +24,7 @@ Source1: subversion.conf
 Source3: filter-requires.sh
 Source4: http://www.xsteve.at/prg/emacs/psvn.el
 Patch2: subversion-0.20.1-deplibs.patch
-Patch3: subversion-0.31.0-rpath.patch
+Patch3: subversion-1.5.1-rpath.patch
 Patch6: subversion-1.5.0-pie.patch
 Patch7: subversion-1.1.3-java.patch
 Patch8: subversion-1.5.0-perl510.patch
@@ -276,6 +276,7 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_javadir}/svn-javahl.jar
 %endif
 
+%changelog
 * Mon Jul 28 2008 Joe Orton <jorton@redhat.com> 1.5.1-2
 - update to 1.5.1
 - require suitable APR