[subversion: 1/2] update to 1.7.0 drop svn2cl (no longer shipped in upstream tarball)

jorton jorton at fedoraproject.org
Wed Oct 12 08:55:46 UTC 2011 

commit 41a6b204afd821752fb8871ccb76ba8ca468f8e6
Author: Joe Orton <jorton at redhat.com>
Date:   Wed Oct 12 09:52:51 2011 +0100

    update to 1.7.0
    drop svn2cl (no longer shipped in upstream tarball)

 .gitignore                                         |    3 +
 sources                                            |    2 +-
 subversion-1.6.0-deplibs.patch                     |   30 -------
 ...kwallet.patch => subversion-1.7.0-kwallet.patch |   17 ++--
 ...-1.6.11-pie.patch => subversion-1.7.0-pie.patch |   31 ++++----
 ...6.1-rpath.patch => subversion-1.7.0-rpath.patch |   41 +++++------
 subversion.spec                                    |   81 +++----------------
 7 files changed, 58 insertions(+), 147 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index e8862f9..2a45b5d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,6 @@ subversion-1.6.12.tar.bz2
 /subversion-1.6.15.tar.bz2
 /subversion-1.6.16.tar.bz2
 /subversion-1.6.17.tar.bz2
+/subversion-1.7.0.tar.bz2
+/subversion-1.7.0
+/clog
diff --git a/sources b/sources
index a53bfd9..eec2a57 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-81e5dc5beee4b3fc025ac70c0b6caa14  subversion-1.6.17.tar.bz2
+930e6644a1b6094efd268fde6a318f04  subversion-1.7.0.tar.bz2
diff --git a/subversion-1.6.6-kwallet.patch b/subversion-1.7.0-kwallet.patch
similarity index 59%
rename from subversion-1.6.6-kwallet.patch
rename to subversion-1.7.0-kwallet.patch
index 5c8edf8..624641e 100644
--- a/subversion-1.6.6-kwallet.patch
+++ b/subversion-1.7.0-kwallet.patch
@@ -3,23 +3,24 @@ The first half of this is certainly upstream-worthy, but the second half is pres
 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,
