From ab2ba2c880a725de5b77efb2af039d9b1f19f965 Mon Sep 17 00:00:00 2001 From: Jon Ciesla Date: Jan 26 2010 20:47:22 +0000 Subject: 5.0.0. --- diff --git a/.cvsignore b/.cvsignore index d5af2df..dbb6ec2 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,2 +1,2 @@ -bacula-3.0.3.tar.gz -bacula-docs-3.0.3.tar.bz2 +bacula-5.0.0.tar.gz +bacula-docs-5.0.0.tar.bz2 diff --git a/bacula-config.patch b/bacula-config.patch index 9a57bec..3a847b5 100644 --- a/bacula-config.patch +++ b/bacula-config.patch @@ -1,11 +1,3 @@ ---- bacula-2.4.3/src/gnome2-console/bgnome-console.conf.in.orig 2008-12-10 10:12:18.000000000 -0600 -+++ bacula-2.4.3/src/gnome2-console/bgnome-console.conf.in 2008-12-10 10:12:18.000000000 -0600 -@@ -6 +6 @@ -- Name = @basename@-dir -+ Name = bacula-dir -@@ -8 +8 @@ -- address = @hostname@ -+ address = server.example.com --- bacula-2.4.3/src/dird/bacula-dir.conf.in.orig 2008-12-10 10:17:27.000000000 -0600 +++ bacula-2.4.3/src/dird/bacula-dir.conf.in 2008-12-10 10:17:27.000000000 -0600 @@ -16 +16 @@ diff --git a/bacula.spec b/bacula.spec index 254b3a3..6a4877d 100644 --- a/bacula.spec +++ b/bacula.spec @@ -7,15 +7,15 @@ Summary: Cross platform network backup for Linux, Unix, Mac and Windows Name: bacula -Version: 3.0.3 -Release: 5%{?dist} +Version: 5.0.0 +Release: 1%{?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 +#Source3: bacula-gconsole.desktop Source4: bacula-wxconsole.desktop Source5: bacula-traymonitor.desktop Source6: bacula.logrotate @@ -229,6 +229,7 @@ Summary: Common Bacula utilities Group: System Environment/Daemons Requires: bacula-sysconfdir = %{version}-%{release} 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, @@ -250,18 +251,18 @@ 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-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 @@ -414,7 +415,6 @@ export CPPFLAGS=-I%{_includedir}/ncurses --with-pid-dir=%{_localstatedir}/run \ --enable-conio \ --enable-largefile \ - --enable-gnome \ --enable-bwx-console \ --enable-tray-monitor \ --enable-build-dird \ @@ -565,8 +565,8 @@ mv %{buildroot}%{_sysconfdir}/bacula/bwx-console.conf %{buildroot}%{_sysconfdir} # 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/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/wxconsole install -m 644 -D bacula-sqlite/scripts/wxconsole.desktop.consolehelper %{buildroot}%{_sysconfdir}/security/console.apps/wxconsole @@ -578,13 +578,13 @@ 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}/bgnome-console ln -sf consolehelper %{buildroot}%{_bindir}/wxconsole 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 %{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} @@ -801,8 +801,9 @@ fi %dir %attr(750, bacula, bacula) %{_localstatedir}/log/bacula %dir %attr(750, bacula, bacula) %{_localstatedir}/spool/bacula %{_sbindir}/bacula -%{_libdir}/bpipe-fd.so +#%{_libdir}/bpipe-fd.so /usr/libexec/bacula/mtx-changer.conf +%{_libexecdir}/bacula/bacula_config %files client %defattr(-,root,root,-) @@ -819,17 +820,17 @@ 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-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,-) @@ -841,6 +842,7 @@ fi %{_mandir}/man1/bat.1.gz %{_datadir}/applications/fedora-bacula-bat.desktop %{_datadir}/pixmaps/bat_icon.png +%{_datadir}/pixmaps/bacula.png %files console-wxwidgets @@ -870,7 +872,7 @@ fi %{_mandir}/man8/dbcheck.8* %{_mandir}/man8/bacula-dir.8* %{_libexecdir}/bacula/delete_catalog_backup - +%{_libexecdir}/bacula/make_catalog_backup.pl %files director-mysql %defattr(-,root,root,-) @@ -982,13 +984,15 @@ fi %files docs %defattr(-,root,root,-) -%doc bacula-docs-%{docs_version}/manuals/en/install/install.pdf +#%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/concepts/concepts.pdf -%doc bacula-docs-%{docs_version}/manuals/en/catalog/catalog.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 @@ -1002,6 +1006,9 @@ fi %changelog +* Mon Jan 25 2010 Jon Ciesla