diff --git a/subversion-1.5.0-pie.patch b/subversion-1.5.2-pie.patch similarity index 88% rename from subversion-1.5.0-pie.patch rename to subversion-1.5.2-pie.patch index 43a7eca..967fde7 100644 --- a/subversion-1.5.0-pie.patch +++ b/subversion-1.5.2-pie.patch @@ -1,5 +1,5 @@ ---- subversion-1.5.0/build.conf.pie -+++ subversion-1.5.0/build.conf +--- subversion-1.5.2/build.conf.pie ++++ subversion-1.5.2/build.conf @@ -452,7 +452,7 @@ type = swig_lib lang = python path = subversion/bindings/swig/python/libsvn_swig_py @@ -18,8 +18,8 @@ install = swig-rb-lib # need special build rule to include compile-cmd = $(COMPILE_SWIG_RB) ---- subversion-1.5.0/build/generator/gen_base.py.pie -+++ subversion-1.5.0/build/generator/gen_base.py +--- subversion-1.5.2/build/generator/gen_base.py.pie ++++ subversion-1.5.2/build/generator/gen_base.py @@ -411,6 +411,9 @@ class TargetExe(TargetLinked): self.manpages = options.get('manpages', '') self.testing = options.get('testing') @@ -44,8 +44,8 @@ class TargetApacheMod(TargetLib): ---- subversion-1.5.0/Makefile.in.pie -+++ subversion-1.5.0/Makefile.in +--- subversion-1.5.2/Makefile.in.pie ++++ subversion-1.5.2/Makefile.in @@ -2,7 +2,7 @@ # Makefile.in: template Makefile for Subversion # @@ -55,9 +55,9 @@ # # This software is licensed as described in the file COPYING, which # you should have received as part of this distribution. The terms -@@ -150,9 +150,10 @@ CXXFLAGS = @CXXFLAGS@ $(EXTRA_CXXFLAGS) - CPPFLAGS = @CPPFLAGS@ $(EXTRA_CPPFLAGS) +@@ -151,9 +151,10 @@ CPPFLAGS = @CPPFLAGS@ $(EXTRA_CPPFLAGS) LDFLAGS = @LDFLAGS@ $(EXTRA_LDFLAGS) + SWIG_LDFLAGS = @SWIG_LDFLAGS@ $(EXTRA_SWIG_LDFLAGS) -COMPILE = $(CC) $(CPPFLAGS) $(CFLAGS) $(INCLUDES) +BASE_COMPILE = $(CC) $(CPPFLAGS) $(CFLAGS) $(INCLUDES) @@ -68,7 +68,7 @@ # special compilation for files destined for mod_dav_svn COMPILE_APACHE_MOD = $(LIBTOOL) $(LTFLAGS) --mode=compile $(CC) $(CPPFLAGS) $(CFLAGS) $(APACHE_INCLUDES) $(INCLUDES) -o $@ -c -@@ -167,8 +168,11 @@ COMPILE_JAVAHL_CXX = $(LIBTOOL) $(LTCXXF +@@ -168,8 +169,11 @@ COMPILE_JAVAHL_CXX = $(LIBTOOL) $(LTCXXF COMPILE_JAVAHL_JAVAC = $(JAVAC) $(JAVAC_FLAGS) COMPILE_JAVAHL_JAVAH = $(JAVAH) diff --git a/subversion.spec b/subversion.spec index 2f9c2ea..eefbc74 100644 --- a/subversion.spec +++ b/subversion.spec @@ -25,7 +25,7 @@ Source3: filter-requires.sh Source4: http://www.xsteve.at/prg/emacs/psvn.el Patch2: subversion-0.20.1-deplibs.patch Patch3: subversion-1.5.1-rpath.patch -Patch6: subversion-1.5.0-pie.patch +Patch6: subversion-1.5.2-pie.patch Patch7: subversion-1.1.3-java.patch Patch8: subversion-1.5.0-perl510.patch BuildRequires: autoconf, libtool, python, python-devel, texinfo, which