+--- subversion-1.7.0/build/ac-macros/kwallet.m4.kwallet	2010-11-01 19:29:16.000000000 +0000
++++ subversion-1.7.0/build/ac-macros/kwallet.m4	2011-10-12 09:32:55.129561537 +0100
+@@ -64,15 +64,14 @@ AC_DEFUN(SVN_LIB_KWALLET,
                      fi
                    done
                    qt_include_dirs="`$PKG_CONFIG --cflags-only-I QtCore QtDBus QtGui`"
--                  kde_dir="`$kde4_config --prefix`"
+-                  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`"
++                  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$libdir/kde4/devel"
+-                  kde_lib_suffix="`$KDE4_CONFIG --libsuffix`"
+-                  LDFLAGS="$old_LDFLAGS `SVN_REMOVE_STANDARD_LIB_DIRS($qt_lib_dirs -L$kde_dir/lib$kde_lib_suffix)`"
++                  LDFLAGS="$old_LDFLAGS `SVN_REMOVE_STANDARD_LIB_DIRS($qt_lib_dirs)` -L$libdir/kde4/devel"
                    AC_LANG(C++)
-                   AC_LINK_IFELSE([
+                   AC_LINK_IFELSE([AC_LANG_SOURCE([[
  #include <kwallet.h>
diff --git a/subversion-1.6.11-pie.patch b/subversion-1.7.0-pie.patch
similarity index 58%
rename from subversion-1.6.11-pie.patch
rename to subversion-1.7.0-pie.patch
index 36b8e0a..85e9f07 100644
--- a/subversion-1.6.11-pie.patch
+++ b/subversion-1.7.0-pie.patch
@@ -1,7 +1,7 @@
-diff -up subversion-1.6.12/build/generator/gen_base.py.pie subversion-1.6.12/build/generator/gen_base.py
---- subversion-1.6.12/build/generator/gen_base.py.pie	2010-09-07 14:05:29.307274005 +0100
-+++ subversion-1.6.12/build/generator/gen_base.py	2010-09-07 14:05:29.313274265 +0100
-@@ -357,7 +357,7 @@ class TargetLinked(Target):
+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):
      self.install = options.get('install')
      self.compile_cmd = options.get('compile-cmd')
      self.sources = options.get('sources', '*.c *.cpp')
@@ -10,7 +10,7 @@ diff -up subversion-1.6.12/build/generator/gen_base.py.pie subversion-1.6.12/bui
  
      self.external_lib = options.get('external-lib')
      self.external_project = options.get('external-project')
-@@ -413,6 +413,11 @@ class TargetExe(TargetLinked):
+@@ -462,6 +462,11 @@ class TargetExe(TargetLinked):
      self.manpages = options.get('manpages', '')
      self.testing = options.get('testing')
  
@@ -22,7 +22,7 @@ diff -up subversion-1.6.12/build/generator/gen_base.py.pie subversion-1.6.12/bui
    def add_dependencies(self):
      TargetLinked.add_dependencies(self)
  
-@@ -456,8 +461,8 @@ class TargetLib(TargetLinked):
+@@ -507,8 +512,8 @@ class TargetLib(TargetLinked):
      self.msvc_export = options.get('msvc-export', '').split()
  
      ### hmm. this is Makefile-specific
@@ -33,24 +33,21 @@ diff -up subversion-1.6.12/build/generator/gen_base.py.pie subversion-1.6.12/bui
  
  class TargetApacheMod(TargetLib):
  
-diff -up subversion-1.6.12/Makefile.in.pie subversion-1.6.12/Makefile.in
---- subversion-1.6.12/Makefile.in.pie	2010-09-07 14:05:29.308274305 +0100
-+++ subversion-1.6.12/Makefile.in	2010-09-07 14:14:28.795274233 +0100
-@@ -184,8 +184,11 @@ COMPILE_JAVAHL_CXX = $(LIBTOOL) $(LTCXXF
- COMPILE_JAVAHL_JAVAC = $(JAVAC) $(JAVAC_FLAGS)
- COMPILE_JAVAHL_JAVAH = $(JAVAH)
+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)
  
--LINK_LIB = $(LINK) -rpath $(libdir)
  LINK = $(LIBTOOL) $(LTFLAGS) --mode=link $(CC) $(LT_LDFLAGS) $(CFLAGS) $(LDFLAGS)
-+LINK_LIB = $(LINK) -rpath $(libdir)
+ LINK_LIB = $(LINK) $(LT_SO_VERSION) -rpath $(libdir)
 +LINK_TEST = $(LINK) -no-install
 +LINK_TEST_LIB = $(LINK) -avoid-version
 +LINK_EXE = $(LINK) -pie
  LINK_CXX = $(LIBTOOL) $(LTCXXFLAGS) --mode=link $(CXX) $(LT_LDFLAGS) $(CXXFLAGS) $(LDFLAGS) -rpath $(libdir)
+ LINK_CXX_LIB = $(LINK_CXX) $(LT_SO_VERSION)
  
- # special link rule for mod_dav_svn
-@@ -600,7 +603,7 @@ schema-clean:
- 	$(top_srcdir)/build/transform_sql.sh $< < $< > $(top_srcdir)/$@
+@@ -657,7 +660,7 @@ schema-clean:
+ 	$(PYTHON) $(top_srcdir)/build/transform_sql.py $< $(top_srcdir)/$@
  
  .c.o:
 -	$(COMPILE) -o $@ -c $<
diff --git a/subversion-1.6.1-rpath.patch b/subversion-1.7.0-rpath.patch
similarity index 54%
rename from subversion-1.6.1-rpath.patch
rename to subversion-1.7.0-rpath.patch
index 6061e05..2481346 100644
--- a/subversion-1.6.1-rpath.patch
+++ b/subversion-1.7.0-rpath.patch
@@ -1,24 +1,16 @@
-
-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
+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
  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)
+-link-cmd = $(LINK)
++link-cmd = $(LINK_LIB)
  install = swig-py-lib
  # need special build rule to include -DSWIGPYTHON
  compile-cmd = $(COMPILE_SWIG_PY)
-@@ -495,7 +495,7 @@ type = swig_lib
+@@ -501,7 +501,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
@@ -27,9 +19,10 @@ which libtool will otherwise avoid.
  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):
+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):
      self.msvc_fake = options.get('msvc-fake') == 'yes' # has fake target
      self.msvc_export = options.get('msvc-export', '').split()
  
@@ -40,15 +33,17 @@ which libtool will otherwise avoid.
  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
+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)
  
 -LINK = $(LIBTOOL) $(LTFLAGS) --mode=link $(CC) $(LT_LDFLAGS) $(CFLAGS) $(LDFLAGS) -rpath $(libdir)
-+LINK_LIB = $(LINK) -rpath $(libdir)
+-LINK_LIB = $(LINK) $(LT_SO_VERSION)
 +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) -rpath $(libdir)
+ LINK_CXX_LIB = $(LINK_CXX) $(LT_SO_VERSION)
  
- # special link rule for mod_dav_svn
diff --git a/subversion.spec b/subversion.spec
index 02b45b0..9ca1978 100644
--- a/subversion.spec
+++ b/subversion.spec
@@ -12,13 +12,11 @@
 
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
-%global svn2cl_version 0.11
-
 Summary: A Modern Concurrent Version Control System
 Name: subversion
-Version: 1.6.17
-Release: 4%{?dist}
-License: ASL 1.1
+Version: 1.7.0
+Release: 1%{?dist}
+License: ASL 2.0
 Group: Development/Tools
 URL: http://subversion.apache.org/
 Source0: http://subversion.tigris.org/downloads/subversion-%{version}.tar.bz2
@@ -27,14 +25,9 @@ Source3: filter-requires.sh
 Source4: http://www.xsteve.at/prg/emacs/psvn.el
 Source5: psvn-init.el
 Source6: svnserve.init
-# http://bugs.debian.org/546990
-Patch0: subversion-1.6.5-newlines.patch
-Patch2: subversion-1.6.0-deplibs.patch
-Patch3: subversion-1.6.1-rpath.patch
-Patch6: subversion-1.6.11-pie.patch
-Patch8: subversion-1.6.6-kwallet.patch
-Patch9: subversion-1.6.12-disable-client-test.patch
-Patch10: subversion-MakeMaker.patch
+Patch1: subversion-1.7.0-rpath.patch
+Patch2: subversion-1.7.0-pie.patch
+Patch3: subversion-1.7.0-kwallet.patch
 BuildRequires: autoconf, libtool, python, python-devel, texinfo, which
 BuildRequires: db4-devel >= 4.1.25, swig >= 1.3.24, gettext
 BuildRequires: apr-devel >= 1.3.0, apr-util-devel >= 1.3.0
@@ -154,44 +147,11 @@ Requires: ruby(abi) = 1.8
 %description ruby
 This package includes the Ruby bindings to the Subversion libraries.
 
-%package svn2cl
-Group: Development/Tools
-Summary: Create a ChangeLog from a Subversion log
-License: BSD
-# -5: fake release for the Obsoletes to work
-Provides: svn2cl = %{svn2cl_version}-5
-Obsoletes: svn2cl < 0.11-4
-BuildArch: noarch
-Requires: libxslt
-Requires: subversion = %{version}
-
-%description svn2cl
-svn2cl is a simple XSL transformation and shell script wrapper for
-generating a classic GNU-style ChangeLog from a subversion repository
-log.  It is made from several changelog-like scripts using common XSLT
-constructs found in different places.
-
 %prep
 %setup -q
-cd contrib/client-side/svn2cl
-%patch0 -p1 -b .newlines
-cd ../../..
-%patch2 -p1 -b .deplibs
-%patch3 -p1 -b .rpath
-%patch6 -p1 -b .pie
-%patch8 -p1 -b .kwallet
-%patch9 -p1 -b .disable-client-test
-%patch10 -p1 -b .eemm
-
-sed -i -e 's|^XSL="$dir/|XSL="%{_datadir}/svn2cl/|' \
-        contrib/client-side/svn2cl/svn2cl.sh
-# Sanity check svn2cl_version
-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
+%patch1 -p1 -b .rpath
+%patch2 -p1 -b .pie
+%patch3 -p1 -b .kwallet
 
 mv tools/client-side/bash_completion .
 
@@ -307,14 +267,6 @@ sed -i "/^dependency_libs/{
      s,%{_libdir}/lib[^a][^p][^r][^ ']*.la, ,g;
      }"  $RPM_BUILD_ROOT%{_libdir}/*.la
 
-# Install svn2cl
-pushd contrib/client-side/svn2cl
-install -Dpm 755 svn2cl.sh $RPM_BUILD_ROOT%{_bindir}/svn2cl
-install -dm 755 $RPM_BUILD_ROOT%{_datadir}/svn2cl
-install -pm 644 *.xsl $RPM_BUILD_ROOT%{_datadir}/svn2cl
-install -Dpm 644 svn2cl.1 $RPM_BUILD_ROOT%{_mandir}/man1/svn2cl.1
-popd
-
 # Install bash completion
 install -Dpm 644 bash_completion \
         $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d/%{name}
@@ -373,9 +325,7 @@ fi
 %doc contrib/client-side/svnmerge/*.{README,py}
 %doc contrib/client-side/wcgrep
 %{_bindir}/*
-%exclude %{_bindir}/svn2cl
 %{_mandir}/man*/*
-%exclude %{_mandir}/man1/svn2cl.1*
 %{_sysconfdir}/rc.d/init.d/svnserve
 %{_datadir}/emacs/site-lisp/*.el
 %{_datadir}/xemacs/site-packages/lisp/*.el
@@ -440,16 +390,11 @@ fi
 %{_javadir}/svn-javahl.jar
 %endif
 
-%files svn2cl
-%defattr(-,root,root,-)
-%doc contrib/client-side/svn2cl/NEWS contrib/client-side/svn2cl/README
-%doc contrib/client-side/svn2cl/TODO contrib/client-side/svn2cl/authors.xml
-%doc contrib/client-side/svn2cl/svn2html.css
-%{_bindir}/svn2cl
-%{_datadir}/svn2cl/
-%{_mandir}/man1/svn2cl.1*
-
 %changelog
+* Wed Oct 12 2011 Joe Orton <jorton at redhat.com> - 1.7.0-1
+- update to 1.7.0
+- drop svn2cl (no longer shipped in upstream tarball)
+
 * Wed Jul 20 2011 Joe Orton <jorton at redhat.com> - 1.6.17-4
 - run javahl tests (Blair Zajac, #723338)

More information about the scm-commits mailing list