rpms/subversion/devel subversion.spec,1.160,1.161

[Ville Skyttä]

Author: scop

Update of /cvs/pkgs/rpms/subversion/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31029

Modified Files:
	subversion.spec 
Log Message:
* Mon Jan 25 2010 Ville Skyttä <ville.skytta at iki.fi> - 1.6.6-5
- Include svn2cl and its man page only in the -svn2cl subpackage (#558598).
- Do not include bash completion in docs, it's installed.



Index: subversion.spec
===================================================================
RCS file: /cvs/pkgs/rpms/subversion/devel/subversion.spec,v
retrieving revision 1.160
retrieving revision 1.161
diff -u -p -r1.160 -r1.161
--- subversion.spec	7 Dec 2009 01:16:17 -0000	1.160
+++ subversion.spec	25 Jan 2010 21:19:52 -0000	1.161
@@ -17,7 +17,7 @@
 Summary: A Modern Concurrent Version Control System
 Name: subversion
 Version: 1.6.6
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: ASL 1.1
 Group: Development/Tools
 URL: http://subversion.tigris.org/
@@ -170,6 +170,8 @@ if [ "$v" != "%{svn2cl_version}" ]; then
         exit 1
 fi
 
+mv tools/client-side/bash_completion .
+
 %build
 # Regenerate the buildsystem, so that:
 #  1) patches applied to configure.in take effect
@@ -276,7 +278,7 @@ install -Dpm 644 svn2cl.1 $RPM_BUILD_ROO
 popd
 
 # Install bash completion
-install -Dpm 644 tools/client-side/bash_completion \
+install -Dpm 644 bash_completion \
         $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d/%{name}
 
 %find_lang %{name}
@@ -320,8 +322,10 @@ rm -rf ${RPM_BUILD_ROOT}
 %doc contrib/client-side/svnmerge/*.{README,py}
 %doc contrib/client-side/wcgrep
 %{_bindir}/*
+%exclude %{_bindir}/svn2cl
 %{_libdir}/libsvn_*.so.*
 %{_mandir}/man*/*
+%exclude %{_mandir}/man1/svn2cl.1*
 %{python_sitearch}/svn
 %{python_sitearch}/libsvn
 %{_datadir}/emacs/site-lisp/*.el
@@ -387,6 +391,10 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_mandir}/man1/svn2cl.1*
 
 %changelog
+* Mon Jan 25 2010 Ville Skyttä <ville.skytta at iki.fi> - 1.6.6-5
+- Include svn2cl and its man page only in the -svn2cl subpackage (#558598).
+- Do not include bash completion in docs, it's installed.
+
 * Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.6.6-4
 - rebuild against perl 5.10.1