diff --git a/bacula.spec b/bacula.spec index 254b792..f272d10 100644 --- a/bacula.spec +++ b/bacula.spec @@ -1,48 +1,25 @@ -%define working_dir /var/spool/bacula -%define script_dir /usr/libexec/bacula -#%define rescue_version 2.0.0 -%define docs_version %{version} -%define gui_version %{version} -%define config_dir %{_sysconfdir}/bacula - Summary: Cross platform network backup for Linux, Unix, Mac and Windows Name: bacula Version: 5.0.3 -Release: 14%{?dist} +Release: 15%{?dist} # 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-%{docs_version}.tar.bz2 -#Source2: http://download.sourceforge.net/bacula/bacula-rescue-%{rescue_version}.tar.gz -#Source3: bacula-gconsole.desktop +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 -#Source10: http://download.sourceforge.net/bacula/bacula-gui-%{gui_version}.tar.gz -#Source11: bacula-web.apache Source12: bacula-bat.desktop Source13: bacula-traymonitor.console_apps Source14: bacula-wxconsole.console_apps Source15: bacula-checkconf -#Patch0: bacula-director-configuration.patch Patch1: bacula-config.patch -#Patch2: bacula-wxconsole.patch Patch3: bacula-pamd.patch -#Patch4: 2.0.3-ampm.patch -#Patch5: 2.0.3-maxbyteslist.patch -#Patch6: 2.0.3-maxwaittime.patch -#Patch7: 2.0.3-scheduler-next-hour.patch -#Patch8: 2.0.3-verify.patch -#Patch9: 2.0.3-tls-disconnect.patch -#Patch10: bacula-web-smarty.patch -#Patch11: bacula-2.4.3-orphaned-jobs.patch -#Patch12: bacula-2.4.3-python26.patch -#Patch13: bacula-3.0.2-openssl.patch Patch14: bacula-5.0.1-dsolink.patch Patch15: bacula-5.0.2-openssl.patch Patch16: bacula-5.0.2-config.patch @@ -268,19 +245,6 @@ This package contains the command-line management console for the bacula backup system. -#%package console-gnome -#Summary: Bacula console for the Gnome desktop environment -#Group: System Environment/Daemons -#Requires: bacula-common = %{version}-%{release} -#Requires: usermode -# -#%description console-gnome -#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 gnome version of the bacula management console - %package console-bat Summary: Bacula bat console Group: System Environment/Daemons @@ -324,21 +288,6 @@ This package contains the Gnome- and KDE-compatible tray monitor to monitor your bacula server. -#%package web -#Summary: Bacula Web Interface for monitoring the Backup status -#Group: System Environment/Daemons -#Conflicts: bacula-storage-sqlite -#Requires: php, webserver, php-pear-DB, php-gd, php-Smarty - -#%description web -#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 bacula-web PHP application, which is -#a management level tool for reporting Backup job status. - - %package docs Summary: Bacula documentation Group: Documentation @@ -354,24 +303,10 @@ This package contains the documentation for most of the bacula-packages. %prep %setup -q -c -n bacula-%{version} %setup -q -a 1 -D -T -#%setup -q -a 2 -D -T -#%setup -q -a 10 -D -T -# Patching and other source preparation pushd bacula-%{version} -#%patch0 -p1 %patch1 -p1 -#%patch2 -p1 %patch3 -p1 -#%patch4 -p0 -#%patch5 -p0 -#%patch6 -p0 -#%patch7 -p0 -#%patch8 -p0 -#%patch9 -p0 -#%patch11 -p0 -#%patch12 -p0 -#%patch13 -p2 -b .openssl %patch14 -p2 %patch15 -p2 -b .openssl %patch16 -p2 -b .config @@ -381,11 +316,9 @@ pushd bacula-%{version} %patch20 -p0 -b .priv %patch21 -p2 -b .tray-dir %patch22 -p0 -b .mysql55 -#quoting MaxValue in sql scripts %patch23 -p1 -b .maxvalue - # Remove execution permissions from files we're packaging as docs later on find examples -type f | xargs chmod -x find updatedb -type f | xargs chmod -x @@ -398,11 +331,6 @@ find -name '.cvsignore' | xargs rm -f find -type f -name '*.c' | xargs chmod -x find -type f -name '*.h' | xargs chmod -x -# GUI Stuff is postponed for later -#pushd bacula-gui-%{gui_version} -#%patch10 -p0 -#popd - # We are building the source several times, each with a different storage backend mkdir bacula-mysql bacula-postgresql bacula-sqlite @@ -427,8 +355,8 @@ export QMAKE=/usr/bin/qmake-qt4 --with-mon-dir-password=@@MON_DIR_PASSWORD@@ \ --with-mon-fd-password=@@MON_FD_PASSWORD@@ \ --with-mon-sd-password=@@MON_SD_PASSWORD@@ \ - --with-working-dir=%{working_dir} \ - --with-scriptdir=%{script_dir} \ + --with-working-dir=%{_localstatedir}/spool/bacula \ + --with-scriptdir=%{_libexecdir}/bacula \ --with-smtp-host=localhost \ --with-subsys-dir=%{_localstatedir}/lock/subsys \ --with-pid-dir=%{_localstatedir}/run \ @@ -506,7 +434,7 @@ pushd bacula-postgresql popd # Build the docs -pushd bacula-docs-%{docs_version} +pushd bacula-docs-%{version} %configure --with-bacula=%{_builddir}/bacula-%{version}/bacula-%{version} make popd @@ -556,44 +484,20 @@ pushd bacula-postgresql done popd -pushd bacula-docs-%{docs_version} +pushd bacula-docs-%{version} # No install target anymore, we'll include the stuff directly in the %%files section # make install DESTDIR=%{buildroot} popd -# GUI is not being packaged yet -#pushd bacula-gui-%{gui_version}/bacula-web -# mkdir -p %{buildroot}%{_datadir}/bacula-web -# cp -r -p * %{buildroot}%{_datadir}/bacula-web -# for f in ChangeLog CONTACT COPYING README TODO; do -# rm -f %{buildroot}%{_datadir}/bacula-web/$f -# done -# rm -f %{buildroot}%{_datadir}/bacula-web/tsmarty2c.php -# rm -rf %{buildroot}%{_datadir}/bacula-web/external_packages/smarty -# mv %{buildroot}%{_datadir}/bacula-web/configs/bacula.conf %{buildroot}%{_sysconfdir}/bacula/bacula-web.conf -# ln -sf /etc/bacula/bacula-web.conf %{buildroot}%{_datadir}/bacula-web/configs/bacula.conf -# install -D -m 644 %{SOURCE11} %{buildroot}%{_sysconfdir}/httpd/conf.d/bacula-web.conf -# mkdir -p %{buildroot}%{_localstatedir}/cache/bacula -#popd - - -# Rename some manpages -# Not needed right-now -#mv %{buildroot}%{_mandir}/man1/bacula-tray-monitor.1 %{buildroot}%{_mandir}/man1/tray-monitor.1 - - # Fix some wrapper braindeadness rm -f %{buildroot}%{_libexecdir}/bacula/bconsole rm -f %{buildroot}%{_libexecdir}/bacula/gconsole mv %{buildroot}%{_sbindir}/bwx-console %{buildroot}%{_sbindir}/bwxconsole mv %{buildroot}%{_sysconfdir}/bacula/bwx-console.conf %{buildroot}%{_sysconfdir}/bacula/bwxconsole.conf - # Desktop Integration for the console apps and the traymonitor mkdir -p %{buildroot}%{_bindir} install -m 644 -D bacula-sqlite/scripts/bacula.png %{buildroot}%{_datadir}/pixmaps/bacula.png -#install -m 644 -D bacula-sqlite/scripts/bgnome-console.pamd %{buildroot}%{_sysconfdir}/pam.d/bgnome-console -#install -m 644 -D bacula-sqlite/scripts/bgnome-console.console_apps %{buildroot}%{_sysconfdir}/security/console.apps/bgnome-console install -m 644 -D bacula-sqlite/src/wx-console/wxwin16x16.xpm %{buildroot}%{_datadir}/pixmaps/wxwin16x16.xpm install -m 644 -D bacula-sqlite/scripts/wxconsole.pamd %{buildroot}%{_sysconfdir}/pam.d/bwxconsole install -m 644 -D %{SOURCE14} %{buildroot}%{_sysconfdir}/security/console.apps/bwxconsole @@ -605,13 +509,11 @@ install -m 644 -D bacula-sqlite/src/qt-console/images/bat_icon.png %{buildroot}% install -m 644 -D bacula-sqlite/scripts/bgnome-console.pamd %{buildroot}%{_sysconfdir}/pam.d/bacula-tray-monitor install -m 644 %{SOURCE13} %{buildroot}%{_sysconfdir}/security/console.apps/bacula-tray-monitor -#ln -sf consolehelper %{buildroot}%{_bindir}/bgnome-console ln -sf consolehelper %{buildroot}%{_bindir}/bwxconsole ln -sf consolehelper %{buildroot}%{_bindir}/bat ln -sf consolehelper %{buildroot}%{_bindir}/bacula-tray-monitor install -m 755 bacula-sqlite/src/qt-console/bat %{buildroot}%{_sbindir} -#desktop-file-install --vendor="fedora" --dir=%{buildroot}%{_datadir}/applications %{SOURCE3} desktop-file-install --vendor="fedora" --dir=%{buildroot}%{_datadir}/applications %{SOURCE4} desktop-file-install --vendor="fedora" --dir=%{buildroot}%{_datadir}/applications %{SOURCE5} desktop-file-install --vendor="fedora" --dir=%{buildroot}%{_datadir}/applications %{SOURCE12} @@ -888,18 +790,6 @@ fi %{_mandir}/man8/bconsole.8* -#%files console-gnome -#%defattr(-,root,root,-) -#%config %{_sysconfdir}/security/console.apps/bgnome-console -#%config %{_sysconfdir}/pam.d/bgnome-console -#%attr(640,root,bacula) %config(noreplace) %{_sysconfdir}/bacula/bgnome-console.conf -#%{_bindir}/bgnome-console -#%{_sbindir}/bgnome-console -#%{_mandir}/man1/bacula-bgnome-console.1.gz -##%{_mandir}/man1/bacula-bconsole-gnome.1* -#%{_datadir}/applications/fedora-bacula-gconsole.desktop -#%{_datadir}/pixmaps/bacula.png - %files console-bat %defattr(-,root,root,-) %config %{_sysconfdir}/security/console.apps/bat @@ -961,7 +851,6 @@ fi %{_libexecdir}/bacula/update_bacula_tables.mysql - %files director-sqlite %defattr(-,root,root,-) %{_sbindir}/bacula-dir.sqlite @@ -1052,28 +941,19 @@ fi %files docs %defattr(-,root,root,-) -#%doc bacula-docs-%{docs_version}/manuals/en/old/install/install.pdf -%doc bacula-docs-%{docs_version}/manuals/en/problems/problems.pdf -%doc bacula-docs-%{docs_version}/manuals/en/console/console.pdf -%doc bacula-docs-%{docs_version}/manuals/en/utility/utility.pdf -#%doc bacula-docs-%{docs_version}/manuals/en/old/concepts/concepts.pdf -#%doc bacula-docs-%{docs_version}/manuals/en/old/catalog/catalog.pdf -%doc bacula-docs-%{docs_version}/manuals/en/developers/developers.pdf -%doc bacula-docs-%{docs_version}/manuals/en/main/main.pdf -%doc bacula-docs-%{docs_version}/manuals/en/misc/misc.pdf - - -#%files web -#%defattr(-,root,root,-) -#%doc bacula-gui-%{gui_version}/bacula-web/CONTACT bacula-gui-%{gui_version}/bacula-web/COPYING -#%doc bacula-gui-%{gui_version}/bacula-web/README bacula-gui-%{gui_version}/bacula-web/TODO -#%{_datadir}/bacula-web/ -#%config(noreplace) %{_sysconfdir}/bacula/bacula-web.conf -#%config(noreplace) %{_sysconfdir}/httpd/conf.d/bacula-web.conf -#%dir %attr(755, apache, apache) %{_localstatedir}/cache/bacula-web +%doc bacula-docs-%{version}/manuals/en/problems/problems.pdf +%doc bacula-docs-%{version}/manuals/en/console/console.pdf +%doc bacula-docs-%{version}/manuals/en/utility/utility.pdf +%doc bacula-docs-%{version}/manuals/en/developers/developers.pdf +%doc bacula-docs-%{version}/manuals/en/main/main.pdf +%doc bacula-docs-%{version}/manuals/en/misc/misc.pdf + %changelog +* Fri Dec 23 2011 Simone Caronni - 5.0.3-15 +- Spec file cleanup. + * Thu Dec 22 2011 Lukáš Nykrýn - 5.0.3-14 - removed duplicity from logrotate file (#755970)