rpms/subversion/devel subversion-1.5.1-rpath.patch, NONE, 1.1 subversion.spec, 1.119, 1.120 subversion-0.31.0-rpath.patch, 1.2, NONE subversion-1.4.6-javadir.patch, 1.1, NONE

[Joe Orton (jorton)]

Author: jorton

Update of /cvs/extras/rpms/subversion/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25639

Modified Files:
	subversion.spec 
Added Files:
	subversion-1.5.1-rpath.patch 
Removed Files:
	subversion-0.31.0-rpath.patch subversion-1.4.6-javadir.patch 
Log Message:
- fix %changelog removed in previous commit
- rediff -rpath patch for zero-fuzz
- remove old patch


subversion-1.5.1-rpath.patch:

--- NEW FILE subversion-1.5.1-rpath.patch ---
--- 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)


Index: subversion.spec
===================================================================
RCS file: /cvs/extras/rpms/subversion/devel/subversion.spec,v
retrieving revision 1.119
retrieving revision 1.120
diff -u -r1.119 -r1.120
--- subversion.spec	28 Jul 2008 08:18:44 -0000	1.119
+++ subversion.spec	28 Jul 2008 09:29:54 -0000	1.120
@@ -24,7 +24,7 @@
 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 @@
 %{_javadir}/svn-javahl.jar
 %endif
 
+%changelog
 * Mon Jul 28 2008 Joe Orton <jorton at redhat.com> 1.5.1-2
 - update to 1.5.1
 - require suitable APR


--- subversion-0.31.0-rpath.patch DELETED ---


--- subversion-1.4.6-javadir.patch DELETED ---