add tools subpackage (#648015)

Resolves: rhbz#648015

subversion.spec

@@ -14,7 +14,7 @@
 Summary: A Modern Concurrent Version Control System
 Name: subversion
 Version: 1.7.3
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: ASL 2.0
 Group: Development/Tools
 URL: http://subversion.apache.org/
@@ -153,6 +153,14 @@ Requires: ruby(abi) = 1.9.1
 %description ruby
 This package includes the Ruby bindings to the Subversion libraries.
 
+%package tools
+Group: Development/Tools
+Summary: Supplementary tools for Subversion
+Requires: subversion%{?_isa} = %{version}-%{release}
+
+%description tools
+This package includes supplementary tools for use with Subversion.
+
 %prep
 %setup -q
 %patch1 -p1 -b .rpath
@@ -197,7 +205,7 @@ export CC=gcc CXX=g++ JAVA_HOME=%{jdk_path} CFLAGS="$RPM_OPT_FLAGS"
         --with-kwallet \
 %endif
         --with-berkeley-db || (cat config.log; exit 1)
-make %{?_smp_mflags} all
+make %{?_smp_mflags} all tools
 make swig-py swig-py-lib %{swigdirs}
 make swig-pl swig-pl-lib swig-rb swig-rb-lib
 %if %{with_java}
@@ -287,8 +295,18 @@ install -p -m 644 $RPM_SOURCE_DIR/svnserve.tmpfiles \
 install -p -m 644 $RPM_SOURCE_DIR/svnserve.sysconf \
         %{buildroot}%{_sysconfdir}/sysconfig/svnserve
 
+# 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
+
 %if %{make_check}
 %check
 export LANG=C LC_ALL=C
@@ -352,7 +370,7 @@ fi
 %postun javahl -p /sbin/ldconfig
 %endif
 
-%files -f %{name}.lang
+%files -f %{name}.files
 %defattr(-,root,root)
 %doc BUGS COMMITTERS LICENSE NOTICE INSTALL README CHANGES
 %doc tools/hook-scripts tools/backup tools/bdb tools/examples tools/xslt
@@ -369,6 +387,9 @@ fi
 %{_localstatedir}/run/svnserve
 %{_sysconfdir}/tmpfiles.d/svnserve.conf
 
+%files tools -f tools.files
+%defattr(-,root,root)
+
 %files libs
 %defattr(-,root,root)
 %doc LICENSE NOTICE
@@ -430,6 +451,9 @@ fi
 %endif
 
 %changelog
+* Wed Feb 29 2012 Joe Orton <jorton@redhat.com> - 1.7.3-5
+- add tools subpackage (#648015)
+
 * Tue Feb 28 2012 Joe Orton <jorton@redhat.com> - 1.7.3-4
 - trim contents of doc dic (#746433)