[bacula] Move sections around in the spec file, common at the top, then daemons and then clients. Preparation
Simone Caronni
slaanesh at fedoraproject.org
Wed Dec 7 09:46:15 UTC 2011
commit 7dc2ef033fe7d30926c3c1c284abda3f538f0ff4
Author: Simone Caronni <negativo17 at gmail.com>
Date: Wed Dec 7 10:46:02 2011 +0100
Move sections around in the spec file, common at the top, then daemons and then clients. Preparation for the libs subpackage.
bacula.spec | 180 +++++++++++++++++++++++++++++-----------------------------
1 files changed, 90 insertions(+), 90 deletions(-)
---
diff --git a/bacula.spec b/bacula.spec
index c2903a5..9db7a87 100644
--- a/bacula.spec
+++ b/bacula.spec
@@ -68,6 +68,49 @@ storage management features that make it easy to find and recover lost
or damaged files.
+%package common
+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 <= 5.0.3
+
+%description common
+Bacula is a set of programs that allow you to manage the backup,
+recovery, and verification of computer data across a network of
+different computers. It is based on a client/server architecture.
+
+
+%package director-common
+Summary: Common Bacula Director files
+Group: System Environment/Daemons
+Requires: bacula-director = %{version}-%{release}
+Requires: bacula-common%{?_isa} = %{version}-%{release}
+Requires: logwatch
+%if 0%{?fedora} >= 15 || 0%{?rhel} > 6
+Requires(post): systemd-sysv
+Requires(post): systemd-units
+Requires(preun): systemd-units
+Requires(postun): systemd-units
+%else
+Requires(post): /sbin/chkconfig
+Requires(preun): /sbin/chkconfig
+Requires(preun): /sbin/service
+Requires(postun): /sbin/service
+%endif
+
+%description director-common
+Bacula is a set of programs that allow you to manage the backup,
+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 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.
+
+
%package director-mysql
Summary: Bacula Director with MySQL database support
Group: System Environment/Daemons
@@ -119,12 +162,19 @@ your backup run.
This director has support for the PostgresSQL database.
-%package director-common
-Summary: Common Bacula Director files
+%package storage
+Summary: Bacula storage daemon files
Group: System Environment/Daemons
-Requires: bacula-director = %{version}-%{release}
Requires: bacula-common%{?_isa} = %{version}-%{release}
-Requires: logwatch
+# Storage backends merged into core.
+Provides: bacula-storage-common = %{version}-%{release}
+Obsoletes: bacula-storage-common < 5.2.2-2
+Provides: bacula-storage-mysql = %{version}-%{release}
+Obsoletes: bacula-storage-mysql < 5.2.0
+Provides: bacula-storage-sqlite = %{version}-%{release}
+Obsoletes: bacula-storage-sqlite < 5.2.0
+Provides: bacula-storage-postgresql = %{version}-%{release}
+Obsoletes: bacula-storage-postgresql < 5.2.0
%if 0%{?fedora} >= 15 || 0%{?rhel} > 6
Requires(post): systemd-sysv
Requires(post): systemd-units
@@ -137,16 +187,14 @@ Requires(preun): /sbin/service
Requires(postun): /sbin/service
%endif
-%description director-common
+%description storage
Bacula is a set of programs that allow you to manage the backup,
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 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.
+This package contains the storage daemon, the daemon responsible for
+writing the data received from the clients onto tape drives or other
+mass storage devices.
%package client
@@ -174,54 +222,6 @@ This package contains the bacula client, the daemon running on the
system to be backed up.
-%package storage
-Summary: Bacula storage daemon files
-Group: System Environment/Daemons
-Requires: bacula-common%{?_isa} = %{version}-%{release}
-# Storage backends merged into core.
-Provides: bacula-storage-common = %{version}-%{release}
-Obsoletes: bacula-storage-common < 5.2.2-2
-Provides: bacula-storage-mysql = %{version}-%{release}
-Obsoletes: bacula-storage-mysql < 5.2.0
-Provides: bacula-storage-sqlite = %{version}-%{release}
-Obsoletes: bacula-storage-sqlite < 5.2.0
-Provides: bacula-storage-postgresql = %{version}-%{release}
-Obsoletes: bacula-storage-postgresql < 5.2.0
-%if 0%{?fedora} >= 15 || 0%{?rhel} > 6
-Requires(post): systemd-sysv
-Requires(post): systemd-units
-Requires(preun): systemd-units
-Requires(postun): systemd-units
-%else
-Requires(post): /sbin/chkconfig
-Requires(preun): /sbin/chkconfig
-Requires(preun): /sbin/service
-Requires(postun): /sbin/service
-%endif
-
-%description storage
-Bacula is a set of programs that allow you to manage the backup,
-recovery, and verification of computer data across a network of
-different computers. It is based on a client/server architecture.
-
-This package contains the storage daemon, the daemon responsible for
-writing the data received from the clients onto tape drives or other
-mass storage devices.
-
-
-%package common
-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 <= 5.0.3
-
-%description common
-Bacula is a set of programs that allow you to manage the backup,
-recovery, and verification of computer data across a network of
-different computers. It is based on a client/server architecture.
-
-
%package console
Summary: Bacula management console
Group: System Environment/Daemons
@@ -671,38 +671,6 @@ fi
%dir %attr(750, bacula, bacula) %{_localstatedir}/spool/bacula
%{_sbindir}/bacula-checkconf
-%files client
-%defattr(-,root,root,-)
-%{_sbindir}/bacula-fd
-%if 0%{?fedora} >= 15 || 0%{?rhel} > 6
-%{_unitdir}/bacula-fd.service
-%else
-%{_initrddir}/bacula-fd
-%endif
-%config(noreplace) %{_sysconfdir}/bacula/bacula-fd.conf
-%config(noreplace) %{_sysconfdir}/sysconfig/bacula-fd
-%{_mandir}/man8/bacula-fd.8.gz
-%{_libdir}/bacula/bpipe-fd.so
-
-%files console
-%defattr(-,root,root,-)
-%{_sbindir}/bconsole
-%attr(640,root,bacula) %config(noreplace) %{_sysconfdir}/bacula/bconsole.conf
-%{_mandir}/man8/bconsole.8.gz
-
-%if 0%{?fedora} >= 11 || 0%{?rhel} >= 6
-%files console-bat
-%defattr(-,root,root,-)
-%config(noreplace) %{_sysconfdir}/security/console.apps/bat
-%config(noreplace) %{_sysconfdir}/pam.d/bat
-%attr(640,root,bacula) %config(noreplace) %{_sysconfdir}/bacula/bat.conf
-%{_bindir}/bat
-%{_sbindir}/bat
-%{_mandir}/man1/bat.1.gz
-%{_datadir}/applications/fedora-bacula-bat.desktop
-%{_datadir}/pixmaps/bat_icon.png
-%endif
-
%files director-common
%defattr(-,root,root,-)
%doc updatedb
@@ -800,6 +768,38 @@ fi
%{_mandir}/man8/bls.8.gz
%{_mandir}/man8/btape.8.gz
+%files client
+%defattr(-,root,root,-)
+%{_sbindir}/bacula-fd
+%if 0%{?fedora} >= 15 || 0%{?rhel} > 6
+%{_unitdir}/bacula-fd.service
+%else
+%{_initrddir}/bacula-fd
+%endif
+%config(noreplace) %{_sysconfdir}/bacula/bacula-fd.conf
+%config(noreplace) %{_sysconfdir}/sysconfig/bacula-fd
+%{_mandir}/man8/bacula-fd.8.gz
+%{_libdir}/bacula/bpipe-fd.so
+
+%files console
+%defattr(-,root,root,-)
+%{_sbindir}/bconsole
+%attr(640,root,bacula) %config(noreplace) %{_sysconfdir}/bacula/bconsole.conf
+%{_mandir}/man8/bconsole.8.gz
+
+%if 0%{?fedora} >= 11 || 0%{?rhel} >= 6
+%files console-bat
+%defattr(-,root,root,-)
+%config(noreplace) %{_sysconfdir}/security/console.apps/bat
+%config(noreplace) %{_sysconfdir}/pam.d/bat
+%attr(640,root,bacula) %config(noreplace) %{_sysconfdir}/bacula/bat.conf
+%{_bindir}/bat
+%{_sbindir}/bat
+%{_mandir}/man1/bat.1.gz
+%{_datadir}/applications/fedora-bacula-bat.desktop
+%{_datadir}/pixmaps/bat_icon.png
+%endif
+
%files docs
%defattr(-,root,root,-)
%doc bacula-docs-%{version}/manuals/en/problems/problems.pdf
More information about the scm-commits
mailing list