rpms/subversion/devel subversion-1.5.0-pie.patch, NONE, 1.1 subversion.spec, 1.110, 1.111 upstream, 1.16, 1.17 subversion-1.0.3-pie.patch, 1.9, NONE subversion-1.4.4-macropen.patch, 1.1, NONE subversion-1.4.4-swig1333.patch, 1.1, NONE

Joe Orton (jorton) fedora-extras-commits at redhat.com
Thu Jun 26 13:45:14 UTC 2008 

Author: jorton

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

Modified Files:
	subversion.spec upstream 
Added Files:
	subversion-1.5.0-pie.patch 
Removed Files:
	subversion-1.0.3-pie.patch subversion-1.4.4-macropen.patch 
	subversion-1.4.4-swig1333.patch 
Log Message:
* Thu Jun 26 2008 Joe Orton <jorton at redhat.com> 1.5.0-2
- update to 1.5.0


subversion-1.5.0-pie.patch:

--- NEW FILE subversion-1.5.0-pie.patch ---
--- subversion-1.5.0/build.conf.pie
+++ subversion-1.5.0/build.conf
@@ -452,7 +452,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
-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)
@@ -475,7 +475,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
-link-cmd = $(LINK) $(SWIG_RB_LIBS)
+link-cmd = $(LINK_LIB) $(SWIG_RB_LIBS)
 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
@@ -411,6 +411,9 @@ class TargetExe(TargetLinked):
     self.manpages = options.get('manpages', '')
     self.testing = options.get('testing')
 
+    if self.install == 'test' or self.install == 'bdb-test':
+      self.link_cmd = '$(LINK_TEST)'
+
   def add_dependencies(self):
     TargetLinked.add_dependencies(self)
 
@@ -453,8 +456,11 @@ 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)'
+    ### more Makefile-specific stuff:
+    if self.install == 'test':
+      self.link_cmd = '$(LINK_TEST_LIB)'
+    elif self.link_cmd == '$(LINK)':
+      self.link_cmd = '$(LINK_LIB)'
 
 class TargetApacheMod(TargetLib):
 
--- subversion-1.5.0/Makefile.in.pie
+++ subversion-1.5.0/Makefile.in
@@ -2,7 +2,7 @@
 # Makefile.in:  template Makefile for Subversion
 #
 # ====================================================================
-# Copyright (c) 2000-2006 CollabNet.  All rights reserved.
+# Copyright (c) 2000-2006, 2008 CollabNet.  All rights reserved.
 #
 # 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)
 LDFLAGS = @LDFLAGS@ $(EXTRA_LDFLAGS)
 
-COMPILE = $(CC) $(CPPFLAGS) $(CFLAGS) $(INCLUDES)
+BASE_COMPILE = $(CC) $(CPPFLAGS) $(CFLAGS) $(INCLUDES)
+COMPILE = $(BASE_COMPILE) -fpie
 COMPILE_CXX = $(CXX) $(CPPFLAGS) $(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
@@ -167,8 +168,11 @@ 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)
-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)


Index: subversion.spec
===================================================================
RCS file: /cvs/extras/rpms/subversion/devel/subversion.spec,v
retrieving revision 1.110
retrieving revision 1.111
diff -u -r1.110 -r1.111
--- subversion.spec	3 Mar 2008 23:59:22 -0000	1.110
+++ subversion.spec	26 Jun 2008 13:44:29 -0000	1.111
@@ -1,5 +1,5 @@
 # set to zero to avoid running test suite
-%define make_check 0
+%define make_check 1
 
 %define with_java 1
 
@@ -14,8 +14,8 @@
 
 Summary: Modern Version Control System designed to replace CVS
 Name: subversion
-Version: 1.4.6
-Release: 7
+Version: 1.5.0
+Release: 2
 License: ASL 1.1
 Group: Development/Tools
 URL: http://subversion.tigris.org/
@@ -25,11 +25,8 @@
 Source4: http://www.xsteve.at/prg/emacs/psvn.el
 Patch2: subversion-0.20.1-deplibs.patch
 Patch3: subversion-0.31.0-rpath.patch
-Patch6: subversion-1.0.3-pie.patch
+Patch6: subversion-1.5.0-pie.patch
 Patch7: subversion-1.1.3-java.patch
-Patch8: subversion-1.4.4-macropen.patch
-Patch9: subversion-1.4.4-swig1333.patch
-Patch10: subversion-1.4.6-javadir.patch
 BuildRequires: autoconf, libtool, python, python-devel, texinfo, which
 BuildRequires: db4-devel >= 4.1.25, swig >= 1.3.24, gettext
 BuildRequires: apr-devel >= 0.9.7, apr-util-devel >= 0.9.7
@@ -111,12 +108,10 @@
 %if %{with_java}
 %patch7 -p1 -b .java
 %endif
-%patch8 -p1 -b .macropen
-%patch9 -p1 -b .swig133
-%patch10 -p1 -b .javadir
 
 %build
-./autogen.sh
+# Regenerate after patches to build.conf et al
+autoheader && autoconf && ./gen-make.py --reload
 
 # fix shebang lines, #111498
 perl -pi -e 's|/usr/bin/env perl -w|/usr/bin/perl -w|' tools/hook-scripts/*.pl.in
@@ -133,12 +128,12 @@
         --with-ruby-sitedir=%{ruby_sitearch} \
         --with-apxs=%{_sbindir}/apxs --disable-mod-activation \
         --disable-static --disable-neon-version-check
-# 1.3.0 tarball ships with generated swig sources
-make extraclean-swig-headers
 make %{?_smp_mflags} all
 make swig-py swig-py-lib %{swigdirs}
 make swig-pl swig-pl-lib swig-rb swig-rb-lib
 %if %{with_java}
+# javahl-javah does not parallel-make with javahl
+make javahl-java javahl-javah
 make %{?_smp_mflags} javahl
 %endif
 
@@ -278,6 +273,9 @@
 %endif
 
 %changelog
+* Thu Jun 26 2008 Joe Orton <jorton at redhat.com> 1.5.0-2
+- update to 1.5.0
+
 * Mon Mar  3 2008 Tom "spot" Callaway <tcallawa at redhat.com> 1.4.6-7
 - tests are randomly failing, unrelated to new perl, disabled tests
 


Index: upstream
===================================================================
RCS file: /cvs/extras/rpms/subversion/devel/upstream,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- upstream	21 Dec 2007 19:51:45 -0000	1.16
+++ upstream	26 Jun 2008 13:44:29 -0000	1.17
@@ -1 +1 @@
-subversion-1.4.6.tar.gz
+subversion-1.5.0.tar.gz


--- subversion-1.0.3-pie.patch DELETED ---


--- subversion-1.4.4-macropen.patch DELETED ---


--- subversion-1.4.4-swig1333.patch DELETED ---

More information about the fedora-extras-commits mailing list