subversion: update to 1.8.8

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@8366 ec354946-7b23-47d6-9f5a-488ba84defc7

s/subversion/subversion-vl.spec

@@ -12,7 +12,7 @@
 Summary: Modern Version Control System
 Summary(ja): モダンなバージョン管理システム
 Name: subversion
-Version: 1.7.7
+Version: 1.8.8
 Release: 1%{?_dist_release}
 License: ASL 2.0 
 Group: Development/Tools
@@ -27,7 +27,7 @@ SOURCE1: subversion.conf
 SOURCE2: httpd.davcheck.conf
 SOURCE3: filter-requires.sh
 Patch3: subversion-1.7.0-rpath.patch
-Patch4: subversion-1.7.2-ruby19.patch
+#Patch4: subversion-1.7.2-ruby19.patch
 
 Requires: db4 >= %{db_version}
 Requires: expat
@@ -55,6 +55,7 @@ BuildRequires: krb5-devel
 BuildRequires: keyutils-libs-devel
 BuildRequires: dbus-devel
 BuildRequires: libgnome-keyring-devel
+BuildRequires: libserf-devel
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 
 %define __perl_requires %{SOURCE3}
@@ -125,12 +126,9 @@ This package includes the Python bindings to the Subversion libraries.
 %prep
 %setup -q
 %patch3 -p1 -b .rpath
-%patch4 -p1 -b .ruby19
-
-rm -rf neon apr apr-util db4
 
 %build
-./autogen.sh
+PATH=/usr/bin:$PATH ./autogen.sh --release
 
 # fix shebang lines, #111498
 perl -pi -e 's|/usr/bin/env perl -w|/usr/bin/perl -w|' tools/hook-scripts/*.pl.in
@@ -141,16 +139,18 @@ export svn_cv_ruby_sitedir_libsuffix=""
 export svn_cv_ruby_sitedir_archsuffix=""
 
 export CC=gcc CXX=g++ JAVA_HOME=%{jdk_path} CFLAGS="$RPM_OPT_FLAGS"
+export LIBTOOL=/usr/bin/libtool
 %configure --with-apr=%{_prefix} --with-apr-util=%{_prefix} \
-	--with-swig --with-neon=%{_prefix} \
+	--with-swig --with-serf=%{_prefix} \
 	--with-ruby-sitedir=%{rarchdir} \
  	--with-apxs=%{_bindir}/apxs \
+	--disable-mod-activation \
+	--with-apache-libexecdir=%{_libdir}/apache2/modules/ \
 	--with-gnome-keyring \
+	--with-berkeley-db \
 	--disable-mod-activation \
-	--disable-static \
-	--disable-neon-version-check 
-# 1.3.0 tarball ships with generated swig sources
-make extraclean-swig-headers
+	--disable-static
+
 make %{?_smp_mflags} all tools
 make swig-py swig-py-lib %{swigdirs}
 make swig-pl swig-pl-lib swig-rb swig-rb-lib
@@ -169,19 +169,24 @@ make pure_vendor_install -C subversion/bindings/swig/perl/native \
 	PERL_INSTALL_ROOT=$RPM_BUILD_ROOT
 install -m 755 -d $RPM_BUILD_ROOT%{_sysconfdir}/subversion
 
+install -m 755 -d $RPM_BUILD_ROOT%{_libdir}/apache2/modules
+
 # Add subversion.conf configuration file into httpd/conf.d directory.
 install -m 755 -d $RPM_BUILD_ROOT/etc/apache2/conf.d
 install -m 644 %{SOURCE1} $RPM_BUILD_ROOT/etc/apache2/conf.d
 
-# Set up tools package files.
-mkdir -p $RPM_BUILD_ROOT/usr/lib/subversion
-cp -r tools $RPM_BUILD_ROOT/usr/lib/subversion
-
 # Remove unpackaged files
 rm -rf $RPM_BUILD_ROOT%{_includedir}/subversion-*/*.txt \
        $RPM_BUILD_ROOT%{python_sitearch}/*/*.{a,la} \
        $RPM_BUILD_ROOT%{_libdir}/*.la
-       
+
+# The SVN build system is broken w.r.t. DSO support; it treats
+# normal libraries as DSOs and puts them in $libdir, whereas they
+# should go in some subdir somewhere, and be linked using -module,
+# etc.  So, forcibly nuke the .so's for libsvn_auth_{gnome,kde},
+# since nothing should ever link against them directly.
+rm -f ${RPM_BUILD_ROOT}%{_libdir}/libsvn_auth_*.so
+
 # remove stuff produced with Perl modules
 find $RPM_BUILD_ROOT -type f \
      -a \( -name .packlist -o \( -name '*.bs' -a -empty \) \) \
@@ -199,10 +204,31 @@ rm -f $RPM_BUILD_ROOT%{rarchdir}/svn/ext/*.*a
 
 # Trim what goes in docdir
 rm -rf tools/*/*.in tools/test-scripts
