[bacula] Small fixes
Simone Caronni
slaanesh at fedoraproject.org
Mon Dec 5 18:07:26 UTC 2011
commit d49b54f84a3777d22a3f942d8b3417a90762a253
Author: Simone Caronni <negativo17 at gmail.com>
Date: Mon Dec 5 19:06:44 2011 +0100
Small fixes
bacula.spec | 25 ++++++++++++++-----------
1 files changed, 14 insertions(+), 11 deletions(-)
---
diff --git a/bacula.spec b/bacula.spec
index 3e2bf1b..943a9a9 100644
--- a/bacula.spec
+++ b/bacula.spec
@@ -1,6 +1,6 @@
Name: bacula
Version: 5.2.2
-Release: 5%{?dist}
+Release: 6%{?dist}
Summary: Cross platform network backup for Linux, Unix, Mac and Windows
# See LICENSE for details
License: GPLv2 with exceptions
@@ -139,8 +139,8 @@ recovery, and verification of computer data across a network of
different computers. It is based on a client/server architecture.
This package contains the common director files, which are shared
-between all database backends. You have to select a possible
-database backend though, which provides the needed bacula-director
+between all database back-ends. You have to select a possible
+database back-end though, which provides the needed bacula-director
dependency. Please choose from bacula-director-mysql,
bacula-director-sqlite or bacula-director-postgresql.
@@ -210,7 +210,7 @@ Summary: Common Bacula utilities
Group: System Environment/Daemons
Requires(pre): fedora-usermgmt
Obsoletes: bacula-console-gnome <= 2.4, bacula-traymonitor <= 2.4
-Obsoletes: bacula-sysconfdir <= 2.4, bacula-console-wxwidgets
+Obsoletes: bacula-sysconfdir <= 2.4, bacula-console-wxwidgets <= 5.0.3
%description common
Bacula is a set of programs that allow you to manage the backup,
@@ -436,8 +436,10 @@ install -m 644 -D %{SOURCE17} %{buildroot}%{_sysconfdir}/sysconfig/bacula-sd
# Create the spooling
mkdir -p %{buildroot}%{_localstatedir}/spool/bacula
-# Nuke the scripts we do not need
-rm -vf %{buildroot}%{_libexecdir}/bacula/{bacula,bacula-ctl-*,startmysql,stopmysql}
+# Nuke the startup scripts we do not need
+rm -f %{buildroot}%{_libexecdir}/bacula/{bacula,bacula-ctl-*,startmysql,stopmysql}
+rm -f %{buildroot}%{_sbindir}/bacula
+rm -f %{buildroot}%{_mandir}/man8/bacula.8.gz
# Fix up some perms so rpmlint does not complain too much
chmod 755 %{buildroot}%{_sbindir}/*
@@ -647,10 +649,7 @@ fi
%config(noreplace) %{_sysconfdir}/logrotate.d/bacula
%dir %{_sysconfdir}/%{name}
%dir %{_libexecdir}/%{name}
-%{_sbindir}/bsmtp
%{_sbindir}/btraceback
-%{_sbindir}/bacula
-%{_libexecdir}/%{name}/mtx-changer.conf
%{_libexecdir}/%{name}/btraceback.dbx
%{_libexecdir}/%{name}/btraceback.gdb
%{_libexecdir}/%{name}/bacula_config
@@ -663,8 +662,6 @@ fi
%{_libdir}/libbacfind.so
%{_libdir}/libbacpy-%{version}.so
%{_libdir}/libbacpy.so
-%{_mandir}/man1/bsmtp.1.gz
-%{_mandir}/man8/bacula.8.gz
%{_mandir}/man8/btraceback.8.gz
%dir %attr(750, bacula, bacula) %{_localstatedir}/log/bacula
%dir %attr(750, bacula, bacula) %{_localstatedir}/spool/bacula
@@ -719,12 +716,14 @@ fi
%{_sbindir}/bacula-dir
%{_sbindir}/bregex
%{_sbindir}/bscan
+%{_sbindir}/bsmtp
%{_sbindir}/bwild
%{_sbindir}/dbcheck
%{_libdir}/libbaccats.so
%attr(755,root,root) %ghost %{_libdir}/libbaccats-%{version}.so
%{_libdir}/libbacsql.so
%{_libdir}/libbacsql-%{version}.so
+%{_mandir}/man1/bsmtp.1.gz
%{_mandir}/man8/bacula-dir.8.gz
%{_mandir}/man8/bregex.8.gz
%{_mandir}/man8/bscan.8.gz
@@ -818,6 +817,10 @@ fi
%changelog
+* Mon Dec 05 2011 Simone Caronni <negativo17 at gmail.com> - 5.2.2-6
+- Removed leftover files and small rpmlint fixes.
+- Additional file moves between packages.
+
* Mon Dec 05 2011 Simone Caronni <negativo17 at gmail.com> - 5.2.2-5
- Remove redundant user/group in service files.
- Reduce patching for what can be passed through configure.
More information about the scm-commits
mailing list