improve library versioning so filenames are unique across releases

Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2022-07-29 10:52:39 +01:00 · 2022-07-23 09:34:39 +00:00 · 2022-07-05 16:08:46 +01:00 · 2022-07-05 14:30:11 +01:00 · 2022-06-13 15:27:35 +02:00 · 2022-05-31 22:09:00 +02:00
31 changed files with 2629 additions and 1194 deletions
--- a/.cvsignore
+++ b/.cvsignore
@ -1 +0,0 @@
-subversion-1.6.5.tar.bz2
--- a/.gitignore
+++ b/.gitignore
@ -0,0 +1,3 @@
+/subversion-*.tar.bz2
+/subversion-1\.[0-9]*\.[0-9]*/
+/results_subversion/
--- a/22
+++ b/22
@ -1,22 +0,0 @@
-# Makefile for source rpm: subversion
-# $Id: Makefile,v 1.3 2004/09/30 10:49:48 jorton Exp $
-NAME := subversion
-SPECFILE = $(firstword $(wildcard *.spec))
-UPSTREAM_CHECKS := asc
-
-define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
-endef
-
-MAKEFILE_COMMON := $(shell $(find-makefile-common))
-
-ifeq ($(MAKEFILE_COMMON),)
-# attempt a checkout
-define checkout-makefile-common
-test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
-endef
-
-MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
-endif
-
-include $(MAKEFILE_COMMON)
--- a/27
+++ b/27
@ -0,0 +1,27 @@
+#!/bin/sh
+
+version=$1
+
+echo "This update includes the latest stable release of _Apache Subversion_, version **${1}**".
+echo
+
+curl --silent -n "http://svn.apache.org/repos/asf/subversion/tags/$1/CHANGES" | \
+sed -n "
+/^#/d;
+/^Version ${1/-rc*/}/,/^Version /{
+/, from \/branches/d;
+/repos\/asf\/subversion\/tags/d;
+s,#\([0-9]*\),[SVN-\1](https://issues.apache.org/jira/browse/SVN-\1),;
+s/(r[0-9, retal]+)\*//g;
+s/^ *//;
+s/ +/ /g;
+s/^ *- \(.*\)$/#### \1/;
+s/\(.*visible changes.*:\)$/### \1/;
+/^ *$/d;
+/Windows/d
+/^Version /d
+s,(r1.*),,g
+s,\(@[0-9]*\),\\\1,g
+p;
+}
+" -
--- a/psvn.el
+++ b/psvn.el
--- a/pullrev.sh
+++ b/pullrev.sh
@ -0,0 +1,53 @@
+#!/bin/sh -e
+
+if [ $# -lt 1 ]; then
+    echo "What?"
+    exit 1
+fi
+
+repo="https://svn.apache.org/repos/asf/subversion/trunk"
+#repo="https://svn.apache.org/repos/asf/subversion/branches/1.11.x"
+prefix=`rpmspec -q --queryformat='%{name}-%{version}\n' ./subversion.spec | sed 1q`
+suffix="r$1${2:++}"
+fn="${prefix}-${suffix}.patch"
+vcurl="http://svn.apache.org/viewvc?view=revision&revision="
+
+if test -f ${fn}; then
+    mv -v -f ${fn} ${fn}\~
+    echo "# $0 $*" > ${fn}
+    sed '1{/#.*pullrev/d;};/^--- /,$d' < ${fn}\~ >> ${fn}
+else
+    echo "# $0 $*" > ${fn}
+fi
+
+new=0
+for r in $*; do
+   if ! grep -q "${vcurl}${r}" ${fn}; then
+       echo "${vcurl}${r}"
+       new=1
+   fi
+done >> ${fn}
+
+[ $new -eq 0 ] || echo >> ${fn}
+
+prev=/dev/null
+for r in $*; do
+    echo "+ fetching ${r}"
+    this=`mktemp /tmp/pullrevXXXXXX`
+    svn diff -c ${r} ${repo} | filterdiff --remove-timestamps --clean -x 'CHANGES' -x 'next-number' -x 'STATUS' \
+        --addprefix="${prefix}/" > ${this}
+    next=`mktemp /tmp/pullrevXXXXXX`
+    combinediff --quiet ${prev} ${this} > ${next}
+    rm -f "${this}"
+    [ "${prev}" = "/dev/null" ] || rm -f "${prev}"
+    prev=${next}
+done
+
+cat ${prev} >> ${fn}
+
+vi "${fn}"
+echo "+ git add ${fn}" 
+git add "${fn}"
+echo "+ spec template:"
+echo "PatchN: ${fn}"
+echo "%patchN -p1 -b .${suffix}"
--- a/2
+++ b/2
@ -1 +1 @@
-1a53a0e72bee0bf814f4da83a9b6a636  subversion-1.6.5.tar.bz2
+SHA512 (subversion-1.14.2.tar.bz2) = 20ada4688ca07d9fb8da4b7d53b5084568652a3b9418c65e688886bae950a16a3ff37710fcfc9c29ef14a89e75b2ceec4e9cf35d5876a7896ebc2b512cfb9ecc
--- a/subversion-1.1.3-java.patch
+++ b/subversion-1.1.3-java.patch
@ -1,11 +0,0 @@
--- subversion-1.4.3/build/ac-macros/java.m4.java
-+++ subversion-1.4.3/build/ac-macros/java.m4
-@@ -82,7 +82,7 @@
-     if test "$os_arch" = "Darwin"; then
-       AC_MSG_WARN([You may need to install the latest Java Development package from http://connect.apple.com/.  Apple no longer includes the JNI header files by default on Java updates.])
-     fi
-    JDK_SUITABLE=no
-+    JDK_SUITABLE=yes
-   fi
-   AC_MSG_RESULT([$JDK_SUITABLE])
- 
--- a/subversion-1.12.0-linking.patch
+++ b/subversion-1.12.0-linking.patch
@ -0,0 +1,84 @@
+
+Fix the way libtool is used to match standard practice:
+
+a) link ONLY libraries using -rpath $(libdir), not executables
+   .. this avoids adding an RPATH for $libdir to executables
+b) link non-installable test binaries using -no-install
+   .. only for convenience but should speed up builds slightly(?)
+
+--- subversion-1.12.0/build.conf.linking
+++ subversion-1.12.0/build.conf
+@@ -572,7 +572,7 @@
+ path = subversion/bindings/swig/python/libsvn_swig_py
+ libs = libsvn_client libsvn_wc libsvn_ra libsvn_delta libsvn_subr
+        apriconv apr python swig
+-link-cmd = $(LINK)
+link-cmd = $(LINK_LIB)
+ install = swig-py-lib
+ # need special build rule to include -DSWIGPYTHON
+ compile-cmd = $(COMPILE_SWIG_PY)
+@@ -598,7 +598,7 @@
+ lang = ruby
+ path = subversion/bindings/swig/ruby/libsvn_swig_ruby
+ libs = libsvn_client libsvn_wc libsvn_delta libsvn_subr apriconv apr ruby swig
+-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)
+@@ -769,6 +769,7 @@
+ libs = libsvn_repos libsvn_fs libsvn_delta libsvn_subr aprutil apriconv apr
+ msvc-static = yes
+ undefined-lib-symbols = yes
+link-cmd = $(LINK_TEST_LIB)
+ 
+ # ----------------------------------------------------------------------------
+ # Tests for libsvn_fs_base
+--- subversion-1.12.0/build/generator/gen_base.py.linking
+++ subversion-1.12.0/build/generator/gen_base.py
+@@ -599,7 +599,7 @@
+     self.install = options.get('install')
+     self.compile_cmd = options.get('compile-cmd')
+     self.sources = options.get('sources', '*.c *.cpp')
+-    self.link_cmd = options.get('link-cmd', '$(LINK)')
+    self.link_cmd = options.get('link-cmd', '$(LINK_LIB)')
+ 
+     self.external_lib = options.get('external-lib')
+     self.external_project = options.get('external-project')
+@@ -659,6 +659,14 @@
+ 
+     self.msvc_force_static = options.get('msvc-force-static') == 'yes'
+ 
+    if self.install in ['test', 'bdb-test', 'sub-test', ]:
+      self.link_cmd = '$(LINK_TEST)'
+    elif self.install in ['bin', 'tools']:
+      self.link_cmd = '$(LINK_EXE)'
+    elif self.link_cmd == '$(LINK_LIB)':
+      raise GenError('ERROR: Unknown executable link type for ' + self.name + \
+                     ': ' + self.link_cmd + ' (' + self.install + ')')
+    
+   def add_dependencies(self):
+     TargetLinked.add_dependencies(self)
+ 
+--- subversion-1.12.0/Makefile.in.linking
+++ subversion-1.12.0/Makefile.in
+@@ -268,11 +268,14 @@
+ COMPILE_SVNXX = $(LT_COMPILE_CXX) $(SVNXX_INCLUDES) -o $@ -c
+ COMPILE_SVNXX_TEST = $(LT_COMPILE_CXX) $(SVNXX_INCLUDES) $(BOOST_TEST_CPPFLAGS) -o $@ -c
+ 
+-LINK = $(LIBTOOL) $(LTFLAGS) --mode=link $(CC) $(LT_LDFLAGS) $(CFLAGS) $(LDFLAGS) -rpath $(libdir)
+-LINK_LIB = $(LINK) $(LT_SO_VERSION)
+-LINK_CXX = $(LIBTOOL) $(LTCXXFLAGS) --mode=link $(CXX) $(LT_LDFLAGS) $(CXXFLAGS) $(LDFLAGS) -rpath $(libdir)
+-LINK_CXX_LIB = $(LINK_CXX) $(LT_SO_VERSION)
+-LINK_SVNXX_TEST = $(LINK_CXX) $(BOOST_TEST_LDFLAGS)
+LINK = $(LIBTOOL) $(LTFLAGS) --mode=link $(CC) $(LT_LDFLAGS) $(CFLAGS) $(LDFLAGS)
+LINK_LIB = $(LINK) $(LT_SO_VERSION) -rpath $(libdir)
+LINK_CXX = $(LIBTOOL) $(LTCXXFLAGS) --mode=link $(CXX) $(LT_LDFLAGS) $(CXXFLAGS) $(LDFLAGS)
+LINK_CXX_LIB = $(LINK_CXX) $(LT_SO_VERSION) -rpath $(libdir)
+LINK_SVNXX_TEST = $(LINK_CXX) $(BOOST_TEST_LDFLAGS) -no-install
+LINK_TEST = $(LINK) -no-install
+LINK_TEST_LIB = $(LINK_TEST) -avoid-version
+LINK_EXE = $(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) -shared
--- a/subversion-1.14.0-testwarn.patch
+++ b/subversion-1.14.0-testwarn.patch
@ -0,0 +1,14 @@
+
+Suppress gcc 10 warning.
+
+--- subversion-1.14.0/subversion/tests/svn_test.h.testwarn
+++ subversion-1.14.0/subversion/tests/svn_test.h
+@@ -128,7 +128,7 @@
+       return svn_error_createf(SVN_ERR_TEST_FAILED, NULL,           \
+           "Strings not equal\n  Expected: '%s'\n  Found:    '%s'"   \
+           "\n  at %s:%d",                                           \
+-          tst_str2, tst_str1, __FILE__, __LINE__);                  \
+          tst_str2 ? tst_str2 : "(NULL)", tst_str1 ? tst_str1 : "(NULL)", __FILE__, __LINE__); \
+   } while(0)
+ 
+  /** Handy macro for testing integer equality.
--- a/subversion-1.14.1-fixjavatests.patch
+++ b/subversion-1.14.1-fixjavatests.patch
@ -0,0 +1,30 @@
+
+See upstream dev@subversion thread.  Fixes intermittent failure of
+javahl tests, particularly reproducible on aarch64.
+
+Message-ID: <11de5f5c-5059-b973-95a1-385e7913a63a@syntevo.com>
+From: Alexandr Miloslavskiy
+
+--- subversion-1.14.1/subversion/bindings/javahl/tests/org/apache/subversion/javahl/BasicTests.java.fixjavatests
+++ subversion-1.14.1/subversion/bindings/javahl/tests/org/apache/subversion/javahl/BasicTests.java
+@@ -4676,7 +4676,19 @@
+             // RuntimeException("Test exception") is expected here
+         }
+ 
+-        tunnelAgent.joinAndTest();
+        // In this test, there is a race condition that sometimes results in
+        // IOException when 'WAIT_TUNNEL' tries to read from a pipe that
+        // already has its read end closed. This is not an error, but
+        // it's hard to distinguish this case from other IOException which
+        // indicate a problem. To reproduce, simply wrap this test's body in
+        // a loop. The workaround is to ignore any detected IOException.
+        //
+        // tunnelAgent.joinAndTest();
+        try {
+            tunnelAgent.join();
+        } catch (InterruptedException e) {
+            e.printStackTrace ();
+        }
+     }
+ 
+     /**
--- a/subversion-1.14.1-python-3.11-build.patch
+++ b/subversion-1.14.1-python-3.11-build.patch
@ -0,0 +1,14 @@
+Use read_file instead of deprecated readfp  - removed in Python 3.11 
+
+diff -ur subversion-1.14.1/build/generator/gen_base.py subversion-1.14.1-patched/build/generator/gen_base.py
+--- subversion-1.14.1/build/generator/gen_base.py	2019-11-04 06:59:36.000000000 +0100
+++ subversion-1.14.1-patched/build/generator/gen_base.py	2021-12-15 14:04:50.041649320 +0100
+@@ -76,7 +76,7 @@
+ 
+     # Now read and parse build.conf
+     parser = configparser.ConfigParser()
+-    parser.readfp(open(fname))
+    parser.read_file(open(fname))
+ 
+     self.conf = build_path(os.path.abspath(fname))
+ 
--- a/subversion-1.14.1-testnomagic.patch
+++ b/subversion-1.14.1-testnomagic.patch
@ -0,0 +1,14 @@
+
+Fix intermittent failures when "svn add" guesses a near-empty file is binary and hence
+the output is different.
+
+--- subversion-1.14.1/subversion/tests/cmdline/svntest/main.py.testnoautoprops
+++ subversion-1.14.1/subversion/tests/cmdline/svntest/main.py
+@@ -691,6 +691,7 @@
+ 
+ [miscellany]
+ interactive-conflicts = false
+enable-magic-file = no
+ """
+     if exclusive_wc_locks:
+       config_contents += """
--- a/subversion-1.14.2-soversion.patch
+++ b/subversion-1.14.2-soversion.patch
@ -0,0 +1,23 @@
+
+Subversion libraries don't get properly versioned so the library
+names are always "libsvn_foo-1.so.0.0.0". Provide proper 
+versioning information to libtool *without* changing the soname
+for compatibility with upstream, so on-disk filenames are
+unique across different releases.
+
+--- subversion-1.14.2/configure.ac.soversion
+++ subversion-1.14.2/configure.ac
+@@ -112,7 +112,12 @@
+   SVN_APR_MAJOR_VERSION=1
+ fi
+ AC_SUBST(SVN_APR_MAJOR_VERSION)
+-SVN_LT_SOVERSION="-version-info $svn_lib_ver"
+
+m4_define([svn_ver_minor], m4_bpatsubst(AC_PACKAGE_VERSION, [[0-9]*\.\([0-9]*\)\.[0-9]*], [\1]))
+m4_define([svn_ver_patch], m4_bpatsubst(AC_PACKAGE_VERSION, [[0-9]*\.[0-9]*\.\([0-9]*\)], [\1]))
+svn_ver_current="`expr $svn_lib_ver + svn_ver_minor`"
+
+SVN_LT_SOVERSION="-version-info $svn_ver_current:svn_ver_patch:svn_ver_minor"
+ AC_SUBST(SVN_LT_SOVERSION)
+ AC_DEFINE_UNQUOTED(SVN_SOVERSION, $svn_lib_ver,
+                    [Subversion library major verson])
--- a/subversion-1.6.0-deplibs.patch
+++ b/subversion-1.6.0-deplibs.patch
@ -1,30 +0,0 @@
--- subversion-1.6.0/build/ac-macros/apr.m4.deplibs
-+++ subversion-1.6.0/build/ac-macros/apr.m4
-@@ -76,9 +76,9 @@ AC_DEFUN(SVN_LIB_APR,
- 
-   dnl When APR stores the dependent libs in the .la file, we don't need 
-   dnl --libs.
-  SVN_APR_LIBS="`$apr_config --link-libtool --libs`"
-+  SVN_APR_LIBS="`$apr_config --link-libtool`"
-   if test $? -ne 0; then
-    AC_MSG_ERROR([apr-config --link-libtool --libs failed])
-+    AC_MSG_ERROR([apr-config --link-libtool failed])
-   fi
- 
-   SVN_APR_EXPORT_LIBS="`$apr_config --link-ld --libs`"
--- subversion-1.6.0/build/ac-macros/aprutil.m4.deplibs
-+++ subversion-1.6.0/build/ac-macros/aprutil.m4
-@@ -77,11 +77,9 @@ AC_DEFUN(SVN_LIB_APRUTIL,
-     AC_MSG_ERROR([apu-config --prefix failed])
-   fi
- 
-  dnl When APR stores the dependent libs in the .la file, we don't need
-  dnl --libs.
-  SVN_APRUTIL_LIBS="`$apu_config --link-libtool --libs`"
-+  SVN_APRUTIL_LIBS="`$apu_config --link-libtool`"
-   if test $? -ne 0; then
-    AC_MSG_ERROR([apu-config --link-libtool --libs failed])
-+    AC_MSG_ERROR([apu-config --link-libtool failed])
-   fi
- 
-   SVN_APRUTIL_EXPORT_LIBS="`$apu_config --link-ld --libs`"
--- a/subversion-1.6.0-pie.patch
+++ b/subversion-1.6.0-pie.patch
@ -1,62 +0,0 @@
--- subversion-1.6.0/build.conf.pie
-+++ subversion-1.6.0/build.conf
-@@ -472,7 +472,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)
-@@ -495,7 +495,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.6.0/build/generator/gen_base.py.pie
-+++ subversion-1.6.0/build/generator/gen_base.py
-@@ -413,6 +413,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)
- 
-@@ -455,8 +458,11 @@ class TargetLib(TargetLinked):
-     self.msvc_fake = options.get('msvc-fake') == 'yes' # has fake target
-     self.msvc_export = options.get('msvc-export', '').split()
- 
-    ### 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.6.0/Makefile.in.pie
-+++ subversion-1.6.0/Makefile.in
-@@ -184,8 +185,11 @@ COMPILE_JAVAHL_CXX = $(LIBTOOL) $(LTCXXF
- COMPILE_JAVAHL_JAVAC = $(JAVAC) $(JAVAC_FLAGS)
- COMPILE_JAVAHL_JAVAH = $(JAVAH)
- 
-LINK_LIB = $(LINK) -rpath $(libdir)
-LINK = $(LIBTOOL) $(LTFLAGS) --mode=link $(CC) $(LT_LDFLAGS) $(CFLAGS) $(LDFLAGS) -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)
- LINK_CXX = $(LIBTOOL) $(LTCXXFLAGS) --mode=link $(CXX) $(LT_LDFLAGS) $(CXXFLAGS) $(LDFLAGS) -rpath $(libdir)
- 
- # special link rule for mod_dav_svn
--- a/subversion-1.6.1-rpath.patch
+++ b/subversion-1.6.1-rpath.patch
@ -1,54 +0,0 @@
-
-Libraries should be linked with -rpath $libdir but programs should not.
-Doing so for the latter means that a redundant RPATH entry of $libdir
-will end up in the binaries.
-
-The redundant RPATH can also cause obscure build failures by causing
-in-build binaries to pick up libraries from the system environment,
-which libtool will otherwise avoid.
-
--- subversion-1.6.1/build.conf.rpath
-+++ subversion-1.6.1/build.conf
-@@ -472,7 +472,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)
-@@ -495,7 +495,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.6.1/build/generator/gen_base.py.rpath
-+++ subversion-1.6.1/build/generator/gen_base.py
-@@ -455,6 +455,10 @@ class TargetLib(TargetLinked):
-     self.msvc_fake = options.get('msvc-fake') == 'yes' # has fake target
-     self.msvc_export = options.get('msvc-export', '').split()
- 
-+    ### hmm. this is Makefile-specific
-+    if self.link_cmd == '$(LINK)':
-+      self.link_cmd = '$(LINK_LIB)'
-+
- class TargetApacheMod(TargetLib):
- 
-   def __init__(self, name, options, gen_obj):
--- subversion-1.6.1/Makefile.in.rpath
-+++ subversion-1.6.1/Makefile.in
-@@ -184,7 +184,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_LIB = $(LINK) -rpath $(libdir)
-+LINK = $(LIBTOOL) $(LTFLAGS) --mode=link $(CC) $(LT_LDFLAGS) $(CFLAGS) $(LDFLAGS)
- LINK_CXX = $(LIBTOOL) $(LTCXXFLAGS) --mode=link $(CXX) $(LT_LDFLAGS) $(CXXFLAGS) $(LDFLAGS) -rpath $(libdir)
- 
- # special link rule for mod_dav_svn
--- a/subversion-1.6.2-kwallet.patch
+++ b/subversion-1.6.2-kwallet.patch
@ -1,25 +0,0 @@
-
-The first half of this is certainly upstream-worthy, but the second half is presumably
-some Fedora-specific KDE packaging thing.  It's not obvious how to get
-kde4-config to report the directory which contains the .so files.
-
--- subversion-1.6.2/build/ac-macros/kwallet.m4.kwallet
-+++ subversion-1.6.2/build/ac-macros/kwallet.m4
-@@ -45,14 +45,14 @@ AC_DEFUN(SVN_LIB_KWALLET,
-                     CPPFLAGS="$CPPFLAGS $d"
-                   done
-                   qt_include_dirs="`$PKG_CONFIG --cflags-only-I QtCore QtDBus QtGui`"
-                  kde_dir="`$kde4_config --prefix`"
-                  SVN_KWALLET_INCLUDES="$DBUS_CPPFLAGS $qt_include_dirs -I$kde_dir/include"
-+                  kde_include_dirs="-I`$kde4_config --path include`"
-+                  SVN_KWALLET_INCLUDES="$DBUS_CPPFLAGS $qt_include_dirs $kde_include_dirs"
-                   qt_libs_other_options="`$PKG_CONFIG --libs-only-other QtCore QtDBus QtGui`"
-                   SVN_KWALLET_LIBS="$DBUS_LIBS -lQtCore -lQtDBus -lQtGui -lkdecore -lkdeui $qt_libs_other_options"
-                   CXXFLAGS="$CXXFLAGS $SVN_KWALLET_INCLUDES"
-                   LIBS="$LIBS $SVN_KWALLET_LIBS"
-                   qt_lib_dirs="`$PKG_CONFIG --libs-only-L QtCore QtDBus QtGui`"
-                  LDFLAGS="$old_LDFLAGS $qt_lib_dirs -L$kde_dir/lib`$kde4_config --libsuffix`"
-+                  LDFLAGS="$old_LDFLAGS $qt_lib_dirs -L/usr/lib`$kde4_config --libsuffix`/kde4/devel"
-                   AC_LANG(C++)
-                   AC_LINK_IFELSE([
- #include <kwallet.h>
--- a/subversion-1.6.2.tar.gz.asc
+++ b/subversion-1.6.2.tar.gz.asc
@ -1,35 +0,0 @@
-----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.9 (GNU/Linux)
-
-iEYEABECAAYFAkoDD0IACgkQCwOubk4kUXx7kACgx2OOfBOPAMBeUHrM+xSsdsWj
-WLkAnA4tzj8eBBfKtfIUnomLB+0xSqh7
-=dIoL
-----END PGP SIGNATURE-----
-----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2.2 (GNU/Linux)
-
-iD8DBQBKA6AAxXIjJtpWHZERAv/PAJ4iSk7tHYYHI7t+EPmxC6pmD3hT9QCgk9lX
-/nEquZMpPhZie6qQWNDZyLs=
-=5jcM
-----END PGP SIGNATURE-----
-----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.9 (GNU/Linux)
-
-iEYEABECAAYFAkoDJg8ACgkQ9o1G+2zNQDhVYwCgpZMjlTopJIOREHHsr+E/775n
-O9YAniuC/5S5W92vRFpAahpH9j7GzGul
-=GMi5
-----END PGP SIGNATURE-----
-----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.9 (FreeBSD)
-
-iEYEABECAAYFAkoEpmkACgkQ/P1jBZgh97JkegCgvAWA8MlEycZIkWud4HLK0uw4
-YrsAnRFtdlwzeOI3knarehRe0q7ixYvg
-=9hZJ
-----END PGP SIGNATURE-----
-----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEABECAAYFAkoEWNoACgkQIEGVSeBq/j6U8QCgkkd3w7znQ/dMOtIQIGdg9gwC
-P/UAn3T6R8pj+3cOLSFsFUuy/V7bkGbU
-=GPSt
-----END PGP SIGNATURE-----
--- a/subversion-1.6.3.tar.gz.asc
+++ b/subversion-1.6.3.tar.gz.asc
@ -1,7 +0,0 @@
-----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.9 (GNU/Linux)
-
-iEYEABECAAYFAko5swkACgkQCwOubk4kUXwbpQCfT7+XfNkX8nb2HAO0og5Tn8Xu
-9ukAoPIKZ/+taVMeiPXRC8AX0x24niOr
-=1vmx
-----END PGP SIGNATURE-----
--- a/subversion-1.6.4.tar.bz2.asc
+++ b/subversion-1.6.4.tar.bz2.asc
@ -1,35 +0,0 @@
-----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.9 (GNU/Linux)
-
-iEYEABECAAYFAkp3xLQACgkQCwOubk4kUXxp8wCdEk4skjDqre08fEuF/bc+n05d
-WQIAoNzA2nVuza0td20YjDqXbX2lW7GG
-=BEAB
-----END PGP SIGNATURE-----
-----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.9 (GNU/Linux)
-
-iEYEABECAAYFAkp4nzUACgkQ5dMCc/WdJfBwZACgpAcORwz5rnbUpMacRRNZ7cNw
-v98AoPBo/9ULXBt4dPn021pjsLxgyUw3
-=FLdA
-----END PGP SIGNATURE-----
-----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.9 (GNU/Linux)
-
-iEYEABECAAYFAkp4k/kACgkQokEGqRcG/W5gdACguMlg/4QUAAsh811ffgM6upmt
-qA0AoLd1R8UXEqnozKjGPuzljtEDBolg
-=HVCk
-----END PGP SIGNATURE-----
-----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.9 (GNU/Linux)
-
-iEYEABECAAYFAkp5RxAACgkQ9o1G+2zNQDhMiwCgh8xaAhXxyp6/YHf2onxWEiXb
-hR8AmgKuMuBS+R8XDZaoLDx+i0o+XCHX
-=57CQ
-----END PGP SIGNATURE-----
-----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.9 (FreeBSD)
-
-iEYEABECAAYFAkp7AzwACgkQ/P1jBZgh97LPSACfV0Q1NEW7uilPCGyED7n3urqU
-VPIAnjJVMYpb6aG10C9ymDj0LiucKOi9
-=jGlb
-----END PGP SIGNATURE-----
--- a/subversion-1.6.4.tar.gz.asc
+++ b/subversion-1.6.4.tar.gz.asc
@ -1,35 +0,0 @@
-----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.9 (GNU/Linux)
-
-iEYEABECAAYFAkp3xLYACgkQCwOubk4kUXwuHwCgxFKL+QnzIebGGcjqPm4l/iBp
-/2QAni/Ye1w73QjIikRxSsvNaBxr7Ik6
-=Vkwq
-----END PGP SIGNATURE-----
-----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.9 (GNU/Linux)
-
-iEYEABECAAYFAkp4n9QACgkQ5dMCc/WdJfBD0QCg+UN5zZ9HS6bouwVexaFWYXbh
-GeEAmQGA7yQtvHgYJ97DJM3LNAW6cd5X
-=5fXs
-----END PGP SIGNATURE-----
-----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.9 (GNU/Linux)
-
-iEYEABECAAYFAkp4k+UACgkQokEGqRcG/W7VUQCeNFQ7VJgRxQFOG1Ukp026e+H4
-bDUAoIRMH84/Bb3OYa5Gr0xSOuhPhWEx
-=EfId
-----END PGP SIGNATURE-----
-----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.9 (GNU/Linux)
-
-iEYEABECAAYFAkp5RxgACgkQ9o1G+2zNQDgGHACdGJWmRW6L8qjrBpIPIqdvQfGw
-X7IAn2icEiXqv7/TMROxCVGJh5jvxVAx
-=2Td8
-----END PGP SIGNATURE-----
-----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.9 (FreeBSD)
-
-iEYEABECAAYFAkp7Az8ACgkQ/P1jBZgh97KJSQCgyQz56frR5zEAf+l4m/Ny3Dr5
-u50AmQErCcguvMp/MJva2oluweihoW4Y
-=ZQx2
-----END PGP SIGNATURE-----
--- a/subversion-1.8.0-rubybind.patch
+++ b/subversion-1.8.0-rubybind.patch
@ -0,0 +1,24 @@
+
+Try a little harder to avoid svnserve() bind failures.
+
+--- subversion-1.8.0/subversion/bindings/swig/ruby/test/util.rb.rubybind
+++ subversion-1.8.0/subversion/bindings/swig/ruby/test/util.rb
+@@ -39,7 +39,8 @@ module SvnTestUtil
+     @realm = "sample realm"
+ 
+     @svnserve_host = "127.0.0.1"
+-    @svnserve_ports = (64152..64282).collect{|x| x.to_s}
+    sport = (50000 + rand(100) * 100)
+    @svnserve_ports = (sport..sport + 99).collect{|x| x.to_s}
+ 
+     @tmp_path = Dir.mktmpdir
+     @wc_path = File.join(@tmp_path, "wc")
+@@ -252,6 +253,8 @@ realm = #{@realm}
+                "--listen-port", port,
+                "-d", "--foreground")
+         }
+        # wait a while for svnserve to attempt a bind() and possibly fail
+        sleep(1)
+         pid, status = Process.waitpid2(@svnserve_pid, Process::WNOHANG)
+         if status and status.exited?
+           if $DEBUG
--- a/subversion-1.8.5-swigplWall.patch
+++ b/subversion-1.8.5-swigplWall.patch
@ -0,0 +1,16 @@
+
+Don't drop -Wall in the swig Perl bindings, otherwise building with
+e.g. -Wformat-security might break.
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1037341
+
+--- subversion-1.8.5/subversion/bindings/swig/perl/native/Makefile.PL.in.swigplWall
+++ subversion-1.8.5/subversion/bindings/swig/perl/native/Makefile.PL.in
+@@ -54,7 +54,6 @@ my $includes = ' -I/usr/include/apr-1
+ # SWIG is using C++ style comments in an extern "C" code.
+ $cflags =~ s/-ansi\s+//g;
+ $cflags =~ s/-std=c89\s+//g;
+-$cflags =~ s/-Wall//g;
+ $cflags =~ s/-Wunused//g;
+ $cflags =~ s/-Wshadow//g;
+ $cflags =~ s/-Wstrict-prototypes//g;
--- a/subversion.conf
+++ b/subversion.conf
@ -1,6 +1,7 @@

 LoadModule dav_svn_module     modules/mod_dav_svn.so
 LoadModule authz_svn_module   modules/mod_authz_svn.so
+LoadModule dontdothat_module  modules/mod_dontdothat.so

 #
 # Example configuration to enable HTTP access for a directory
@ -9,7 +10,7 @@ LoadModule authz_svn_module   modules/mod_authz_svn.so
 #
 #   a) readable and writable by the 'apache' user, and
 #
-#   b) labelled with the 'http_sys_content_rw_t' context if using
+#   b) labelled with the 'httpd_sys_content_t' context if using
 #   SELinux
 #

@ -19,8 +20,8 @@ LoadModule authz_svn_module   modules/mod_authz_svn.so
 #
 #   # cd /var/www/svn
 #   # svnadmin create stuff   
-#   # chown -R apache.apache stuff
-#   # chcon -R -t -t http_sys_content_rw_t stuff
+#   # chown -R apache:apache stuff
+#   # chcon -R -t httpd_sys_content_t stuff
 #

 #<Location /repos>
--- a/subversion.spec
+++ b/subversion.spec
--- a/svnserve.service
+++ b/svnserve.service
@ -0,0 +1,13 @@
+[Unit]
+Description=Subversion protocol daemon
+After=syslog.target network.target
+Documentation=man:svnserve(8)
+
+[Service]
+Type=forking
+EnvironmentFile=/etc/sysconfig/svnserve
+ExecStart=/usr/bin/svnserve --daemon --pid-file=/run/svnserve/svnserve.pid $OPTIONS
+PrivateTmp=yes
+
+[Install]
+WantedBy=multi-user.target
--- a/svnserve.sysconf
+++ b/svnserve.sysconf
@ -0,0 +1,4 @@
+# OPTIONS is used to pass command-line arguments to svnserve.
+# 
+# Specify the repository location in -r parameter:
+OPTIONS="-r /var/svn"
--- a/svnserve.tmpfiles
+++ b/svnserve.tmpfiles
@ -0,0 +1 @@
+D /run/svnserve 0700 root root -
--- a/2
+++ b/2
@ -1 +1 @@
-subversion-1.6.5.tar.bz2
+subversion-1.6.12.tar.bz2
--- a/upstream-key.gpg
+++ b/upstream-key.gpg