[bacula] Do not delete docs source files.

Simone Caronni slaanesh at fedoraproject.org
Wed Jan 4 11:52:54 UTC 2012


commit 5c0373579c1aa776f0b28e385dc99b68398119ff
Author: Simone Caronni <negativo17 at gmail.com>
Date:   Wed Jan 4 12:52:40 2012 +0100

    Do not delete docs source files.

 bacula.spec |   25 ++++++++-----------------
 1 files changed, 8 insertions(+), 17 deletions(-)
---
diff --git a/bacula.spec b/bacula.spec
index fcc6e67..4184b88 100644
--- a/bacula.spec
+++ b/bacula.spec
@@ -263,8 +263,7 @@ Provides check_bacula support for Nagios.
 
 
 %prep
-%setup -q
-%setup -q -a 1 -D -T
+%setup -q -a 1
 %patch1 -p1 -b .hostname
 %patch2 -p2 -b .openssl
 %patch3 -p1 -b .queryfile
@@ -350,6 +349,11 @@ pushd bacula-docs-%{version}
 	%configure --with-bacula=%{_builddir}/bacula-%{version}
 	make
 popd
+for manual in problems console utility developers main misc; do
+	mkdir $manual
+	cp -f bacula-docs-%{version}/manuals/en/$manual/$manual/*.{css,html,png} $manual
+	cp -f bacula-docs-%{version}/manuals/en/$manual/$manual.pdf .
+done
 
 
 %install
@@ -432,13 +436,11 @@ chmod 644 %{buildroot}%{_libexecdir}/bacula/btraceback.*
 
 # Remove extra docs
 rm -rf %{buildroot}%{_datadir}/doc/bacula/
-find %{_builddir}/%{name}-%{version}/%{name}-docs-%{version}/manuals/en -name "*.idx" -exec rm -f {} \;
-find %{_builddir}/%{name}-%{version}/%{name}-docs-%{version}/manuals/en -name "*.pl" -exec rm -f {} \;
-find %{_builddir}/%{name}-%{version}/%{name}-docs-%{version}/manuals/en -name "*.tex" -exec rm -f {} \;
 
 # Remove local archives
 rm -f %{buildroot}%{_libdir}/*.la
 
+
 %clean
 rm -rf %{buildroot}
 
@@ -780,18 +782,7 @@ fi
 
 %files docs
 %defattr(-,root,root,-)
-%doc bacula-docs-%{version}/manuals/en/problems/problems.pdf
-%doc bacula-docs-%{version}/manuals/en/problems/problems
-%doc bacula-docs-%{version}/manuals/en/console/console.pdf
-%doc bacula-docs-%{version}/manuals/en/console/console
-%doc bacula-docs-%{version}/manuals/en/utility/utility.pdf
-%doc bacula-docs-%{version}/manuals/en/utility/utility
-%doc bacula-docs-%{version}/manuals/en/developers/developers.pdf
-%doc bacula-docs-%{version}/manuals/en/developers/developers
-%doc bacula-docs-%{version}/manuals/en/main/main.pdf
-%doc bacula-docs-%{version}/manuals/en/main/main
-%doc bacula-docs-%{version}/manuals/en/misc/misc.pdf
-%doc bacula-docs-%{version}/manuals/en/misc/misc
+%doc problems* console* utility* developers* main* misc*
 
 %files -n nagios-plugins-bacula
 %defattr(-,root,root)


More information about the scm-commits mailing list