diff --git a/subversion-1.6.0-deplibs.patch b/subversion-1.6.0-deplibs.patch deleted file mode 100644 index d892a7b..0000000 --- a/subversion-1.6.0-deplibs.patch +++ /dev/null @@ -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`" diff --git a/subversion-1.6.0-java.patch b/subversion-1.6.0-java.patch deleted file mode 100644 index 56423d8..0000000 --- a/subversion-1.6.0-java.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- subversion-1.6.0/build/ac-macros/java.m4 2007-10-10 20:36:09.000000000 +0200 -+++ subversion-1.6.0/build/ac-macros/java.m4-gil 2009-04-09 10:09:19.000000000 +0200 -@@ -83,7 +83,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]) - diff --git a/subversion-1.6.0-pie.patch b/subversion-1.6.0-pie.patch deleted file mode 100644 index 15cfa8f..0000000 --- a/subversion-1.6.0-pie.patch +++ /dev/null @@ -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 diff --git a/subversion-1.6.1-rpath.patch b/subversion-1.6.1-rpath.patch deleted file mode 100644 index 4cf8291..0000000 --- a/subversion-1.6.1-rpath.patch +++ /dev/null @@ -1,53 +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 diff --git a/subversion-1.6.5-newlines.patch b/subversion-1.6.5-newlines.patch deleted file mode 100644 index c127665..0000000 --- a/subversion-1.6.5-newlines.patch +++ /dev/null @@ -1,273 +0,0 @@ -diff -up svn2cl-0.11/svn2cl.xsl~ svn2cl-0.11/svn2cl.xsl ---- svn2cl-0.11/svn2cl.xsl~ 2008-12-21 17:41:20.000000000 +0200 -+++ svn2cl-0.11/svn2cl.xsl 2009-11-02 22:29:34.000000000 +0200 -@@ -55,12 +55,6 @@ - - --> - -- -- -- --]> -- - -@@ -119,7 +113,7 @@ - - - -- &newl; -+ - - - -@@ -149,33 +143,33 @@ - - - -- &newl; -+ - - - - -- &space;&space; -+ - - - -- &newl; -- &newl; -+ -+ - - - - - - -- &newl; -+ - - - - -- &space;&space; -+ - - - -- &newl;&newl; -+ - - - -@@ -187,7 +181,7 @@ - - [r - -- ]&space; -+ ] - - - -@@ -195,7 +189,7 @@ - - - -- &newl; -+ - - - -@@ -208,14 +202,14 @@ - - - -- &newl; -+ - -- &tab;*&space; -+ * - - - - -- -+ - - - -@@ -232,7 +226,7 @@ - - - -- &space; -+ - - - -@@ -306,7 +300,7 @@ - - - -- ,&space; -+ , - - - -@@ -324,7 +318,7 @@ - - - -- ,&space; -+ , - - - -@@ -382,23 +376,23 @@ - - - -- -+ - - -- -+ - - -- &tab;&space;&space; -+ - - -- -+ - - - - - - -- &newl; -+ - - - -@@ -420,7 +414,7 @@ - - - -- &newl;&tab;&space;&space; -+ - - - -@@ -449,26 +443,26 @@ - - - -- -+ - - - - - -- -+ - - - - - -- -+ - -- -+ - -- &newl;&newl; -+ - - -- -+ - - - -@@ -485,7 +479,7 @@ - - - -- &newl; -+ - - - -diff -up svn2cl-0.11/svn2html.xsl~ svn2cl-0.11/svn2html.xsl ---- svn2cl-0.11/svn2html.xsl~ 2008-12-21 17:41:20.000000000 +0200 -+++ svn2cl-0.11/svn2html.xsl 2009-11-02 22:30:11.000000000 +0200 -@@ -47,11 +47,6 @@ - - --> - -- -- --]> -- - - - -- &space; -+ - - - -@@ -145,7 +140,7 @@ -
  • - - -- &space; -+ - - -
    • -@@ -167,10 +162,10 @@ - - [r] - -- &space; -+ - - -- &space; -+ - - - -@@ -189,14 +184,14 @@ - - - -- -+ - -- -+ - -
    - - -- -+ - -     - diff --git a/subversion-1.6.6-kwallet.patch b/subversion-1.6.6-kwallet.patch deleted file mode 100644 index a2c790f..0000000 --- a/subversion-1.6.6-kwallet.patch +++ /dev/null @@ -1,24 +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.6/build/ac-macros/kwallet.m4.kwallet -+++ subversion-1.6.6/build/ac-macros/kwallet.m4 -@@ -47,14 +47,14 @@ AC_DEFUN(SVN_LIB_KWALLET, - fi - 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 diff --git a/subversion-1.9.4-swig-3.0.10.patch b/subversion-1.9.4-swig-3.0.10.patch deleted file mode 100644 index df2e4e0..0000000 --- a/subversion-1.9.4-swig-3.0.10.patch +++ /dev/null @@ -1,33 +0,0 @@ -Index: subversion/bindings/swig/include/proxy.swg -=================================================================== ---- subversion/bindings/swig/include/proxy.swg (revision 1658942) -+++ subversion/bindings/swig/include/proxy.swg (working copy) -@@ -83,13 +83,13 @@ - - value = _swig_getattr(self, self.__class__, name) - -- # If we got back a different object than we have, we need to copy all our -- # metadata into it, so that it looks identical -+%{ # If we got back a different object than we have, we need to copy all our -+ # metadata into it, so that it looks identical%} - members = self.__dict__.get("_members") - if members is not None: - _copy_metadata_deep(value, members.get(name)) - -- # Verify that the new object is good -+%{ # Verify that the new object is good}% - _assert_valid_deep(value) - - return value -@@ -98,9 +98,9 @@ - """Set an attribute on this object""" - self.assert_valid() - -- # Save a copy of the object, so that the garbage -+%{ # Save a copy of the object, so that the garbage - # collector won't kill the object while it's in -- # SWIG-land -+ # SWIG-land%} - self.__dict__.setdefault("_members",{})[name] = value - - return _swig_setattr(self, self.__class__, name, value) diff --git a/subversion.spec b/subversion.spec index e1410c4..8560dea 100644 --- a/subversion.spec +++ b/subversion.spec @@ -9,8 +9,8 @@ %define swigdirs swig_pydir=%{python3_sitearch}/libsvn swig_pydir_extra=%{python3_sitearch}/svn %define svn2cl_version 0.11 Name: subversion -Version: 1.14.2 -Release: 3mamba +Version: 1.14.3 +Release: 1mamba Summary: A version control system that is a compelling replacement for CVS Group: Development/Tools Vendor: openmamba @@ -20,15 +20,7 @@ URL: https://subversion.apache.org/ Source0: https://www.apache.org/dist/subversion/subversion-%{version}.tar.bz2 Source1: http://www.xsteve.at/prg/emacs/psvn.el Source2: psvn-init.el -# http://bugs.debian.org/546990 -Patch0: subversion-1.6.5-newlines.patch -Patch1: subversion-1.6.0-deplibs.patch -Patch2: subversion-1.6.1-rpath.patch -Patch3: subversion-1.6.0-pie.patch -Patch4: subversion-1.6.0-java.patch -Patch5: subversion-1.6.6-kwallet.patch Patch6: subversion-1.6.0-ruby185.patch -Patch7: subversion-1.9.4-swig-3.0.10.patch Patch8: subversion-1.14.0-swig-4.0.2.patch Patch9: subversion-1.14.2-swig-4.1.1.patch License: Apache License, BSD @@ -168,25 +160,13 @@ svn2cl is a simple XSL transformation and shell script wrapper forgenerating a c #:<< _EOF %patch 6 -p1 -#sed -i -e 's|^XSL="$dir/|XSL="%{_datadir}/svn2cl/|' \ -# contrib/client-side/svn2cl/svn2cl.sh -#v=$(contrib/client-side/svn2cl/svn2cl.sh -V | sed -n '1{s/.* //;p;}') -#if [ "$v" != "%{svn2cl_version}" ]; then -# echo -n "ERROR: svn2cl_version not up to date in specfile: " -# echo "'$v' <> '%{svn2cl_version}'" -# exit 1 -#fi - sed -i 's,Makefile.PL.in$,& libsvn_swig_perl,' Makefile.in rm subversion/bindings/swig/proxy/*.swg %patch 8 -p1 -%patch 9 -p1 -b .swig-4.1.1 +#%patch 9 -p1 -b .swig-4.1.1 -# executing autogen.sh because there are problems with libtool and libs creation -#./autogen.sh -#autoheader && autoconf && ./gen-make.py --reload ./autogen.sh --release %build @@ -412,6 +392,9 @@ fi #%{_mandir}/man1/svn2cl.1.gz %changelog +* Wed Jan 03 2024 Automatic Build System 1.14.3-1mamba +- automatic version update by autodist + * Sat Nov 18 2023 Automatic Build System 1.14.2-3mamba - rebuilt by autoport with build requirements: libutf8proc-devel>=2.9.0-1mamba