[bacula/f16] Revert "Bat man page gets installed at every make install, remove it at the end of the whole install
Lukáš Nykrýn
lnykryn at fedoraproject.org
Wed Sep 19 10:56:02 UTC 2012
commit a93d04136b402d21e73e572167e259ddea710167
Author: Lukas Nykryn <lnykryn at redhat.com>
Date: Wed Sep 19 12:30:43 2012 +0200
Revert "Bat man page gets installed at every make install, remove it at the end of the whole install loop"
This reverts commit d40788f465c13a96b9d07c98391f3e07a0b17854.
bacula.spec | 7 ++-----
1 files changed, 2 insertions(+), 5 deletions(-)
---
diff --git a/bacula.spec b/bacula.spec
index 5026f0b..c65008e 100644
--- a/bacula.spec
+++ b/bacula.spec
@@ -599,6 +599,8 @@ 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,11 +720,6 @@ 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