From 5f612c9ef9a55bc3b1463946a9f95d22d9fd2b61 Mon Sep 17 00:00:00 2001 From: Joe Orton Date: Tue, 18 Jun 2013 16:48:20 +0100 Subject: [PATCH] update patches for 1.8.0 --- ....0-pie.patch => subversion-1.8.0-pie.patch | 19 +++++++------- ...path.patch => subversion-1.8.0-rpath.patch | 26 +++++++++---------- subversion.spec | 4 +-- 3 files changed, 23 insertions(+), 26 deletions(-) rename subversion-1.7.0-pie.patch => subversion-1.8.0-pie.patch (72%) rename subversion-1.7.0-rpath.patch => subversion-1.8.0-rpath.patch (63%) diff --git a/subversion-1.7.0-pie.patch b/subversion-1.8.0-pie.patch similarity index 72% rename from subversion-1.7.0-pie.patch rename to subversion-1.8.0-pie.patch index 85e9f07..7567c21 100644 --- a/subversion-1.7.0-pie.patch +++ b/subversion-1.8.0-pie.patch @@ -1,7 +1,7 @@ diff -uap subversion-1.7.0/build/generator/gen_base.py.pie subversion-1.7.0/build/generator/gen_base.py ---- subversion-1.7.0/build/generator/gen_base.py.pie 2011-10-12 09:25:30.510524103 +0100 -+++ subversion-1.7.0/build/generator/gen_base.py 2011-10-12 09:25:30.515650110 +0100 -@@ -406,7 +406,7 @@ class TargetLinked(Target): +--- subversion-1.8.0/build/generator/gen_base.py.pie ++++ subversion-1.8.0/build/generator/gen_base.py +@@ -409,7 +409,7 @@ class TargetLinked(Target): self.install = options.get('install') self.compile_cmd = options.get('compile-cmd') self.sources = options.get('sources', '*.c *.cpp') @@ -10,7 +10,7 @@ diff -uap subversion-1.7.0/build/generator/gen_base.py.pie subversion-1.7.0/buil self.external_lib = options.get('external-lib') self.external_project = options.get('external-project') -@@ -462,6 +462,11 @@ class TargetExe(TargetLinked): +@@ -465,6 +465,11 @@ class TargetExe(TargetLinked): self.manpages = options.get('manpages', '') self.testing = options.get('testing') @@ -22,7 +22,7 @@ diff -uap subversion-1.7.0/build/generator/gen_base.py.pie subversion-1.7.0/buil def add_dependencies(self): TargetLinked.add_dependencies(self) -@@ -507,8 +512,8 @@ class TargetLib(TargetLinked): +@@ -515,8 +520,8 @@ class TargetLib(TargetLinked): self.msvc_export = options.get('msvc-export', '').split() ### hmm. this is Makefile-specific @@ -33,10 +33,9 @@ diff -uap subversion-1.7.0/build/generator/gen_base.py.pie subversion-1.7.0/buil class TargetApacheMod(TargetLib): -diff -uap subversion-1.7.0/Makefile.in.pie subversion-1.7.0/Makefile.in ---- subversion-1.7.0/Makefile.in.pie 2011-10-12 09:25:30.511600030 +0100 -+++ subversion-1.7.0/Makefile.in 2011-10-12 09:26:16.757524426 +0100 -@@ -205,6 +205,9 @@ COMPILE_JAVAHL_JAVAH = $(JAVAH) +--- subversion-1.8.0/Makefile.in.pie ++++ subversion-1.8.0/Makefile.in +@@ -203,6 +203,9 @@ COMPILE_CXXHL_CXX = $(LIBTOOL) $(LTCXXFL LINK = $(LIBTOOL) $(LTFLAGS) --mode=link $(CC) $(LT_LDFLAGS) $(CFLAGS) $(LDFLAGS) LINK_LIB = $(LINK) $(LT_SO_VERSION) -rpath $(libdir) @@ -46,7 +45,7 @@ diff -uap subversion-1.7.0/Makefile.in.pie subversion-1.7.0/Makefile.in LINK_CXX = $(LIBTOOL) $(LTCXXFLAGS) --mode=link $(CXX) $(LT_LDFLAGS) $(CXXFLAGS) $(LDFLAGS) -rpath $(libdir) LINK_CXX_LIB = $(LINK_CXX) $(LT_SO_VERSION) -@@ -657,7 +660,7 @@ schema-clean: +@@ -676,7 +679,7 @@ schema-clean: $(PYTHON) $(top_srcdir)/build/transform_sql.py $< $(top_srcdir)/$@ .c.o: diff --git a/subversion-1.7.0-rpath.patch b/subversion-1.8.0-rpath.patch similarity index 63% rename from subversion-1.7.0-rpath.patch rename to subversion-1.8.0-rpath.patch index 2481346..37b518b 100644 --- a/subversion-1.7.0-rpath.patch +++ b/subversion-1.8.0-rpath.patch @@ -1,7 +1,7 @@ diff -uap subversion-1.7.0/build.conf.rpath subversion-1.7.0/build.conf ---- subversion-1.7.0/build.conf.rpath 2011-08-04 21:18:50.000000000 +0100 -+++ subversion-1.7.0/build.conf 2011-10-12 09:23:43.844525530 +0100 -@@ -478,7 +478,7 @@ type = swig_lib +--- subversion-1.8.0/build.conf.rpath ++++ subversion-1.8.0/build.conf +@@ -501,7 +501,7 @@ type = swig_lib lang = python path = subversion/bindings/swig/python/libsvn_swig_py libs = libsvn_client libsvn_wc libsvn_ra libsvn_delta libsvn_subr apriconv apr @@ -10,7 +10,7 @@ diff -uap subversion-1.7.0/build.conf.rpath subversion-1.7.0/build.conf install = swig-py-lib # need special build rule to include -DSWIGPYTHON compile-cmd = $(COMPILE_SWIG_PY) -@@ -501,7 +501,7 @@ type = swig_lib +@@ -524,7 +524,7 @@ type = swig_lib lang = ruby path = subversion/bindings/swig/ruby/libsvn_swig_ruby libs = libsvn_client libsvn_wc libsvn_delta libsvn_subr apriconv apr @@ -19,10 +19,9 @@ diff -uap subversion-1.7.0/build.conf.rpath subversion-1.7.0/build.conf install = swig-rb-lib # need special build rule to include compile-cmd = $(COMPILE_SWIG_RB) -diff -uap subversion-1.7.0/build/generator/gen_base.py.rpath subversion-1.7.0/build/generator/gen_base.py ---- subversion-1.7.0/build/generator/gen_base.py.rpath 2011-06-22 17:44:54.000000000 +0100 -+++ subversion-1.7.0/build/generator/gen_base.py 2011-10-12 09:23:15.368649375 +0100 -@@ -506,6 +506,10 @@ class TargetLib(TargetLinked): +--- subversion-1.8.0/build/generator/gen_base.py.rpath ++++ subversion-1.8.0/build/generator/gen_base.py +@@ -514,6 +514,10 @@ class TargetLib(TargetLinked): self.msvc_fake = options.get('msvc-fake') == 'yes' # has fake target self.msvc_export = options.get('msvc-export', '').split() @@ -33,12 +32,11 @@ diff -uap subversion-1.7.0/build/generator/gen_base.py.rpath subversion-1.7.0/bu class TargetApacheMod(TargetLib): def __init__(self, name, options, gen_obj): -diff -uap subversion-1.7.0/Makefile.in.rpath subversion-1.7.0/Makefile.in ---- subversion-1.7.0/Makefile.in.rpath 2011-07-16 12:50:53.000000000 +0100 -+++ subversion-1.7.0/Makefile.in 2011-10-12 09:24:36.165524732 +0100 -@@ -203,8 +203,8 @@ COMPILE_JAVAHL_CXX = $(LIBTOOL) $(LTCXXF - COMPILE_JAVAHL_JAVAC = $(JAVAC) $(JAVAC_FLAGS) - COMPILE_JAVAHL_JAVAH = $(JAVAH) +--- subversion-1.8.0/Makefile.in.rpath ++++ subversion-1.8.0/Makefile.in +@@ -201,8 +201,8 @@ COMPILE_JAVAHL_JAVAH = $(JAVAH) + # special compilation for files destined for cxxhl + COMPILE_CXXHL_CXX = $(LIBTOOL) $(LTCXXFLAGS) --mode=compile $(COMPILE_CXX) $(LT_CFLAGS) $(CXXHL_INCLUDES) -o $@ -c -LINK = $(LIBTOOL) $(LTFLAGS) --mode=link $(CC) $(LT_LDFLAGS) $(CFLAGS) $(LDFLAGS) -rpath $(libdir) -LINK_LIB = $(LINK) $(LT_SO_VERSION) diff --git a/subversion.spec b/subversion.spec index 21a9870..7fdbe54 100644 --- a/subversion.spec +++ b/subversion.spec @@ -38,8 +38,8 @@ Source5: psvn-init.el Source6: svnserve.service Source7: svnserve.tmpfiles Source8: svnserve.sysconf -Patch1: subversion-1.7.0-rpath.patch -Patch2: subversion-1.7.0-pie.patch +Patch1: subversion-1.8.0-rpath.patch +Patch2: subversion-1.8.0-pie.patch Patch3: subversion-1.8.0-kwallet.patch Patch4: subversion-1.8.0-rubybind.patch Patch5: subversion-1.8.0-aarch64.patch