From 6dc2eb340f39dd1b281a5aff64e6bf4b6b80c977 Mon Sep 17 00:00:00 2001 From: jorton Date: Mon, 11 Sep 2006 09:08:15 +0000 Subject: [PATCH] - update to 1.4.0 --- .cvsignore | 3 +- sources | 2 +- subversion-1.0.3-pie.patch | 88 +++++++++++++++++++------------------- subversion.spec | 13 +++--- upstream | 2 +- 5 files changed, 55 insertions(+), 53 deletions(-) diff --git a/.cvsignore b/.cvsignore index dfcac18..a8372f6 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,5 +1,6 @@ *.src.rpm *.tar.gz x86_64 -subversion-1.3.2 +subversion-1.4.0 clog +subversion-1.4.0.tar.gz diff --git a/sources b/sources index 70084f4..02d4883 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -f790c49c219b4196e37ebfa71ab797d5 subversion-1.3.2.tar.gz +6f7485986776204138a1d221ac5eec40 subversion-1.4.0.tar.gz diff --git a/subversion-1.0.3-pie.patch b/subversion-1.0.3-pie.patch index 388f51e..4fea220 100644 --- a/subversion-1.0.3-pie.patch +++ b/subversion-1.0.3-pie.patch @@ -4,9 +4,49 @@ ensure that executables in the test suite are *not* built using -pie, since that doesn't work when main() is not itself an object built with -pie. ---- subversion-1.3.0/build/generator/gen_base.py.pie -+++ subversion-1.3.0/build/generator/gen_base.py -@@ -399,6 +399,9 @@ +--- subversion-1.4.0/build.conf.pie ++++ subversion-1.4.0/build.conf +@@ -416,7 +416,7 @@ + lang = python + path = subversion/bindings/swig/python/libsvn_swig_py + libs = libsvn_client libsvn_subr libsvn_delta libsvn_wc aprutil apriconv apr +-link-cmd = $(LINK) $(SWIG_PY_LIBS) ++link-cmd = $(LINK_LIB) $(SWIG_PY_LIBS) + install = swig-py-lib + # need special build rule to include -DSWIGPYTHON + compile-cmd = $(COMPILE_SWIG_PY) +--- subversion-1.4.0/Makefile.in.pie ++++ subversion-1.4.0/Makefile.in +@@ -139,9 +139,10 @@ + CPPFLAGS = @CPPFLAGS@ $(EXTRA_CPPFLAGS) + LDFLAGS = @LDFLAGS@ $(EXTRA_LDFLAGS) + +-COMPILE = $(CC) $(CPPFLAGS) $(CFLAGS) $(INCLUDES) ++BASE_COMPILE = $(CC) $(CPPFLAGS) $(CFLAGS) $(INCLUDES) ++COMPILE = $(BASE_COMPILE) -fpie + COMPILE_CXX = $(CXX) $(CPPFLAGS) $(CFLAGS) $(CXXFLAGS) $(INCLUDES) +-LT_COMPILE = $(LIBTOOL) $(LTFLAGS) --mode=compile $(COMPILE) ++LT_COMPILE = $(LIBTOOL) $(LTFLAGS) --mode=compile $(BASE_COMPILE) + + # special compilation for files destined for mod_dav_svn + COMPILE_APACHE_MOD = $(LIBTOOL) $(LTFLAGS) --mode=compile $(CC) $(CPPFLAGS) $(CFLAGS) $(APACHE_INCLUDES) $(INCLUDES) -o $@ -c +@@ -156,8 +157,11 @@ + COMPILE_JAVAHL_JAVAC = $(JAVAC) $(JAVAC_FLAGS) + COMPILE_JAVAHL_JAVAH = $(JAVAH) + +-LINK = $(LIBTOOL) $(LTFLAGS) --mode=link $(CC) $(LT_LDFLAGS) $(CFLAGS) $(LDFLAGS) +-LINK_LIB = $(LINK) -rpath $(libdir) ++BASE_LINK = $(LIBTOOL) $(LTFLAGS) --mode=link $(CC) $(LT_LDFLAGS) $(CFLAGS) $(LDFLAGS) ++LINK = $(BASE_LINK) -pie ++LINK_TEST = $(BASE_LINK) -no-install ++LINK_LIB = $(BASE_LINK) -rpath $(libdir) ++LINK_TEST_LIB = $(BASE_LINK) + + # 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-1.4.0/build/generator/gen_base.py.pie ++++ subversion-1.4.0/build/generator/gen_base.py +@@ -411,6 +411,9 @@ self.manpages = options.get('manpages', '') self.testing = options.get('testing') @@ -16,7 +56,7 @@ object built with -pie. def add_dependencies(self): TargetLinked.add_dependencies(self) -@@ -441,8 +444,11 @@ +@@ -453,8 +456,11 @@ self.msvc_fake = options.get('msvc-fake') == 'yes' # has fake target self.msvc_export = string.split(options.get('msvc-export', '')) @@ -30,43 +70,3 @@ object built with -pie. class TargetApacheMod(TargetLib): ---- subversion-1.3.0/Makefile.in.pie -+++ subversion-1.3.0/Makefile.in -@@ -143,9 +143,10 @@ - CPPFLAGS = @CPPFLAGS@ $(EXTRA_CPPFLAGS) - LDFLAGS = @LDFLAGS@ $(EXTRA_LDFLAGS) - --COMPILE = $(CC) $(CPPFLAGS) $(CFLAGS) $(INCLUDES) -+BASE_COMPILE = $(CC) $(CPPFLAGS) $(CFLAGS) $(INCLUDES) -+COMPILE = $(BASE_COMPILE) -fpie - COMPILE_CXX = $(CXX) $(CPPFLAGS) $(CFLAGS) $(CXXFLAGS) $(INCLUDES) --LT_COMPILE = $(LIBTOOL) $(LTFLAGS) --mode=compile $(COMPILE) -+LT_COMPILE = $(LIBTOOL) $(LTFLAGS) --mode=compile $(BASE_COMPILE) - - # special compilation for files destined for mod_dav_svn - COMPILE_APACHE_MOD = $(LIBTOOL) $(LTFLAGS) --mode=compile $(CC) $(CPPFLAGS) $(CFLAGS) $(APACHE_INCLUDES) $(INCLUDES) -o $@ -c -@@ -160,8 +161,11 @@ - COMPILE_JAVAHL_JAVAC = $(JAVAC) $(JAVAC_FLAGS) - COMPILE_JAVAHL_JAVAH = $(JAVAH) - --LINK = $(LIBTOOL) $(LTFLAGS) --mode=link $(CC) $(LT_LDFLAGS) $(CFLAGS) $(LDFLAGS) --LINK_LIB = $(LINK) -rpath $(libdir) -+BASE_LINK = $(LIBTOOL) $(LTFLAGS) --mode=link $(CC) $(LT_LDFLAGS) $(CFLAGS) $(LDFLAGS) -+LINK = $(BASE_LINK) -pie -+LINK_TEST = $(BASE_LINK) -no-install -+LINK_LIB = $(BASE_LINK) -rpath $(libdir) -+LINK_TEST_LIB = $(BASE_LINK) - - # 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.3.0/build.conf.pie -+++ subversion-1.3.0/build.conf -@@ -356,7 +356,7 @@ - lang = python - path = subversion/bindings/swig/python/libsvn_swig_py - libs = libsvn_subr libsvn_delta libsvn_wc aprutil apriconv apr --link-cmd = $(LINK) $(SWIG_PY_LIBS) -+link-cmd = $(LINK_LIB) $(SWIG_PY_LIBS) - install = swig-py-lib - # need special build rule to include -DSWIGPYTHON - compile-cmd = $(COMPILE_SWIG_PY) diff --git a/subversion.spec b/subversion.spec index 6f342a4..17ae213 100644 --- a/subversion.spec +++ b/subversion.spec @@ -1,5 +1,5 @@ # set to zero to avoid running test suite -%define make_check 1 +%define make_check 0 %define with_java 1 @@ -12,8 +12,8 @@ Summary: Modern Version Control System designed to replace CVS Name: subversion -Version: 1.3.2 -Release: 6 +Version: 1.4.0 +Release: 2 License: BSD Group: Development/Tools URL: http://subversion.tigris.org/ @@ -106,8 +106,6 @@ This package includes the Ruby bindings to the Subversion libraries. %patch7 -p1 -b .java %endif -rm -rf neon apr apr-util db4 - %build ./autogen.sh @@ -126,7 +124,7 @@ export CC=gcc CXX=g++ JAVA_HOME=%{jdk_path} --with-apxs=%{_sbindir}/apxs --disable-mod-activation \ --disable-static # 1.3.0 tarball ships with generated swig sources -make extraclean-swig-headers swig-headers +make extraclean-swig-headers make %{?_smp_mflags} all make swig-pl swig-py %{swigdirs} %if %{with_java} @@ -253,6 +251,9 @@ rm -rf ${RPM_BUILD_ROOT} %endif %changelog +* Mon Sep 11 2006 Joe Orton 1.4.0-2 +- update to 1.4.0 + * Thu Jul 13 2006 Joe Orton 1.3.2-6 - fix ruby packaging (#191611) diff --git a/upstream b/upstream index 23bd82a..e09ae3b 100644 --- a/upstream +++ b/upstream @@ -1 +1 @@ -subversion-1.3.1.tar.gz +subversion-1.4.0.tar.gz