[bacula/f16] Bat man page gets installed at every make install, remove it at the end of the whole install loop

Simone Caronni slaanesh at fedoraproject.org
Mon Jul 23 08:48:00 UTC 2012


commit d40788f465c13a96b9d07c98391f3e07a0b17854
Author: Simone Caronni <negativo17 at gmail.com>
Date:   Mon Jul 23 10:47:18 2012 +0200

    Bat man page gets installed at every make install, remove it at the end of the whole install loop

 bacula.spec |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/bacula.spec b/bacula.spec
index 4b4ee6b..dfe6ade 100644
--- a/bacula.spec
+++ b/bacula.spec
@@ -597,8 +597,6 @@ pushd bacula-base
         desktop-file-install --vendor="fedora" --dir=%{buildroot}%{_datadir}/applications %{SOURCE12}
         install -m 755 -D src/qt-console/.libs/bat %{buildroot}%{_sbindir}
         install -m 644 -D src/qt-console/bat.conf %{buildroot}%{_sysconfdir}/bacula/bat.conf
-        %else
-        rm -f %{buildroot}%{_mandir}/man1/bat.1*
         %endif
 popd
 
@@ -718,6 +716,11 @@ chmod 644 %{buildroot}%{_libexecdir}/bacula/btraceback.*
 # Remove extra docs
 rm -rf %{buildroot}%{_datadir}/doc/bacula/
 
+# Remove bat man page if bat is not built (gets installed unconditionally from make install)
+%if 0%{?fedora} <= 12 || 0%{?rhel} <= 5
+rm -f %{buildroot}%{_mandir}/man1/bat.1*
+%endif
+
 # Install headers
 %{__mkdir_p} %{buildroot}%{_includedir}/bacula
 pushd %{name}-%{version}


More information about the scm-commits mailing list