Update to version 7.0.0

.gitignore

@@ -17,3 +17,4 @@ bacula-docs-5.0.3.tar.bz2
 /bacula-5.2.11.tar.gz
 /bacula-5.2.12.tar.gz
 /bacula-5.2.13.tar.gz
+/bacula-7.0.0.tar.gz

bacula-7.0.0-queryfile.patch

@@ -1,6 +1,6 @@
-diff -Naur bacula-5.2.2.old/src/dird/bacula-dir.conf.in bacula-5.2.2/src/dird/bacula-dir.conf.in
+diff -Naur bacula-7.0.0.old/src/dird/bacula-dir.conf.in bacula-7.0.0/src/dird/bacula-dir.conf.in
---- bacula-5.2.2.old/src/dird/bacula-dir.conf.in	2011-12-05 13:51:20.375282302 +0100
+--- bacula-7.0.0.old/src/dird/bacula-dir.conf.in	2014-03-29 10:00:03.000000000 +0100
-+++ bacula-5.2.2/src/dird/bacula-dir.conf.in	2011-12-05 13:54:12.809538069 +0100
++++ bacula-7.0.0/src/dird/bacula-dir.conf.in	2014-03-30 11:21:16.293167507 +0200
 @@ -15,7 +15,7 @@
  Director {                            # define myself
    Name = @basename@-dir
@@ -9,4 +9,4 @@ diff -Naur bacula-5.2.2.old/src/dird/bacula-dir.conf.in bacula-5.2.2/src/dird/ba
 +  QueryFile = "@sysconfdir@/query.sql"
    WorkingDirectory = "@working_dir@"
    PidDirectory = "@piddir@"
-   Maximum Concurrent Jobs = 1
+   Maximum Concurrent Jobs = 20

bacula.spec

@@ -2,8 +2,8 @@
 %global username bacula
 
 Name:               bacula
-Version:            5.2.13
+Version:            7.0.0
-Release:            17%{?dist}
+Release:            1%{?dist}
 Summary:            Cross platform network backup for Linux, Unix, Mac and Windows
 # See LICENSE for details
 License:            AGPLv3 with exceptions
@@ -11,7 +11,7 @@ Group:              System Environment/Daemons
 URL:                http://www.bacula.org
 BuildRoot:          %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Source0:            http://www.bacula.org/downloads/Bacula-%{version}/%{name}-%{version}.tar.gz
+Source0:            http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
 
 Source2:            quickstart_postgresql.txt
 Source3:            quickstart_mysql.txt
@@ -32,7 +32,7 @@ Source17:           %{name}-sd.sysconfig
 Source18:           %{name}-sd.sysconfig.el5
 
 Patch1:             %{name}-5.0.2-openssl.patch
-Patch2:             %{name}-5.2.2-queryfile.patch
+Patch2:             %{name}-7.0.0-queryfile.patch
 Patch3:             %{name}-5.0.3-sqlite-priv.patch
 Patch4:             %{name}-5.2.13-bat-build.patch
 Patch5:             %{name}-5.2.12-seg-fault.patch
@@ -258,18 +258,18 @@ based on a client/server architecture.
 
 This package contains the bat version of the bacula management console.
 
-%package traymonitor
+#%package traymonitor
-Summary:            Bacula system tray monitor
+#Summary:            Bacula system tray monitor
-Group:              System Environment/Daemons
+#Group:              System Environment/Daemons
-Requires:           bacula-libs%{?_isa} = %{version}-%{release}
+#Requires:           bacula-libs%{?_isa} = %{version}-%{release}
 
-%description traymonitor
+#%description traymonitor
-Bacula is a set of programs that allow you to manage the backup, recovery, and
+#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
+#verification of computer data across a network of different computers. It is
-based on a client/server architecture.
+#based on a client/server architecture.
 
-This package contains the Gnome and KDE compatible tray monitor to monitor your
+#This package contains the Gnome and KDE compatible tray monitor to monitor your
-bacula server.
+#bacula server.
 %endif
 
 %package devel
@@ -285,14 +285,13 @@ based on a client/server architecture.
 
 This development package contains static libraries and header files.
 
+#%package -n nagios-plugins-bacula
+#Summary:            Nagios Plugin - check_bacula
+#Group:              Applications/System
+#Requires:           bacula-libs%{?_isa} = %{version}-%{release}
 
-%package -n nagios-plugins-bacula
+#%description -n nagios-plugins-bacula
-Summary:            Nagios Plugin - check_bacula
+#Provides check_bacula support for Nagios.
-Group:              Applications/System
-Requires:           bacula-libs%{?_isa} = %{version}-%{release}
-
-%description -n nagios-plugins-bacula
-Provides check_bacula support for Nagios.
 
 %prep
 %setup -q
@@ -334,6 +333,7 @@ export CPPFLAGS="$RPM_OPT_FLAGS -I%{_includedir}/ncurses"
         --with-pid-dir=%{_localstatedir}/run \
         --disable-conio \
         --enable-batch-insert \
+        --enable-includes \
         --enable-readline \
         --enable-largefile \
         --enable-build-dird \
@@ -364,23 +364,23 @@ sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
 
 make %{?_smp_mflags}
 
-pushd examples/nagios/check_bacula
+#pushd examples/nagios/check_bacula
-        CFLAGS="%{optflags}" make LIBS="-lpthread -ldl -lssl -lcrypto -lz"
+#       CFLAGS="%{optflags}" make #LIBS="-lpthread -ldl -lssl -lcrypto -lz"
-popd
+#popd
 
-%if 0%{?fedora} || 0%{?rhel} >= 6
+#%if 0%{?fedora} || 0%{?rhel} >= 6
-pushd src/qt-console/tray-monitor
+#pushd src/qt-console/tray-monitor
-        /usr/bin/qmake-qt4
+#        #/usr/bin/qmake-qt4 tray-monitor.pro
-        make %{?_smp_mflags}
+#        make %{?_smp_mflags}
-popd
+#popd
-%endif
+#%endif
 
 %install
 rm -rf %{buildroot}
 make install DESTDIR=%{buildroot}
 
 # Nagios plugin
-install -p -m 755 -D examples/nagios/check_bacula/.libs/check_bacula %{buildroot}%{_libdir}/nagios/plugins/check_bacula
+#install -p -m 755 -D examples/nagios/check_bacula/.libs/check_bacula %{buildroot}%{_libdir}/nagios/plugins/check_bacula
 
 # Bacula plugin info utility
 install -p -m 755 -D src/tools/.libs/bpluginfo %{buildroot}%{_sbindir}/bpluginfo
@@ -399,10 +399,10 @@ install -p -m 644 -D src/qt-console/images/bat_icon.png %{buildroot}%{_datadir}/
 desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{SOURCE13}
 
 # QT Tray monitor
-install -p -m 755 -D src/qt-console/tray-monitor/.libs/bacula-tray-monitor %{buildroot}%{_sbindir}/bacula-tray-monitor
+#install -p -m 755 -D src/qt-console/tray-monitor/.libs/bacula-tray-monitor %{buildroot}%{_sbindir}/bacula-tray-monitor
-install -p -m 644 -D src/qt-console/tray-monitor/tray-monitor.conf %{buildroot}%{_sysconfdir}/bacula/tray-monitor.conf
+#install -p -m 644 -D src/qt-console/tray-monitor/tray-monitor.conf %{buildroot}%{_sysconfdir}/bacula/tray-monitor.conf
-install -p -m 644 -D src/qt-console/images/bat_icon.png %{buildroot}%{_datadir}/pixmaps/bacula-tray-monitor.png
+#install -p -m 644 -D src/qt-console/images/bat_icon.png %{buildroot}%{_datadir}/pixmaps/bacula-tray-monitor.png
-desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{SOURCE14}
+#desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{SOURCE14}
 
 %else
 rm -f %{buildroot}%{_mandir}/man1/bat.1*
@@ -449,6 +449,7 @@ rm -f %{buildroot}%{_sbindir}/bacula
 rm -f %{buildroot}%{_mandir}/man8/bacula.8.gz
 rm -f %{buildroot}%{_mandir}/man1/bacula-bwxconsole.1*
 rm -f %{buildroot}%{_mandir}/man1/bacula-tray-monitor.1*
+rm -f %{buildroot}%{_libdir}/*.la
 %if 0%{?fedora} || 0%{?rhel} >= 6
 rm -f %{buildroot}%{_datadir}/bacula/{ChangeLog,INSTALL,LICENSE,README,ReleaseNotes,VERIFYING,technotes}
 %else
@@ -461,13 +462,6 @@ chmod 755 %{buildroot}%{_libdir}/bacula/*
 chmod 755 %{buildroot}%{_libexecdir}/bacula/*
 chmod 644 %{buildroot}%{_libexecdir}/bacula/btraceback.*
 
-# Install headers
-mkdir -p %{buildroot}%{_includedir}/bacula
-for dir in src src/cats src/console src/dird src/filed src/findlib src/lib src/plugins/fd src/stored; do
-        mkdir -p %{buildroot}%{_includedir}/bacula/$dir
-        install -p -m 644 $dir/*.h %{buildroot}%{_includedir}/bacula/$dir
-done
-
 %clean
 rm -rf %{buildroot}
 
@@ -733,37 +727,33 @@ fi
 %{_datadir}/bacula/*.png
 %{_datadir}/pixmaps/bat.png
 
-%files traymonitor
+#%files traymonitor
-%defattr(-,root,root,-)
+#%defattr(-,root,root,-)
-%{_sbindir}/bacula-tray-monitor
+#%{_sbindir}/bacula-tray-monitor
-%attr(640,root,root) %config(noreplace) %{_sysconfdir}/bacula/tray-monitor.conf
+#%attr(640,root,root) %config(noreplace) %{_sysconfdir}/bacula/tray-monitor.conf
-%{_datadir}/applications/bacula-traymonitor.desktop
+#%{_datadir}/applications/bacula-traymonitor.desktop
-%{_datadir}/pixmaps/bacula-tray-monitor.png
+#%{_datadir}/pixmaps/bacula-tray-monitor.png
 %endif
 
 %files devel
 %defattr(-,root,root,-)
 %{_includedir}/bacula
-%{_libdir}/libbac.la
 %{_libdir}/libbac.so
-%{_libdir}/libbaccats.la
-%{_libdir}/libbaccats-mysql.la
-%{_libdir}/libbaccats-postgresql.la
-%{_libdir}/libbaccats-sqlite3.la
-%{_libdir}/libbaccfg.la
 %{_libdir}/libbaccfg.so
-%{_libdir}/libbacfind.la
 %{_libdir}/libbacfind.so
-%{_libdir}/libbacpy.la
 %{_libdir}/libbacpy.so
-%{_libdir}/libbacsql.la
 %{_libdir}/libbacsql.so
 
-%files -n nagios-plugins-bacula
+#%files -n nagios-plugins-bacula
-%defattr(-,root,root)
+#%defattr(-,root,root)
-%{_libdir}/nagios/plugins/check_bacula
+#%{_libdir}/nagios/plugins/check_bacula
 
 %changelog
+* Sun Mar 30 2014 Simone Caronni <negativo17@gmail.com> - 7.0.0-1
+- Update to 7.0.0.
+- Momentarily disable Nagios plugin and QT tray monitor as they don't build
+  anymore.
+
 * Tue Aug 06 2013 Simone Caronni <negativo17@gmail.com> - 5.2.13-17
 - Fix dependencies for devel subpackage.
 - Explicitly declare dependency also on libs-sql subpackage where required, so

sources

@@ -1 +1 @@
-43417bae0c221afb1f30a581c9e0f2fe  bacula-5.2.13.tar.gz
+5e0696ab33ed90f40311dd4a5e058a70  bacula-7.0.0.tar.gz