[subversion] better trim doc dir to avoid breaking svnmucc tests

jorton jorton at fedoraproject.org
Wed Feb 29 11:07:48 UTC 2012


commit 052327b622edbbf0d90bcc86d762d40ef9f98fdc
Author: Joe Orton <jorton at redhat.com>
Date:   Wed Feb 29 11:06:50 2012 +0000

    better trim doc dir to avoid breaking svnmucc tests

 subversion.spec |   11 ++++-------
 1 files changed, 4 insertions(+), 7 deletions(-)
---
diff --git a/subversion.spec b/subversion.spec
index 078b546..456fcae 100644
--- a/subversion.spec
+++ b/subversion.spec
@@ -161,8 +161,6 @@ This package includes the Ruby bindings to the Subversion libraries.
 %patch4 -p1 -b .ruby
 %patch5 -p1 -b .hashorder
 
-mv tools/client-side/bash_completion .
-
 %build
 # Regenerate the buildsystem, so that:
 #  1) patches applied to configure.in take effect
@@ -251,9 +249,7 @@ rm -f ${RPM_BUILD_ROOT}%{_libdir}/libsvn_swig_*.{so,la,a}
 rm -f ${RPM_BUILD_ROOT}%{ruby_sitearch}/svn/ext/*.*a
 
 # Trim what goes in docdir
-rm -rf tools/*/*.in tools/test-scripts tools/buildbot tools/dist
-find tools -name .libs -print0 | xargs -0 rm -rvf
-find tools -name \*.o -print0 | xargs -0 rm -vf
+rm -rf tools/*/*.in
 
 # Install psvn for emacs and xemacs
 for f in emacs/site-lisp xemacs/site-packages/lisp; do
@@ -275,7 +271,7 @@ sed -i "/^dependency_libs/{
      }"  $RPM_BUILD_ROOT%{_libdir}/*.la
 
 # Install bash completion
-install -Dpm 644 bash_completion \
+install -Dpm 644 tools/client-side/bash_completion \
         $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d/%{name}
 
 # Install svnserve bits
@@ -359,7 +355,8 @@ fi
 %files -f %{name}.lang
 %defattr(-,root,root)
 %doc BUGS COMMITTERS LICENSE NOTICE INSTALL README CHANGES
-%doc tools mod_authz_svn-INSTALL
+%doc tools/hook-scripts tools/backup tools/bdb tools/examples tools/xslt
+%doc mod_authz_svn-INSTALL
 %{_bindir}/*
 %{_mandir}/man*/*
 %{_datadir}/emacs/site-lisp/*.el


More information about the scm-commits mailing list