-		       
+
 # Rename authz_svn INSTALL doc for docdir
 ln -f subversion/mod_authz_svn/INSTALL mod_authz_svn-INSTALL
 
+# Install bash completion
+install -Dpm 644 tools/client-side/bash_completion \
+        $RPM_BUILD_ROOT%{_datadir}/bash-completion/completions/svn
+for comp in svnadmin svndumpfilter svnlook svnsync svnversion; do
+    ln -s svn \
+       $RPM_BUILD_ROOT%{_datadir}/bash-completion/completions/${comp}
+done
+
+# Install tools ex diff*
+make install-tools DESTDIR=$RPM_BUILD_ROOT toolsdir=%{_bindir}
+rm -f $RPM_BUILD_ROOT%{_bindir}/diff*
+
+for f in svn-populate-node-origins-index svn-rep-sharing-stats \
+         svnauthz-validate svnmucc svnraisetreeconflict; do
+    echo %{_bindir}/$f
+done | tee tools.files | sed 's/^/%%exclude /' > exclude.tools.files
+
+%find_lang %{name}
+
+cat %{name}.lang exclude.tools.files >> %{name}.files
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -210,6 +236,18 @@ rm -rf $RPM_BUILD_ROOT
 
 %postun -p /sbin/ldconfig
 
+%post perl -p /sbin/ldconfig
+
+%postun perl -p /sbin/ldconfig
+
+%post ruby -p /sbin/ldconfig
+
+%postun ruby -p /sbin/ldconfig
+
+%post python -p /sbin/ldconfig
+
+%postun python -p /sbin/ldconfig
+
 %post tools -p /sbin/ldconfig
 
 %postun tools -p /sbin/ldconfig
@@ -217,12 +255,13 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root)
-%doc BUGS CHANGES COMMITTERS COPYING HACKING INSTALL README
+%doc BUGS CHANGES COMMITTERS LICENSE NOTICE INSTALL README
 %doc subversion/LICENSE
 %{_bindir}/*
 %{_libdir}/libsvn_*.so.*
 %{_localedir}/*/*/subversion.mo
 %{_mandir}/man*/*
+%{_datadir}/bash-completion/completions/*
 %dir %{_sysconfdir}/subversion
 %exclude %{_mandir}/man*/*::*
 %exclude %{_libdir}/libsvn_swig_perl*.so.*
@@ -233,18 +272,17 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root)
 %{_includedir}/subversion-1
 %{_libdir}/libsvn*.so
-%exclude %{_libdir}/libsvn_swig_perl*.so.*
-%exclude %{_libdir}/libsvn_swig_py*.so.*
-%exclude %{_libdir}/libsvn_swig_ruby*.so.*
+%exclude %{_libdir}/libsvn_swig_perl*
+%exclude %{_libdir}/libsvn_swig_py*
+%exclude %{_libdir}/libsvn_swig_ruby*
 
 %files mod_dav_svn
 %defattr(-,root,root)
 %config(noreplace) /etc/apache2/conf.d/subversion.conf
 %{apache_dir}/%{_lib}/apache2/modules/mod_*.*
 
-%files tools
+%files tools -f tools.files
 %defattr(-,root,root)
-%{_prefix}/lib/subversion/tools
 
 %files perl
 %defattr(-,root,root,-)
@@ -266,6 +304,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Apr 18 2014 Daisuke SUZUKI <daisuke@linux.or.jp> 1.8.8-1
+- update to 1.8.8
+- add BR: libserf-devel to handle http* scheme
+
 * Thu Oct 25 2012 Daisuke SUZUKI <daisuke@linux.or.jp> 1.7.7-1
 - update to 1.7.7
 - rebuild with ruby-1.9.3
@@ -309,7 +351,7 @@ rm -rf $RPM_BUILD_ROOT
 - stop applying pia patch (Patch6): sync Fedora 1.6.9-2.fc13
 - stop applying update-neon-m4 patch (Patch10): sync Fedora 1.6.9-2.fc13
 
-* Wed Aug 13 2009 Daisuke SUZUKI <daisuke@linux.or.jp> 1.5.7-1
+* Thu Aug 13 2009 Daisuke SUZUKI <daisuke@linux.or.jp> 1.5.7-1
 - new upstream release
 
 * Fri Sep 05 2008 Daisuke SUZUKI <daisuke@linux.or.jp> 1.5.2-1