Update to 2.2.8, multiple fixes.
This commit is contained in:
Jon Ciesla
parent
66f3524a39
commit
b87413e4df
@ -0,0 +1,2 @@
|
||||
bacula-2.2.8.tar.gz
|
||||
bacula-docs-2.2.8.tar.bz2
|
||||
@ -1,5 +1,5 @@
|
||||
--- bacula-2.0.2/src/gnome2-console/gnome-console.conf.in.orig 2007-02-06 13:35:12.000000000 +0100
|
||||
+++ bacula-2.0.2/src/gnome2-console/gnome-console.conf.in 2007-02-06 13:35:25.000000000 +0100
|
||||
--- bacula-2.0.2/src/gnome2-console/bgnome-console.conf.in.orig 2007-02-06 13:35:12.000000000 +0100
|
||||
+++ bacula-2.0.2/src/gnome2-console/bgnome-console.conf.in 2007-02-06 13:35:25.000000000 +0100
|
||||
@@ -3,9 +3,9 @@
|
||||
#
|
||||
|
||||
@ -202,8 +202,8 @@
|
||||
- director = @hostname@-dir = all
|
||||
+ director = bacula-dir = all
|
||||
}
|
||||
--- bacula-2.0.2/src/wx-console/wx-console.conf.in.orig 2007-02-06 13:37:12.000000000 +0100
|
||||
+++ bacula-2.0.2/src/wx-console/wx-console.conf.in 2007-02-06 13:47:02.000000000 +0100
|
||||
--- bacula-2.0.2/src/wx-console/bwx-console.conf.in.orig 2007-02-06 13:37:12.000000000 +0100
|
||||
+++ bacula-2.0.2/src/wx-console/bwx-console.conf.in 2007-02-06 13:47:02.000000000 +0100
|
||||
@@ -3,8 +3,8 @@
|
||||
#
|
||||
|
||||
|
||||
@ -4,9 +4,9 @@ Encoding=UTF-8
|
||||
Name=Bacula Console
|
||||
GenericName=Backup Management Console
|
||||
Comment=Control your Bacula Server
|
||||
Exec=gnome-console -c /etc/bacula/wxconsole.conf
|
||||
Exec=bgnome-console -c /etc/bacula/bgnome-console.conf
|
||||
Icon=bacula.png
|
||||
Terminal=false
|
||||
Type=Application
|
||||
Categories=System;Application;Utility
|
||||
Categories=System;Application;
|
||||
|
||||
|
||||
@ -9,8 +9,8 @@
|
||||
session optional pam_xauth.so
|
||||
session optional pam_timestamp.so
|
||||
account required pam_permit.so
|
||||
--- bacula-2.0.3/scripts/gnome-console.pamd.orig 2007-07-11 18:42:33.000000000 +0200
|
||||
+++ bacula-2.0.3/scripts/gnome-console.pamd 2007-07-11 18:42:57.000000000 +0200
|
||||
--- bacula-2.0.3/scripts/bgnome-console.pamd.orig 2007-07-11 18:42:33.000000000 +0200
|
||||
+++ bacula-2.0.3/scripts/bgnome-console.pamd 2007-07-11 18:42:57.000000000 +0200
|
||||
@@ -1,7 +1,7 @@
|
||||
#%PAM-1.0
|
||||
auth sufficient pam_rootok.so
|
||||
|
||||
@ -4,8 +4,8 @@ Encoding=UTF-8
|
||||
Name=Bacula WX Console
|
||||
GenericName=Backup Management Console
|
||||
Comment=Control your Bacula Server
|
||||
Exec=wxconsole -c /etc/bacula/wxconsole.conf
|
||||
Exec=wxconsole -c /etc/bacula/bwxconsole.conf
|
||||
Icon=wxwin16x16.xpm
|
||||
Terminal=false
|
||||
Type=Application
|
||||
Categories=System;Application;Utility
|
||||
Categories=System;Application;
|
||||
|
||||
85
bacula.spec
85
bacula.spec
@ -7,13 +7,13 @@
|
||||
|
||||
Summary: Cross platform network backup for Linux, Unix, Mac and Windows
|
||||
Name: bacula
|
||||
Version: 2.0.3
|
||||
Release: 14%{?dist}
|
||||
Version: 2.2.8
|
||||
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.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
|
||||
Source4: bacula-wxconsole.desktop
|
||||
@ -26,14 +26,14 @@ Source9: bacula-sd.init
|
||||
#Source11: bacula-web.apache
|
||||
Patch0: bacula-director-configuration.patch
|
||||
Patch1: bacula-config.patch
|
||||
Patch2: bacula-wxconsole.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
|
||||
#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
|
||||
URL: http://www.bacula.org
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||
@ -68,7 +68,6 @@ Group: System Environment/Daemons
|
||||
Provides: bacula-director = %{version}-%{release}
|
||||
Requires: bacula-director-common = %{version}-%{release}
|
||||
Requires: bacula-common = %{version}-%{release}
|
||||
Requires: mysql-server
|
||||
|
||||
%description director-mysql
|
||||
Bacula is a set of programs that allow you to manage the backup,
|
||||
@ -103,7 +102,6 @@ Group: System Environment/Daemons
|
||||
Provides: bacula-director = %{version}-%{release}
|
||||
Requires: bacula-director-common = %{version}-%{release}
|
||||
Requires: bacula-common = %{version}-%{release}
|
||||
Requires: postgresql-server
|
||||
|
||||
%description director-postgresql
|
||||
Bacula is a set of programs that allow you to manage the backup,
|
||||
@ -175,7 +173,6 @@ Group: System Environment/Daemons
|
||||
Provides: bacula-storage = %{version}-%{release}
|
||||
Requires: bacula-storage-common = %{version}-%{release}
|
||||
Requires: bacula-common = %{version}-%{release}
|
||||
Requires: mysql-server
|
||||
|
||||
%description storage-mysql
|
||||
Bacula is a set of programs that allow you to manage the backup,
|
||||
@ -210,7 +207,6 @@ Group: System Environment/Daemons
|
||||
Provides: bacula-storage = %{version}-%{release}
|
||||
Requires: bacula-storage-common = %{version}-%{release}
|
||||
Requires: bacula-common = %{version}-%{release}
|
||||
Requires: postgresql-server
|
||||
|
||||
%description storage-postgresql
|
||||
Bacula is a set of programs that allow you to manage the backup,
|
||||
@ -324,14 +320,14 @@ This package contains the documentation for most of the bacula-packages.
|
||||
pushd bacula-%{version}
|
||||
%patch0 -p1
|
||||
%patch1 -p1
|
||||
%patch2 -p1
|
||||
#%patch2 -p1
|
||||
%patch3 -p1
|
||||
%patch4 -p0
|
||||
%patch5 -p0
|
||||
%patch6 -p0
|
||||
%patch7 -p0
|
||||
%patch8 -p0
|
||||
%patch9 -p0
|
||||
#%patch4 -p0
|
||||
#%patch5 -p0
|
||||
#%patch6 -p0
|
||||
#%patch7 -p0
|
||||
#%patch8 -p0
|
||||
#%patch9 -p0
|
||||
|
||||
# Remove execution permissions from files we're packaging as docs later on
|
||||
find examples -type f | xargs chmod -x
|
||||
@ -381,7 +377,7 @@ export CPPFLAGS=-I%{_includedir}/ncurses
|
||||
--enable-conio \
|
||||
--enable-largefile \
|
||||
--enable-gnome \
|
||||
--enable-wx-console \
|
||||
--enable-bwx-console \
|
||||
--enable-tray-monitor \
|
||||
--enable-build-dird \
|
||||
--enable-build-stored \
|
||||
@ -521,15 +517,15 @@ popd
|
||||
# Fix some wrapper braindeadness
|
||||
rm -f %{buildroot}%{_libexecdir}/bacula/bconsole
|
||||
rm -f %{buildroot}%{_libexecdir}/bacula/gconsole
|
||||
mv %{buildroot}%{_sbindir}/wx-console %{buildroot}%{_sbindir}/wxconsole
|
||||
mv %{buildroot}%{_sysconfdir}/bacula/wx-console.conf %{buildroot}%{_sysconfdir}/bacula/wxconsole.conf
|
||||
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/gnome-console.pamd %{buildroot}%{_sysconfdir}/pam.d/gnome-console
|
||||
install -m 644 -D bacula-sqlite/scripts/gnome-console.console_apps %{buildroot}%{_sysconfdir}/security/console.apps/gnome-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
|
||||
@ -724,10 +720,10 @@ fi
|
||||
|
||||
|
||||
%files common
|
||||
%defattr(-,root,root,-)
|
||||
%doc bacula-%{version}/AUTHORS bacula-%{version}/ChangeLog bacula-%{version}/COPYING bacula-%{version}/LICENSE
|
||||
%doc bacula-%{version}/README bacula-%{version}/SUPPORT bacula-%{version}/VERIFYING
|
||||
%doc bacula-%{version}/examples/
|
||||
%defattr(-,root,root,-)
|
||||
%config(noreplace) %{_sysconfdir}/logrotate.d/bacula
|
||||
%dir %{_sysconfdir}/bacula
|
||||
%dir %{_libexecdir}/bacula
|
||||
@ -759,12 +755,13 @@ fi
|
||||
|
||||
%files console-gnome
|
||||
%defattr(-,root,root,-)
|
||||
%config %{_sysconfdir}/security/console.apps/gnome-console
|
||||
%config %{_sysconfdir}/pam.d/gnome-console
|
||||
%config(noreplace) %{_sysconfdir}/bacula/gnome-console.conf
|
||||
%config %{_sysconfdir}/security/console.apps/bgnome-console
|
||||
%config %{_sysconfdir}/pam.d/bgnome-console
|
||||
%config(noreplace) %{_sysconfdir}/bacula/bgnome-console.conf
|
||||
%{_bindir}/gnome-console
|
||||
%{_sbindir}/gnome-console
|
||||
%{_mandir}/man1/bacula-console-gnome.1*
|
||||
%{_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
|
||||
|
||||
@ -773,17 +770,17 @@ fi
|
||||
%defattr(-,root,root,-)
|
||||
%config %{_sysconfdir}/security/console.apps/wxconsole
|
||||
%config %{_sysconfdir}/pam.d/wxconsole
|
||||
%config(noreplace) %{_sysconfdir}/bacula/wxconsole.conf
|
||||
%config(noreplace) %{_sysconfdir}/bacula/bwxconsole.conf
|
||||
%{_bindir}/wxconsole
|
||||
%{_sbindir}/wxconsole
|
||||
%{_mandir}/man1/bacula-wxconsole.1*
|
||||
%{_sbindir}/bwxconsole
|
||||
%{_mandir}/man1/bacula-bwxconsole.1*
|
||||
%{_datadir}/applications/fedora-bacula-wxconsole.desktop
|
||||
%{_datadir}/pixmaps/wxwin16x16.xpm
|
||||
|
||||
|
||||
%files director-common
|
||||
%doc bacula-%{version}/updatedb/
|
||||
%defattr(-,root,root,-)
|
||||
%doc bacula-%{version}/updatedb/
|
||||
%config(noreplace) %{_sysconfdir}/bacula/bacula-dir.conf
|
||||
%config(noreplace) %{_sysconfdir}/bacula/query.sql
|
||||
%config %{_sysconfdir}/logwatch/conf/logfiles/bacula.conf
|
||||
@ -792,6 +789,7 @@ fi
|
||||
%{_initrddir}/bacula-dir
|
||||
%{_sbindir}/bregex
|
||||
%{_sbindir}/bwild
|
||||
%{_mandir}/man1/bat.1.gz
|
||||
%{_mandir}/man8/dbcheck.8*
|
||||
%{_mandir}/man8/bacula-dir.8*
|
||||
%{_libexecdir}/bacula/delete_catalog_backup
|
||||
@ -903,6 +901,7 @@ fi
|
||||
|
||||
|
||||
%files docs
|
||||
%defattr(-,root,root,-)
|
||||
%doc bacula-docs-%{docs_version}/bacula-web/bacula-web.pdf
|
||||
%doc bacula-docs-%{docs_version}/bacula-web/bacula-web/
|
||||
%doc bacula-docs-%{docs_version}/developers/developers.pdf
|
||||
@ -922,6 +921,20 @@ fi
|
||||
|
||||
|
||||
%changelog
|
||||
* Fri Jul 25 2008 Jon Ciesla <limb@jcomserv.net> - 2.2.8-1
|
||||
- Update to 2.2.8. BZ 446461.
|
||||
- Dropped director and storage DB-server hard Reqs. BZ 426788.
|
||||
- .desktop fixes. BZ 450278, 426789.
|
||||
- Updated config patch.
|
||||
- Dropped wxconsole patch, applied upstream.
|
||||
- Updated pamd patch.
|
||||
- Dropped ampm patch, applied upstream.
|
||||
- Dropped maxbyteslist patch, N/A.
|
||||
- Dropped maxwaittime patch, applied upstream.
|
||||
- Dropped scheduler-next-hour patch, applied upstream.
|
||||
- Dropped verify patch, applied upstream.
|
||||
- Dropped tls-disconnect patch, applied upstream.
|
||||
|
||||
* Mon Jul 7 2008 Tom "spot" Callaway <tcallawa@redhat.com> - 2.0.3-14
|
||||
- fix conditional comparison
|
||||
- fix license tag
|
||||
|
||||
Loading…
Reference in New Issue
Block a user