[bacula] Add html docs, fix docs upgrade and fix libraries by using the provided dummy.
Simone Caronni
slaanesh at fedoraproject.org
Sun Dec 4 13:41:11 UTC 2011
commit fae54224803d47f3dce3f00c174be4a7d1721c59
Author: Simone Caronni <negativo17 at gmail.com>
Date: Sun Dec 4 14:39:25 2011 +0100
Add html docs, fix docs upgrade and fix libraries by using the provided dummy.
bacula.spec | 17 ++++++++++++++++-
1 files changed, 16 insertions(+), 1 deletions(-)
---
diff --git a/bacula.spec b/bacula.spec
index b14f2f9..18c796e 100644
--- a/bacula.spec
+++ b/bacula.spec
@@ -254,6 +254,7 @@ Summary: Bacula documentation
Group: Documentation
%if 0%{?fedora} >= 11 || 0%{?rhel} >= 6
BuildArch: noarch
+Obsoletes: bacula-docs%{?_isa}
%endif
%description docs
@@ -384,7 +385,10 @@ make install DESTDIR=%{buildroot}
rm -f %{buildroot}%{_libexecdir}/bacula/bconsole
rm -f %{buildroot}%{_mandir}/man1/bacula-bwxconsole.1*
rm -f %{buildroot}%{_mandir}/man1/bacula-tray-monitor.1*
-# rm -f %{buildroot}%{_libdir}/libbaccats-%{version}.so
+
+# Install catalogue dummy
+rm -f %{buildroot}%{_libdir}/libbaccats-%{version}.so
+%{__install} -m0755 src/cats/.libs/libbaccats-%{version}.so %{buildroot}%{_libdir}/
mkdir -p %{buildroot}%{_bindir}
@@ -444,6 +448,9 @@ 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
@@ -794,11 +801,17 @@ 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
%files -n nagios-plugins-bacula
%defattr(-,root,root)
@@ -810,6 +823,8 @@ fi
- Rename storage-common to storage and make it provide storage-common.
- Move bscan to director-common.
- Move storage scripts to storage.
+- Add html docs and make noarch package obsolete old arch one.
+- Install dummy catalogue library and mark it as ghost.
* Thu Dec 01 2011 Simone Caronni <negativo17 at gmail.com> - 5.2.2-3
- Add missing conditional for bat in the build section.
More information about the scm-commits
mailing list