[bacula/f16] Change indentation
Simone Caronni
slaanesh at fedoraproject.org
Fri Dec 23 08:49:58 UTC 2011
commit 6d714feda9f52fa3c98fe57e87c2fa772df37221
Author: Simone Caronni <negativo17 at gmail.com>
Date: Fri Dec 23 09:49:44 2011 +0100
Change indentation
bacula.spec | 263 ++++++++++++++++++++++++++++-------------------------------
1 files changed, 124 insertions(+), 139 deletions(-)
---
diff --git a/bacula.spec b/bacula.spec
index f272d10..9c73a0e 100644
--- a/bacula.spec
+++ b/bacula.spec
@@ -1,49 +1,50 @@
-Summary: Cross platform network backup for Linux, Unix, Mac and Windows
-Name: bacula
-Version: 5.0.3
-Release: 15%{?dist}
+Name: bacula
+Version: 5.0.3
+Release: 15%{?dist}
+Summary: Cross platform network backup for Linux, Unix, Mac and Windows
# See LICENSE for details
-License: GPLv2 with exceptions
-Group: System Environment/Daemons
-Source0: http://download.sourceforge.net/bacula/bacula-%{version}.tar.gz
-Source1: http://download.sourceforge.net/bacula/bacula-docs-%{version}.tar.bz2
-Source4: bacula-wxconsole.desktop
-Source5: bacula-traymonitor.desktop
-Source6: bacula.logrotate
-Source7: bacula-fd.service
-Source8: bacula-dir.service
-Source9: bacula-sd.service
-Source12: bacula-bat.desktop
-Source13: bacula-traymonitor.console_apps
-Source14: bacula-wxconsole.console_apps
-Source15: bacula-checkconf
-
-Patch1: bacula-config.patch
-Patch3: bacula-pamd.patch
-Patch14: bacula-5.0.1-dsolink.patch
-Patch15: bacula-5.0.2-openssl.patch
-Patch16: bacula-5.0.2-config.patch
-Patch17: bacula-5.0.2-python27.patch
-Patch18: bacula-5.0.3-dsolink.patch
-Patch19: bacula-5.0.3-log-path.patch
-Patch20: bacula-5.0.3-sqlite-priv.patch
-Patch21: bacula-5.0.3-tray-dir.patch
-Patch22: bacula-5.0.3-mysql55.patch
-Patch23: bacula-5.0.3-maxvalue.patch
-
-URL: http://www.bacula.org
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: openssl-devel, atk-devel, ncurses-devel, pango-devel, perl
-BuildRequires: libstdc++-devel, libxml2-devel, zlib-devel, pkgconfig
-BuildRequires: gtk2-devel, libgnomeui-devel, GConf2-devel
-BuildRequires: glibc-devel, ORBit2-devel, libart_lgpl-devel, freetype-devel
-BuildRequires: libbonobo-devel, libbonoboui-devel, bonobo-activation-devel
-BuildRequires: mysql-devel, cdrecord, postgresql-devel, wxGTK-devel
-BuildRequires: desktop-file-utils, python-devel, sqlite-devel, sed,
-BuildRequires: libacl-devel, latex2html, tetex-latex, tetex, ghostscript
-BuildRequires: dvipdfm, qwt-devel
-BuildRequires: tcp_wrappers-devel
-BuildRequires: systemd-units
+License: GPLv2 with exceptions
+Group: System Environment/Daemons
+URL: http://www.bacula.org
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Source0: http://download.sourceforge.net/bacula/bacula-%{version}.tar.gz
+Source1: http://download.sourceforge.net/bacula/bacula-docs-%{version}.tar.bz2
+Source4: bacula-wxconsole.desktop
+Source5: bacula-traymonitor.desktop
+Source6: bacula.logrotate
+Source7: bacula-fd.service
+Source8: bacula-dir.service
+Source9: bacula-sd.service
+Source12: bacula-bat.desktop
+Source13: bacula-traymonitor.console_apps
+Source14: bacula-wxconsole.console_apps
+Source15: bacula-checkconf
+
+Patch1: bacula-config.patch
+Patch3: bacula-pamd.patch
+Patch14: bacula-5.0.1-dsolink.patch
+Patch15: bacula-5.0.2-openssl.patch
+Patch16: bacula-5.0.2-config.patch
+Patch17: bacula-5.0.2-python27.patch
+Patch18: bacula-5.0.3-dsolink.patch
+Patch19: bacula-5.0.3-log-path.patch
+Patch20: bacula-5.0.3-sqlite-priv.patch
+Patch21: bacula-5.0.3-tray-dir.patch
+Patch22: bacula-5.0.3-mysql55.patch
+Patch23: bacula-5.0.3-maxvalue.patch
+
+BuildRequires: openssl-devel, atk-devel, ncurses-devel, pango-devel, perl
+BuildRequires: libstdc++-devel, libxml2-devel, zlib-devel, pkgconfig
+BuildRequires: gtk2-devel, libgnomeui-devel, GConf2-devel
+BuildRequires: glibc-devel, ORBit2-devel, libart_lgpl-devel, freetype-devel
+BuildRequires: libbonobo-devel, libbonoboui-devel, bonobo-activation-devel
+BuildRequires: mysql-devel, cdrecord, postgresql-devel, wxGTK-devel
+BuildRequires: desktop-file-utils, python-devel, sqlite-devel, sed,
+BuildRequires: libacl-devel, latex2html, tetex-latex, tetex, ghostscript
+BuildRequires: dvipdfm, qwt-devel
+BuildRequires: tcp_wrappers-devel
+BuildRequires: systemd-units
%description
Bacula is a set of programs that allow you to manage the backup,
@@ -55,11 +56,11 @@ or damaged files.
%package director-mysql
-Summary: Bacula Director with MySQL database support
-Group: System Environment/Daemons
-Provides: bacula-director = %{version}-%{release}
-Requires: bacula-director-common = %{version}-%{release}
-Requires: bacula-common = %{version}-%{release}
+Summary: Bacula Director with MySQL database support
+Group: System Environment/Daemons
+Provides: bacula-director = %{version}-%{release}
+Requires: bacula-director-common = %{version}-%{release}
+Requires: bacula-common = %{version}-%{release}
%description director-mysql
Bacula is a set of programs that allow you to manage the backup,
@@ -72,11 +73,11 @@ This director has support for the MySQL database.
%package director-sqlite
-Summary: Bacula Director with sqlite database support
-Group: System Environment/Daemons
-Provides: bacula-director = %{version}-%{release}
-Requires: bacula-director-common = %{version}-%{release}
-Requires: bacula-common = %{version}-%{release}
+Summary: Bacula Director with sqlite database support
+Group: System Environment/Daemons
+Provides: bacula-director = %{version}-%{release}
+Requires: bacula-director-common = %{version}-%{release}
+Requires: bacula-common = %{version}-%{release}
%description director-sqlite
Bacula is a set of programs that allow you to manage the backup,
@@ -89,11 +90,11 @@ This director has support for the sqlite database.
%package director-postgresql
-Summary: Bacula Director with PostgresSQL database support
-Group: System Environment/Daemons
-Provides: bacula-director = %{version}-%{release}
-Requires: bacula-director-common = %{version}-%{release}
-Requires: bacula-common = %{version}-%{release}
+Summary: Bacula Director with PostgresSQL database support
+Group: System Environment/Daemons
+Provides: bacula-director = %{version}-%{release}
+Requires: bacula-director-common = %{version}-%{release}
+Requires: bacula-common = %{version}-%{release}
%description director-postgresql
Bacula is a set of programs that allow you to manage the backup,
@@ -106,17 +107,17 @@ This director has support for the PostgresSQL database.
%package director-common
-Summary: Common Bacula Director files
-Group: System Environment/Daemons
-Requires: bacula-director = %{version}-%{release}
-Requires: bacula-common = %{version}-%{release}
-Requires: logwatch
-Requires(pre): fedora-usermgmt
-Requires(postun): fedora-usermgmt
-Requires(post): systemd-sysv
-Requires(post): systemd-units
-Requires(preun): systemd-units
-Requires(postun): systemd-units
+Summary: Common Bacula Director files
+Group: System Environment/Daemons
+Requires: bacula-director = %{version}-%{release}
+Requires: bacula-common = %{version}-%{release}
+Requires: logwatch
+Requires(pre): fedora-usermgmt
+Requires(postun): fedora-usermgmt
+Requires(post): systemd-sysv
+Requires(post): systemd-units
+Requires(preun): systemd-units
+Requires(postun): systemd-units
%description director-common
Bacula is a set of programs that allow you to manage the backup,
@@ -131,13 +132,13 @@ bacula-director-sqlite or bacula-director-postgresql.
%package client
-Summary: Bacula backup client
-Group: System Environment/Daemons
-Requires: bacula-common = %{version}-%{release}
-Requires(post): systemd-sysv
-Requires(post): systemd-units
-Requires(preun): systemd-units
-Requires(postun): systemd-units
+Summary: Bacula backup client
+Group: System Environment/Daemons
+Requires: bacula-common = %{version}-%{release}
+Requires(post): systemd-sysv
+Requires(post): systemd-units
+Requires(preun): systemd-units
+Requires(postun): systemd-units
%description client
Bacula is a set of programs that allow you to manage the backup,
@@ -149,14 +150,14 @@ system to be backed up.
%package storage-common
-Summary: Common Bacula storage daemon files
-Group: System Environment/Daemons
-Requires: bacula-storage = %{version}-%{release}
-Requires: bacula-common = %{version}-%{release}
-Requires(post): systemd-sysv
-Requires(post): systemd-units
-Requires(preun): systemd-units
-Requires(postun): systemd-units
+Summary: Common Bacula storage daemon files
+Group: System Environment/Daemons
+Requires: bacula-storage = %{version}-%{release}
+Requires: bacula-common = %{version}-%{release}
+Requires(post): systemd-sysv
+Requires(post): systemd-units
+Requires(preun): systemd-units
+Requires(postun): systemd-units
%description storage-common
Bacula is a set of programs that allow you to manage the backup,
@@ -169,11 +170,11 @@ mass storage devices.
%package storage-mysql
-Summary: MySQL Bacula storage daemon files
-Group: System Environment/Daemons
-Provides: bacula-storage = %{version}-%{release}
-Requires: bacula-storage-common = %{version}-%{release}
-Requires: bacula-common = %{version}-%{release}
+Summary: MySQL Bacula storage daemon files
+Group: System Environment/Daemons
+Provides: bacula-storage = %{version}-%{release}
+Requires: bacula-storage-common = %{version}-%{release}
+Requires: bacula-common = %{version}-%{release}
%description storage-mysql
Bacula is a set of programs that allow you to manage the backup,
@@ -186,11 +187,11 @@ mass storage devices.
%package storage-sqlite
-Summary: SQLite Bacula storage daemon files
-Group: System Environment/Daemons
-Provides: bacula-storage = %{version}-%{release}
-Requires: bacula-storage-common = %{version}-%{release}
-Requires: bacula-common = %{version}-%{release}
+Summary: SQLite Bacula storage daemon files
+Group: System Environment/Daemons
+Provides: bacula-storage = %{version}-%{release}
+Requires: bacula-storage-common = %{version}-%{release}
+Requires: bacula-common = %{version}-%{release}
%description storage-sqlite
Bacula is a set of programs that allow you to manage the backup,
@@ -203,11 +204,11 @@ mass storage devices.
%package storage-postgresql
-Summary: Common Bacula storage daemon files
-Group: System Environment/Daemons
-Provides: bacula-storage = %{version}-%{release}
-Requires: bacula-storage-common = %{version}-%{release}
-Requires: bacula-common = %{version}-%{release}
+Summary: Common Bacula storage daemon files
+Group: System Environment/Daemons
+Provides: bacula-storage = %{version}-%{release}
+Requires: bacula-storage-common = %{version}-%{release}
+Requires: bacula-common = %{version}-%{release}
%description storage-postgresql
Bacula is a set of programs that allow you to manage the backup,
@@ -220,10 +221,10 @@ mass storage devices.
%package common
-Summary: Common Bacula utilities
-Group: System Environment/Daemons
-Requires(pre): fedora-usermgmt
-Obsoletes: bacula-console-gnome <= 3.0.3
+Summary: Common Bacula utilities
+Group: System Environment/Daemons
+Requires(pre): fedora-usermgmt
+Obsoletes: bacula-console-gnome <= 3.0.3
%description common
Bacula is a set of programs that allow you to manage the backup,
@@ -232,9 +233,9 @@ different computers. It is based on a client/server architecture.
%package console
-Summary: Bacula management console
-Group: System Environment/Daemons
-Requires: bacula-common = %{version}-%{release}
+Summary: Bacula management console
+Group: System Environment/Daemons
+Requires: bacula-common = %{version}-%{release}
%description console
Bacula is a set of programs that allow you to manage the backup,
@@ -246,10 +247,10 @@ backup system.
%package console-bat
-Summary: Bacula bat console
-Group: System Environment/Daemons
-Requires: bacula-common = %{version}-%{release}
-Requires: usermode
+Summary: Bacula bat console
+Group: System Environment/Daemons
+Requires: bacula-common = %{version}-%{release}
+Requires: usermode
%description console-bat
Bacula is a set of programs that allow you to manage the backup,
@@ -260,10 +261,10 @@ This package contains the bat version of the bacula management console
%package console-wxwidgets
-Summary: Bacula console using the wx widgets toolkit
-Group: System Environment/Daemons
-Requires: bacula-common = %{version}-%{release}
-Requires: usermode
+Summary: Bacula console using the wx widgets toolkit
+Group: System Environment/Daemons
+Requires: bacula-common = %{version}-%{release}
+Requires: usermode
%description console-wxwidgets
Bacula is a set of programs that allow you to manage the backup,
@@ -275,9 +276,9 @@ console.
%package traymonitor
-Summary: Bacula monitor for the Gnome and KDE system tray
-Group: System Environment/Daemons
-Requires: bacula-common = %{version}-%{release}
+Summary: Bacula monitor for the Gnome and KDE system tray
+Group: System Environment/Daemons
+Requires: bacula-common = %{version}-%{release}
%description traymonitor
Bacula is a set of programs that allow you to manage the backup,
@@ -289,8 +290,8 @@ monitor your bacula server.
%package docs
-Summary: Bacula documentation
-Group: Documentation
+Summary: Bacula documentation
+Group: Documentation
%description docs
Bacula is a set of programs that allow you to manage the backup,
@@ -311,7 +312,7 @@ pushd bacula-%{version}
%patch15 -p2 -b .openssl
%patch16 -p2 -b .config
%patch17 -p0 -b .python27
-%patch18 -p2
+%patch18 -p2 -b .dsolink
%patch19 -p2 -b .log-path
%patch20 -p0 -b .priv
%patch21 -p2 -b .tray-dir
@@ -518,12 +519,10 @@ desktop-file-install --vendor="fedora" --dir=%{buildroot}%{_datadir}/application
desktop-file-install --vendor="fedora" --dir=%{buildroot}%{_datadir}/applications %{SOURCE5}
desktop-file-install --vendor="fedora" --dir=%{buildroot}%{_datadir}/applications %{SOURCE12}
-
# logrotate
mkdir -p %{buildroot}%{_localstatedir}/log/bacula
install -m 644 -D %{SOURCE6} %{buildroot}%{_sysconfdir}/logrotate.d/bacula
-
# And logwatch
install -m 755 -D bacula-sqlite/scripts/logwatch/bacula %{buildroot}%{_sysconfdir}/logwatch/scripts/services/bacula
install -m 755 -D bacula-sqlite/scripts/logwatch/applybaculadate %{buildroot}%{_sysconfdir}/logwatch/scripts/shared/applybaculadate
@@ -537,20 +536,16 @@ install -m 755 -D %{SOURCE8} %{buildroot}%{_unitdir}/bacula-dir.service
install -m 755 -D %{SOURCE9} %{buildroot}%{_unitdir}/bacula-sd.service
install -m 755 -D %{SOURCE15} %{buildroot}%{_sbindir}/bacula-checkconf
-
# Wipe backup files from the multiple make install calls
rm -vf %{buildroot}%{_sysconfdir}/bacula/*.{new,old}
rm -vf %{buildroot}%{_libexecdir}/bacula/*.{new,old}
-
# Create the spooling
mkdir -p %{buildroot}%{_localstatedir}/spool/bacula
-
# Move some files around
mv %{buildroot}%{_libexecdir}/bacula/query.sql %{buildroot}%{_sysconfdir}/bacula/query.sql
-
# Nuke the scripts we do not need
rm -vf %{buildroot}%{_libexecdir}/bacula/{bacula,bacula-ctl-*,startmysql,stopmysql}
@@ -580,7 +575,6 @@ rm -rf %{buildroot}
--slave /usr/libexec/bacula/make_catalog_backup make_catalog_backup /usr/libexec/bacula/make_catalog_backup.mysql \
--slave /usr/libexec/bacula/update_bacula_tables update_bacula_tables /usr/libexec/bacula/update_bacula_tables.mysql
-
%post director-sqlite
/usr/sbin/alternatives --install /usr/sbin/bacula-dir bacula-dir /usr/sbin/bacula-dir.sqlite 40 \
--slave /usr/sbin/dbcheck bacula-dbcheck /usr/sbin/dbcheck.sqlite \
@@ -592,7 +586,6 @@ rm -rf %{buildroot}
--slave /usr/libexec/bacula/make_catalog_backup make_catalog_backup /usr/libexec/bacula/make_catalog_backup.sqlite \
--slave /usr/libexec/bacula/update_bacula_tables update_bacula_tables /usr/libexec/bacula/update_bacula_tables.sqlite
-
%post director-postgresql
/usr/sbin/alternatives --install /usr/sbin/bacula-dir bacula-dir /usr/sbin/bacula-dir.postgresql 60 \
--slave /usr/sbin/dbcheck bacula-dbcheck /usr/sbin/dbcheck.postgresql \
@@ -604,19 +597,16 @@ rm -rf %{buildroot}
--slave /usr/libexec/bacula/make_catalog_backup make_catalog_backup /usr/libexec/bacula/make_catalog_backup.postgresql \
--slave /usr/libexec/bacula/update_bacula_tables update_bacula_tables /usr/libexec/bacula/update_bacula_tables.postgresql
-
%preun director-mysql
if [ "$1" = 0 ]; then
/usr/sbin/alternatives --remove bacula-dir /usr/sbin/bacula-dir.mysql
fi
-
%preun director-sqlite
if [ "$1" = 0 ]; then
/usr/sbin/alternatives --remove bacula-dir /usr/sbin/bacula-dir.sqlite
fi
-
%preun director-postgresql
if [ "$1" = 0 ]; then
/usr/sbin/alternatives --remove bacula-dir /usr/sbin/bacula-dir.postgresql
@@ -627,22 +617,18 @@ fi
/usr/sbin/fedora-useradd 33 -r -s /sbin/nologin -d /var/spool/bacula -M \
-c 'Bacula Backup System' -g bacula bacula &>/dev/null || :
-
%post storage-mysql
/usr/sbin/alternatives --install /usr/sbin/bcopy bacula-sd /usr/sbin/bcopy.mysql 50 \
--slave /usr/sbin/bscan bacula-bscan /usr/sbin/bscan.mysql
-
%post storage-sqlite
/usr/sbin/alternatives --install /usr/sbin/bcopy bacula-sd /usr/sbin/bcopy.sqlite 40 \
--slave /usr/sbin/bscan bacula-bscan /usr/sbin/bscan.sqlite
-
%post storage-postgresql
/usr/sbin/alternatives --install /usr/sbin/bcopy bacula-sd /usr/sbin/bcopy.postgresql 60 \
--slave /usr/sbin/bscan bacula-bscan /usr/sbin/bscan.postgresql
-
%preun storage-mysql
if [ "$1" = 0 ]; then
/usr/sbin/alternatives --remove bacula-sd /usr/sbin/bcopy.mysql
@@ -688,7 +674,6 @@ fi
/sbin/chkconfig --del bacula-fd >/dev/null 2>&1 || :
/bin/systemctl try-restart bacula-fd.service >/dev/null 2>&1 || :
-
%post director-common
if [ $1 -eq 1 ] ; then
# Initial installation
@@ -719,7 +704,6 @@ fi
/sbin/chkconfig --del bacula-dir >/dev/null 2>&1 || :
/bin/systemctl try-restart bacula-dir.service >/dev/null 2>&1 || :
-
%post storage-common
if [ $1 -eq 1 ] ; then
# Initial installation
@@ -832,6 +816,7 @@ fi
%{_libexecdir}/bacula/delete_catalog_backup
%{_libexecdir}/bacula/make_catalog_backup.pl
+
%files director-mysql
%defattr(-,root,root,-)
%{_sbindir}/bacula-dir.mysql
More information about the scm-commits
mailing list