diff --git a/bacula-5.0.1-dsolink.patch b/bacula-5.0.1-dsolink.patch
deleted file mode 100644
index 51ec8b4..0000000
--- a/bacula-5.0.1-dsolink.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- bacula-5.0.1/bacula-5.0.1/src/qt-console/bat.pro.in~	2010-02-24 09:33:48.000000000 -0600
-+++ bacula-5.0.1/bacula-5.0.1/src/qt-console/bat.pro.in	2010-03-11 17:12:44.645296544 -0600
-@@ -20,7 +20,7 @@
- TARGET       = bat
- DEPENDPATH  += .
- INCLUDEPATH += .. . ./console ./restore ./select
--LIBS        += -L../lib -lbaccfg -lbac @OPENSSL_LIBS@
-+LIBS        += -L../lib -lbaccfg -lbac -ldl @OPENSSL_LIBS@
- LIBTOOL_LINK = @QMAKE_LIBTOOL@ --silent --tag=CXX --mode=link
- LIBTOOL_INSTALL = @QMAKE_LIBTOOL@ --silent --mode=install
- QMAKE_LINK   = $${LIBTOOL_LINK} $(CXX)
diff --git a/bacula-5.0.2-config.patch b/bacula-5.0.2-config.patch
deleted file mode 100644
index 6859de4..0000000
--- a/bacula-5.0.2-config.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up bacula-5.0.2/bacula-5.0.2/src/dird/bacula-dir.conf.in.config bacula-5.0.2/bacula-5.0.2/src/dird/bacula-dir.conf.in
---- bacula-5.0.2/bacula-5.0.2/src/dird/bacula-dir.conf.in.config	2010-06-03 11:05:07.000000000 +0200
-+++ bacula-5.0.2/bacula-5.0.2/src/dird/bacula-dir.conf.in	2010-06-03 11:28:26.556782993 +0200
-@@ -15,7 +15,7 @@
- Director {                            # define myself
-   Name = bacula-dir
-   DIRport = @dir_port@                # where we listen for UA connections
--  QueryFile = "@scriptdir@/query.sql"
-+  QueryFile = "/etc/bacula/query.sql"
-   WorkingDirectory = "@working_dir@"
-   PidDirectory = "@piddir@"
-   Maximum Concurrent Jobs = 1
diff --git a/bacula-5.0.3-config.patch b/bacula-5.0.3-config.patch
new file mode 100644
index 0000000..7f4e5f3
--- /dev/null
+++ b/bacula-5.0.3-config.patch
@@ -0,0 +1,124 @@
+diff -Naur bacula-5.0.3.old/src/dird/bacula-dir.conf.in bacula-5.0.3/src/dird/bacula-dir.conf.in
+--- bacula-5.0.3.old/src/dird/bacula-dir.conf.in	2011-12-23 13:49:02.779450043 +0100
++++ bacula-5.0.3/src/dird/bacula-dir.conf.in	2011-12-23 13:50:51.664532669 +0100
+@@ -154,7 +154,7 @@
+ # Client (File Services) to backup
+ Client {
+   Name = @basename@-fd
+-  Address = @hostname@
++  Address = client.example.com
+   FDPort = @fd_port@
+   Catalog = MyCatalog
+   Password = "@fd_password@"          # password for FileDaemon
+@@ -169,7 +169,7 @@
+ #
+ #Client {
+ #  Name = @basename@2-fd                
+-#  Address = @hostname@2
++#  Address = client.example.com2
+ #  FDPort = @fd_port@
+ #  Catalog = MyCatalog
+ #  Password = "@fd_password@2"         # password for FileDaemon 2
+@@ -183,7 +183,7 @@
+ Storage {
+   Name = File
+ # Do not use "localhost" here    
+-  Address = @hostname@                # N.B. Use a fully qualified name here
++  Address = storage.example.com                # N.B. Use a fully qualified name here
+   SDPort = @sd_port@
+   Password = "@sd_password@"
+   Device = FileStorage
+@@ -196,7 +196,7 @@
+ #Storage {
+ #  Name = DDS-4    
+ #  Do not use "localhost" here
+-#  Address = @hostname@                # N.B. Use a fully qualified name here
++#  Address = storage.example.com                # N.B. Use a fully qualified name here
+ #  SDPort = @sd_port@
+ #  Password = "@sd_password@"          # password for Storage daemon
+ #  Device = DDS-4                      # must be same as Device in Storage daemon
+@@ -208,7 +208,7 @@
+ #Storage {
+ #  Name = "8mmDrive"
+ #  Do not use "localhost" here
+-#  Address = @hostname@                # N.B. Use a fully qualified name here
++#  Address = storage.example.com                # N.B. Use a fully qualified name here
+ #  SDPort = @sd_port@
+ #  Password = "@sd_password@"
+ #  Device = "Exabyte 8mm"
+@@ -219,7 +219,7 @@
+ #Storage {
+ #  Name = "DVD"
+ #  Do not use "localhost" here
+-#  Address = @hostname@                # N.B. Use a fully qualified name here
++#  Address = storage.example.com                # N.B. Use a fully qualified name here
+ #  SDPort = @sd_port@
+ #  Password = "@sd_password@"
+ #  Device = "DVD Writer"
+diff -Naur bacula-5.0.3.old/src/stored/stored.conf.in bacula-5.0.3/src/stored/stored.conf.in
+--- bacula-5.0.3.old/src/stored/stored.conf.in	2011-12-23 13:49:02.808450598 +0100
++++ bacula-5.0.3/src/stored/stored.conf.in	2011-12-23 13:53:17.059311129 +0100
+@@ -8,7 +8,7 @@
+ #
+ Storage {
+   Name = "Storage daemon"
+-  Address = @hostname@
++  Address = storage.example.com
+   SDPort = @sd_port@                  # Directors port      
+   WorkingDirectory = "@working_dir@"
+   Pid Directory = "@piddir@"
+@@ -19,7 +19,7 @@
+ # List Directors who are permitted to contact Storage daemon
+ #
+ Director {
+-  Name = @hostname@-dir
++  Name = @basename@-dir
+   Password = local_storage_password
+ }
+ 
+@@ -51,6 +51,6 @@
+ 
+ Messages {
+   Name = Standard
+-  director = @hostname@-dir = all
++  director = @basename@-dir = all
+   operator = @dump_email@ = mount
+ }
+diff -Naur bacula-5.0.3.old/src/tray-monitor/tray-monitor.conf.in bacula-5.0.3/src/tray-monitor/tray-monitor.conf.in
+--- bacula-5.0.3.old/src/tray-monitor/tray-monitor.conf.in	2011-12-23 13:49:02.773449929 +0100
++++ bacula-5.0.3/src/tray-monitor/tray-monitor.conf.in	2011-12-23 13:52:11.090050817 +0100
+@@ -10,14 +10,14 @@
+    
+ Client {
+   Name = @basename@-fd
+-  Address = @hostname@
++  Address = client.example.com
+   FDPort = @fd_port@
+   Password = "@mon_fd_password@"          # password for FileDaemon
+ }
+ 
+ Storage {
+   Name = @basename@-sd
+-  Address = @hostname@
++  Address = storage.example.com
+   SDPort = @sd_port@
+   Password = "@mon_sd_password@"          # password for StorageDaemon
+ }
+@@ -25,5 +25,5 @@
+ Director {
+   Name = @basename@-dir
+   DIRport = @dir_port@
+-  address = @hostname@
++  Address = director.example.com
+ }
+diff -Naur bacula-5.0.3.old/src/wx-console/bwx-console.conf.in bacula-5.0.3/src/wx-console/bwx-console.conf.in
+--- bacula-5.0.3.old/src/wx-console/bwx-console.conf.in	2011-12-23 13:49:02.798450408 +0100
++++ bacula-5.0.3/src/wx-console/bwx-console.conf.in	2011-12-23 13:51:22.208116570 +0100
+@@ -5,6 +5,6 @@
+ Director {
+   Name = @basename@-dir
+   DIRport = @dir_port@
+-  address = @hostname@
++  address = director.example.com
+   Password = "@dir_password@"
+ }
diff --git a/bacula-5.0.3-dsolink.patch b/bacula-5.0.3-dsolink.patch
deleted file mode 100644
index e6a5f16..0000000
--- a/bacula-5.0.3-dsolink.patch
+++ /dev/null
@@ -1,165 +0,0 @@
---- bacula-5.0.3/bacula-5.0.3/src/qt-console/bat.pro.in~	2010-08-10 11:27:17.000000000 -0500
-+++ bacula-5.0.3/bacula-5.0.3/src/qt-console/bat.pro.in	2010-08-10 12:32:00.312182153 -0500
-@@ -20,7 +20,7 @@
- TARGET       = bat
- DEPENDPATH  += .
- INCLUDEPATH += .. . ./console ./restore ./select
--LIBS        += -L../lib -lbaccfg -lbac -ldl @OPENSSL_LIBS@
-+LIBS        += -L../lib -lbaccfg -lbac -ldl -lz @OPENSSL_LIBS@
- LIBTOOL_LINK = @QMAKE_LIBTOOL@ --silent --tag=CXX --mode=link
- LIBTOOL_INSTALL = @QMAKE_LIBTOOL@ --silent --mode=install
- QMAKE_LINK   = $${LIBTOOL_LINK} $(CXX)
---- bacula-5.0.3/bacula-5.0.3/src/tools/Makefile.in~	2010-08-05 09:29:51.000000000 -0500
-+++ bacula-5.0.3/bacula-5.0.3/src/tools/Makefile.in	2010-08-11 12:54:02.028450916 -0500
-@@ -57,7 +57,7 @@
- 	@echo " "
- 
- bsmtp: Makefile bsmtp.o ../lib/libbac$(DEFAULT_ARCHIVE_TYPE)	    
--	$(LIBTOOL_LINK) $(CXX) $(LDFLAGS) -L../lib -o $@ bsmtp.o -lbac -lm $(DLIB) $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
-+	$(LIBTOOL_LINK) $(CXX) $(LDFLAGS) -L../lib -o $@ bsmtp.o -lbac -lm -lz $(DLIB) $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
- 
- bregtest: Makefile bregtest.o ../lib/libbac$(DEFAULT_ARCHIVE_TYPE)	   
- 	$(LIBTOOL_LINK) $(CXX) $(LDFLAGS) -L../lib -o $@ bregtest.o -lbac -lm $(DLIB) $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
---- bacula-5.0.3/bacula-5.0.3/src/tools/Makefile.in~	2010-08-11 12:57:29.000000000 -0500
-+++ bacula-5.0.3/bacula-5.0.3/src/tools/Makefile.in	2010-08-11 14:10:52.998447849 -0500
-@@ -64,7 +64,7 @@
- 
- dbcheck: Makefile dbcheck.o ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) ../cats/libbacsql$(DEFAULT_ARCHIVE_TYPE) $(DIRCONFOBJS)
- 	$(LIBTOOL_LINK) $(CXX) $(LDFLAGS) -L../lib -L../cats -o $@ dbcheck.o $(DIRCONFOBJS) \
--	  -lbacsql -lbaccfg -lbac -lm $(DB_LIBS) $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
-+	  -lbacsql -lbaccfg -lbac -lm -lz $(DB_LIBS) $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
- 
- fstype: Makefile fstype.o ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE)
- 	$(LIBTOOL_LINK) $(CXX) $(LDFLAGS) -L../lib -L../findlib -o $@ fstype.o -lbacfind -lbac -lm \
---- bacula-5.0.3/bacula-5.0.3/src/tools/Makefile.in~	2010-08-11 14:13:51.000000000 -0500
-+++ bacula-5.0.3/bacula-5.0.3/src/tools/Makefile.in	2010-08-11 15:11:00.309447155 -0500
-@@ -97,7 +97,7 @@
- 
- bwild:	Makefile ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) bwild.o
- 	$(LIBTOOL_LINK) $(CXX) -g $(LDFLAGS) -L. -L../lib -o $@ bwild.o \
--	  $(DLIB) -lbac -lm $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
-+	  $(DLIB) -lbac -lm -lz $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
- 
- bbatch: Makefile ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) ../cats/libbacsql$(DEFAULT_ARCHIVE_TYPE) bbatch.o
- 	$(LIBTOOL_LINK) $(CXX) -g $(LDFLAGS) -L../cats -L. -L../lib -o $@ bbatch.o \
---- bacula-5.0.3/bacula-5.0.3/src/tools/Makefile.in~	2010-08-12 06:57:25.000000000 -0500
-+++ bacula-5.0.3/bacula-5.0.3/src/tools/Makefile.in	2010-08-12 07:58:13.545781384 -0500
-@@ -93,7 +93,7 @@
- 
- bregex: Makefile ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) bregex.o
- 	$(LIBTOOL_LINK) $(CXX) -g $(LDFLAGS) -L. -L../lib -o $@ bregex.o \
--	  $(DLIB) -lbac -lm $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
-+	  $(DLIB) -lbac -lm -lz $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
- 
- bwild:	Makefile ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) bwild.o
- 	$(LIBTOOL_LINK) $(CXX) -g $(LDFLAGS) -L. -L../lib -o $@ bwild.o \
---- bacula-5.0.3/bacula-5.0.3/src/stored/Makefile.in~	2010-08-05 09:29:51.000000000 -0500
-+++ bacula-5.0.3/bacula-5.0.3/src/stored/Makefile.in	2010-08-12 08:56:11.053777811 -0500
-@@ -91,7 +91,7 @@
- bacula-sd: Makefile $(SDOBJS) ../lib/libbacpy$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE)
- 	@echo "Linking $@ ..."
- 	$(LIBTOOL_LINK) $(CXX) $(WLDFLAGS) $(LDFLAGS) -L../lib -o $@ $(SDOBJS) $(FDLIBS) \
--	   -lbacpy -lbaccfg -lbac -lm $(PYTHON_LIBS) $(DLIB) $(LIBS) $(WRAPLIBS) \
-+	   -lbacpy -lbaccfg -lbac -lm -lz $(PYTHON_LIBS) $(DLIB) $(LIBS) $(WRAPLIBS) \
- 	$(GETTEXT_LIBS) $(OPENSSL_LIBS) $(CAP_LIBS)
- 
- static-bacula-sd: Makefile $(SDOBJS) ../lib/libbacpy$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE)
---- bacula-5.0.3/bacula-5.0.3/src/stored/Makefile.in~	2010-08-12 08:59:17.000000000 -0500
-+++ bacula-5.0.3/bacula-5.0.3/src/stored/Makefile.in	2010-08-12 10:24:42.478529732 -0500
-@@ -117,7 +117,7 @@
- bls:	Makefile $(BLSOBJS) ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE)
- 	@echo "Compiling $<"
- 	$(LIBTOOL_LINK) $(CXX) $(TTOOL_LDFLAGS) $(LDFLAGS) -L../lib -L../findlib -o $@ $(BLSOBJS) $(DLIB) \
--	   -lbacfind -lbaccfg -lbac -lm $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
-+	   -lbacfind -lbaccfg -lbac -lm -lz $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
- 
- bextract.o: bextract.c
- 	@echo "Compiling $<"
---- bacula-5.0.3/bacula-5.0.3/src/stored/Makefile.in~	2010-08-12 10:27:36.000000000 -0500
-+++ bacula-5.0.3/bacula-5.0.3/src/stored/Makefile.in	2010-08-12 11:45:39.904529074 -0500
-@@ -127,7 +127,7 @@
- bextract: Makefile $(BEXTOBJS) ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE)
- 	@echo "Compiling $<"
- 	$(LIBTOOL_LINK) $(CXX) $(TTOOL_LDFLAGS) $(LDFLAGS) -L../lib -L../findlib -o $@ $(BEXTOBJS) $(DLIB) $(FDLIBS) \
--	   -lbacfind -lbaccfg -lbac -lm $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
-+	   -lbacfind -lbaccfg -lbac -lm -lz $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
- 
- bscan.o: bscan.c
- 	@echo "Compiling $<"
---- bacula-5.0.3/bacula-5.0.3/src/stored/Makefile.in~	2010-08-12 11:48:22.000000000 -0500
-+++ bacula-5.0.3/bacula-5.0.3/src/stored/Makefile.in	2010-08-12 13:21:02.246528324 -0500
-@@ -136,7 +136,7 @@
- 
- bscan:	Makefile $(SCNOBJS) ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) ../cats/libbacsql$(DEFAULT_ARCHIVE_TYPE)
- 	$(LIBTOOL_LINK) $(CXX) $(TTOOL_LDFLAGS) $(LDFLAGS) -L../lib -L../cats -L../findlib -o $@ $(SCNOBJS) \
--	   -lbacsql $(DB_LIBS) $(FDLIBS) -lbacfind -lbaccfg -lbac -lm $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
-+	   -lbacsql $(DB_LIBS) $(FDLIBS) -lbacfind -lbaccfg -lbac -lm -lz $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
- 
- bcopy.o: bcopy.c
- 	@echo "Compiling $<"
---- bacula-5.0.3/bacula-5.0.3/src/stored/Makefile.in~	2010-08-12 13:23:58.000000000 -0500
-+++ bacula-5.0.3/bacula-5.0.3/src/stored/Makefile.in	2010-08-12 14:31:11.204777284 -0500
-@@ -107,7 +107,7 @@
- 
- btape: Makefile  $(TAPEOBJS) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) ../cats/libbacsql$(DEFAULT_ARCHIVE_TYPE)
- 	$(LIBTOOL_LINK) $(CXX) $(TTOOL_LDFLAGS) $(LDFLAGS) -L../lib -L../cats  -o $@ $(TAPEOBJS) \
--	   -lbacsql -lbaccfg -lbac $(DLIB) -lm $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
-+	   -lbacsql -lbaccfg -lbac $(DLIB) -lm -lz $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
- 
- bls.o:	bls.c
- 	@echo "Compiling $<"
---- bacula-5.0.3/bacula-5.0.3/src/stored/Makefile.in~	2010-08-13 07:02:47.000000000 -0500
-+++ bacula-5.0.3/bacula-5.0.3/src/stored/Makefile.in	2010-08-13 08:25:50.830920608 -0500
-@@ -145,7 +145,7 @@
- 
- bcopy:	Makefile $(COPYOBJS) ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE)
- 	$(LIBTOOL_LINK) $(CXX) $(TTOOL_LDFLAGS) $(LDFLAGS) -L../lib -o $@ $(COPYOBJS) \
--	   -lbaccfg -lbac -lm $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
-+	   -lbaccfg -lbac -lm -lz $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
- 
- Makefile: $(srcdir)/Makefile.in $(topdir)/config.status
- 	cd $(topdir) \
---- bacula-5.0.3/bacula-5.0.3/src/dird/Makefile.in~	2010-08-05 09:29:51.000000000 -0500
-+++ bacula-5.0.3/bacula-5.0.3/src/dird/Makefile.in	2010-08-13 09:25:38.855168511 -0500
-@@ -64,7 +64,7 @@
- bacula-dir: Makefile $(SVROBJS) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) ../lib/libbacpy$(DEFAULT_ARCHIVE_TYPE) ../cats/libbacsql$(DEFAULT_ARCHIVE_TYPE) ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE)
- 	@echo "Linking $@ ..."
- 	$(LIBTOOL_LINK) $(CXX) $(WLDFLAGS) $(LDFLAGS) -L../lib -L../cats -L../findlib -o $@ $(SVROBJS) \
--	      -lbacfind -lbacsql -lbacpy -lbaccfg -lbac -lm $(PYTHON_LIBS) $(DLIB) $(DB_LIBS) $(LIBS) \
-+	      -lbacfind -lbacsql -lbacpy -lbaccfg -lbac -lm -lz $(PYTHON_LIBS) $(DLIB) $(DB_LIBS) $(LIBS) \
- 	      $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(CAP_LIBS)
- 
- static-bacula-dir:  Makefile $(SVROBJS) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) ../lib/libbacpy$(DEFAULT_ARCHIVE_TYPE) ../cats/libbacsql$(DEFAULT_ARCHIVE_TYPE) ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE)
---- bacula-5.0.3/bacula-5.0.3/src/console/Makefile.in~	2010-08-05 09:29:51.000000000 -0500
-+++ bacula-5.0.3/bacula-5.0.3/src/console/Makefile.in	2010-08-13 10:26:18.001169569 -0500
-@@ -48,7 +48,7 @@
- 
- bconsole: Makefile $(CONSOBJS) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE)
- 	$(LIBTOOL_LINK) $(CXX) $(LDFLAGS) $(CONS_LDFLAGS) -L../lib -L../cats -o $@ $(CONSOBJS) \
--	      $(DLIB) $(CONS_LIBS) -lbaccfg -lbac -lm $(LIBS) $(GETTEXT_LIBS) \
-+	      $(DLIB) $(CONS_LIBS) -lbaccfg -lbac -lm -lz $(LIBS) $(GETTEXT_LIBS) \
- 	      $(OPENSSL_LIBS)
- 
- static-bconsole: Makefile $(CONSOBJS) ../lib/libbac.a ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE)
---- bacula-5.0.3/bacula-5.0.3/src/wx-console/Makefile.in~	2010-08-05 09:29:51.000000000 -0500
-+++ bacula-5.0.3/bacula-5.0.3/src/wx-console/Makefile.in	2010-08-13 11:28:43.829917394 -0500
-@@ -83,7 +83,7 @@
- 
- bwx-console: Makefile $(CONSOBJS) @WIN32@ ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE)
- 	$(LIBTOOL_LINK) $(CXX) $(CONSOBJS) $(WIN32RES) -o $@ -L../lib $(CONS_LDFLAGS) \
--	  -lbaccfg -lbac $(LIBS) $(OPENSSL_LIBS)
-+	  -lbaccfg -lbac -lz $(LIBS) $(OPENSSL_LIBS)
- 
- win32: bwx-console_private.res
- 	
---- bacula-5.0.3/bacula-5.0.3/src/tray-monitor/Makefile.in~	2010-08-05 09:29:51.000000000 -0500
-+++ bacula-5.0.3/bacula-5.0.3/src/tray-monitor/Makefile.in	2010-08-13 12:34:18.573918720 -0500
-@@ -45,7 +45,7 @@
- 
- bacula-tray-monitor: Makefile $(MONITOROBJS) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE)
- 	$(LIBTOOL_LINK) $(CXX) $(LDFLAGS) $(MONITOR_LDFLAGS) -L../lib -o $@ \
--	  $(MONITOROBJS) $(DLIB) -lbaccfg -lbac -lm $(LIBS) $(OPENSSL_LIBS)
-+	  $(MONITOROBJS) $(DLIB) -lbaccfg -lbac -lm -lz $(LIBS) $(OPENSSL_LIBS)
- 
- Makefile: $(srcdir)/Makefile.in $(topdir)/config.status
- 	cd $(topdir) \
diff --git a/bacula-5.0.3-nagios-ent-fd.patch b/bacula-5.0.3-nagios-ent-fd.patch
new file mode 100644
index 0000000..b3ad2af
--- /dev/null
+++ b/bacula-5.0.3-nagios-ent-fd.patch
@@ -0,0 +1,36 @@
+diff -Naur bacula-5.0.3.old/examples/nagios/check_bacula/authenticate.c bacula-5.0.3/examples/nagios/check_bacula/authenticate.c
+--- bacula-5.0.3.old/examples/nagios/check_bacula/authenticate.c	2011-12-23 14:16:46.510066504 +0100
++++ bacula-5.0.3/examples/nagios/check_bacula/authenticate.c	2011-12-23 14:17:16.562632437 +0100
+@@ -57,9 +57,7 @@
+ /* Response from SD */
+ static char SDOKhello[]   = "3000 OK Hello\n";
+ /* Response from FD */
+-static char FDOKhello[] = "2000 OK Hello\n";
+-static char FD3OKhello[] = "2000 OK Hello 1\n";
+-static char FD31OKhello[] = "2000 OK Hello 2\n";
++static char FDOKhello[] = "2000 OK Hello";
+ 
+ /* Forward referenced functions */
+ 
+@@ -171,9 +169,7 @@
+    }
+    Dmsg1(110, "<stored: %s", fd->msg);
+    stop_bsock_timer(tid);
+-   if ((strncmp(fd->msg, FDOKhello, sizeof(FDOKhello)) != 0) &&
+-       (strncmp(fd->msg, FD3OKhello, sizeof(FD3OKhello)) != 0) &&
+-       (strncmp(fd->msg, FD31OKhello, sizeof(FD31OKhello)) != 0) ) {
++   if ((strncmp(fd->msg, FDOKhello, strlen(FDOKhello)) != 0)) {
+       return 0;
+    }
+    return 1;
+diff -Naur bacula-5.0.3.old/examples/nagios/check_bacula/check_bacula.c bacula-5.0.3/examples/nagios/check_bacula/check_bacula.c
+--- bacula-5.0.3.old/examples/nagios/check_bacula/check_bacula.c	2011-12-23 14:16:46.510066504 +0100
++++ bacula-5.0.3/examples/nagios/check_bacula/check_bacula.c	2011-12-23 14:17:23.122755977 +0100
+@@ -268,7 +268,7 @@
+ 
+    int stat;
+    char num;
+-   char *dname;
++   const char *dname;
+    
+    dname = "";
diff --git a/bacula-5.0.3-pamd.patch b/bacula-5.0.3-pamd.patch
new file mode 100644
index 0000000..469335a
--- /dev/null
+++ b/bacula-5.0.3-pamd.patch
@@ -0,0 +1,23 @@
+--- bacula-2.0.3/scripts/wxconsole.pamd.orig    2007-07-11 18:43:10.000000000 +0200
++++ bacula-2.0.3/scripts/wxconsole.pamd 2007-07-11 18:43:23.000000000 +0200
+@@ -1,7 +1,7 @@
+ #%PAM-1.0
+ auth       sufficient   pam_rootok.so
+ auth       sufficient   pam_timestamp.so
+-auth       required     pam_stack.so service=system-auth
++auth       include      system-auth
+ session    optional     pam_xauth.so
+ session    optional     pam_timestamp.so
+ account    required     pam_permit.so
+--- 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
+ auth       sufficient   pam_timestamp.so
+-auth       required     pam_stack.so service=system-auth
++auth       include      system-auth
+ session    optional     pam_xauth.so
+ session    optional     pam_timestamp.so
+ account    required     pam_permit.so
+
diff --git a/bacula-5.0.3-queryfile.patch b/bacula-5.0.3-queryfile.patch
new file mode 100644
index 0000000..76e12ab
--- /dev/null
+++ b/bacula-5.0.3-queryfile.patch
@@ -0,0 +1,12 @@
+diff -Naur bacula-5.0.3.old/src/dird/bacula-dir.conf.in bacula-5.0.3/src/dird/bacula-dir.conf.in
+--- bacula-5.0.3.old/src/dird/bacula-dir.conf.in	2011-12-23 14:03:08.217581074 +0100
++++ bacula-5.0.3/src/dird/bacula-dir.conf.in	2011-12-23 14:03:23.434870640 +0100
+@@ -15,7 +15,7 @@
+ Director {                            # define myself
+   Name = @basename@-dir
+   DIRport = @dir_port@                # where we listen for UA connections
+-  QueryFile = "@scriptdir@/query.sql"
++  QueryFile = "@sysconfdir@/query.sql"
+   WorkingDirectory = "@working_dir@"
+   PidDirectory = "@piddir@"
+   Maximum Concurrent Jobs = 1
diff --git a/bacula-checkconf b/bacula-checkconf
new file mode 100644
index 0000000..d9a8bb7
--- /dev/null
+++ b/bacula-checkconf
@@ -0,0 +1,17 @@
+#!/bin/sh
+
+# Check if we still have our @@PLACEHOLDERS@@ in the config.
+# If yes, refuse to start, the user has never touched the config.
+
+if [ $# -ne 1 ]; then
+    echo "Usage: $0 [configfile]"
+    exit 1
+fi
+grep -q '^[^#].*_PASSWORD@@' $1
+if [ $? -eq 0 ]; then
+    echo "Error: Default password in config"
+    exit 6
+fi
+
+exit 0
+
diff --git a/bacula-config.patch b/bacula-config.patch
deleted file mode 100644
index b6ab503..0000000
--- a/bacula-config.patch
+++ /dev/null
@@ -1,115 +0,0 @@
---- 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 @@
--  Name = @basename@-dir
-+  Name = bacula-dir
-@@ -30 +30 @@
--  Client = @basename@-fd 
-+  Client = bacula-fd 
-@@ -51 +51 @@
--#  Client = @basename@2-fd
-+#  Client = bacula2-fd
-@@ -82 +82 @@
--  Client=@basename@-fd                 
-+  Client=bacula-fd                 
-@@ -157,2 +157,2 @@
--  Name = @basename@-fd
--  Address = @hostname@
-+  Name = bacula-fd
-+  Address = client.example.com
-@@ -172,2 +172,2 @@
--#  Name = @basename@2-fd                
--#  Address = @hostname@2
-+#  Name = bacula2-fd                
-+#  Address = client2.example.com
-@@ -187 +187 @@
--  Address = @hostname@                # N.B. Use a fully qualified name here
-+  Address = storage.example.com                # N.B. Use a fully qualified name here
-@@ -200 +200 @@
--#  Address = @hostname@                # N.B. Use a fully qualified name here
-+#  Address = storage.example.com                # N.B. Use a fully qualified name here
-@@ -212 +212 @@
--#  Address = @hostname@                # N.B. Use a fully qualified name here
-+#  Address = storage.example.com                # N.B. Use a fully qualified name here
-@@ -223 +223 @@
--#  Address = @hostname@                # N.B. Use a fully qualified name here
-+#  Address = storage.example.com                # N.B. Use a fully qualified name here
-@@ -299 +299 @@
--  Name = @basename@-mon
-+  Name = bacula-mon
---- bacula-2.4.3/src/filed/bacula-fd.conf.in.orig	2008-12-10 10:19:12.000000000 -0600
-+++ bacula-2.4.3/src/filed/bacula-fd.conf.in	2008-12-10 10:19:12.000000000 -0600
-@@ -14 +14 @@
--  Name = @basename@-dir
-+  Name = bacula-dir
-@@ -23 +23 @@
--  Name = @basename@-mon
-+  Name = bacula-mon
-@@ -32 +32 @@
--  Name = @basename@-fd
-+  Name = bacula-fd
-@@ -42 +42 @@
--  director = @basename@-dir = all, !skipped, !restored
-+  director = bacula-dir = all, !skipped, !restored
---- bacula-2.4.3/src/stored/bacula-sd.conf.in.orig	2008-12-10 10:21:45.000000000 -0600
-+++ bacula-2.4.3/src/stored/bacula-sd.conf.in	2008-12-10 10:21:45.000000000 -0600
-@@ -14 +14 @@
--  Name = @basename@-sd
-+  Name = bacula-sd
-@@ -25 +25 @@
--  Name = @basename@-dir
-+  Name = bacula-dir
-@@ -34 +34 @@
--  Name = @basename@-mon
-+  Name = bacula-mon
-@@ -228 +228 @@
--  director = @basename@-dir = all
-+  director = bacula-dir = all
---- bacula-2.4.3/src/wx-console/bwx-console.conf.in.orig	2008-12-10 10:22:23.000000000 -0600
-+++ bacula-2.4.3/src/wx-console/bwx-console.conf.in	2008-12-10 10:22:23.000000000 -0600
-@@ -6 +6 @@
--  Name = @basename@-dir
-+  Name = bacula-dir
-@@ -8 +8 @@
--  address = @hostname@
-+  address = server.example.com
---- bacula-2.4.3/src/tray-monitor/tray-monitor.conf.in.orig	2008-12-10 10:28:02.000000000 -0600
-+++ bacula-2.4.3/src/tray-monitor/tray-monitor.conf.in	2008-12-10 10:28:02.000000000 -0600
-@@ -6 +6 @@
--  Name = @basename@-mon
-+  Name = bacula-mon
-@@ -12,2 +12,2 @@
--  Name = @basename@-fd
--  Address = @hostname@
-+  Name = bacula-fd
-+  Address = client.example.com
-@@ -19,2 +19,2 @@
--  Name = @basename@-sd
--  Address = @hostname@
-+  Name = bacula-sd
-+  Address = storage.example.com
-@@ -26 +26 @@
--  Name = @basename@-dir
-+  Name = bacula-dir
-@@ -28 +28 @@
--  address = @hostname@
-+  Address = director.example.com
---- bacula-2.4.3/src/qt-console/bat.conf.in.orig	2008-12-10 10:27:02.000000000 -0600
-+++ bacula-2.4.3/src/qt-console/bat.conf.in	2008-12-10 10:27:02.000000000 -0600
-@@ -6 +6 @@
--  Name = @basename@-dir
-+  Name = bacula-dir
-@@ -8 +8 @@
--  address = @hostname@
-+  address = server.example.com
---- bacula-2.4.3/src/stored/stored.conf.in.orig	2008-12-10 10:27:44.000000000 -0600
-+++ bacula-2.4.3/src/stored/stored.conf.in	2008-12-10 10:27:44.000000000 -0600
-@@ -11 +11 @@
--  Address = @hostname@
-+  Address = storage.example.com
-@@ -22 +22 @@
--  Name = @hostname@-dir
-+  Name = bacula-dir
-@@ -54 +54 @@
--  director = @hostname@-dir = all
-+  director = bacula-dir = all
diff --git a/bacula-dir.init b/bacula-dir.init
index 75ea041..02376ac 100644
--- a/bacula-dir.init
+++ b/bacula-dir.init
@@ -33,19 +33,6 @@ if [ "$DIR_GROUP" != '' ]; then
 	OPTS="$OPTS -g $DIR_GROUP"
 fi
 
-checkconf() {
-	# Check if we still have our @@PLACEHOLDERS@@ in the config.
-	# If yes, refuse to start, the user has never touched the config.
-	grep -q '^[^#].*_PASSWORD@@' $CONFIG
-	if [ $? -eq 0 ]; then
-		echo -n "Error: Default password in config"
-		echo_failure
-		echo
-		exit 6
-	fi
-}
-
-
 checkdatabase() {
 	# First, get the currently selected database backend from the
 	# alternatives system.
@@ -87,7 +74,7 @@ start() {
 	[ "$EUID" != "0" ] && exit 4
 
 	echo -n "Starting $prog: "
-	checkconf
+	bacula-checkconf $CONFIG
 #	Removed for now, as the db might not be on localhost
 #	checkdatabase
 	daemon $prog $OPTS
diff --git a/bacula-dir.service b/bacula-dir.service
new file mode 100644
index 0000000..432c925
--- /dev/null
+++ b/bacula-dir.service
@@ -0,0 +1,15 @@
+[Unit]
+Description=Bacula-Director, the Backup-server
+Requires=syslog.target network.target
+After=network.target
+
+[Service]
+Environment=CONFIG=/etc/bacula/bacula-dir.conf
+EnvironmentFile=-/etc/sysconfig/bacula-dir
+ExecStartPre=/usr/sbin/bacula-checkconf $CONFIG
+ExecStart=/usr/sbin/bacula-dir -f $OPTS -c $CONFIG -u $DIR_USER -g $DIR_GROUP
+StandardOutput=syslog
+Restart=always
+
+[Install]
+WantedBy=multi-user.target
diff --git a/bacula-fd.init b/bacula-fd.init
index 044eb19..60f257f 100644
--- a/bacula-fd.init
+++ b/bacula-fd.init
@@ -33,24 +33,11 @@ if [ "$FD_GROUP" != '' ]; then
 	OPTS="$OPTS -g $FD_GROUP"
 fi
 
-checkconf() {
-	# Check if we still have our @@PLACEHOLDERS@@ in the config.
-	# If yes, refuse to start, the user has never touched the config.
-	grep -q '_PASSWORD@@' $CONFIG
-	if [ $? -eq 0 ]; then
-		echo -n "Error: Default password in config"
-		echo_failure
-		echo
-		exit 6
-	fi
-}
-
-
 start() {
 	[ "$EUID" != "0" ] && exit 4
 
 	echo -n "Starting $prog: "
-	checkconf
+	bacula-checkconf $CONFIG
 	daemon $prog $OPTS
 	RETVAL=$?
 	echo
diff --git a/bacula-fd.service b/bacula-fd.service
new file mode 100644
index 0000000..608c923
--- /dev/null
+++ b/bacula-fd.service
@@ -0,0 +1,16 @@
+[Unit]
+Description=Bacula-FileDaemon, a Backup-client
+Requires=syslog.target network.target
+After=network.target
+
+[Service]
+Environment=CONFIG=/etc/bacula/bacula-fd.conf
+EnvironmentFile=-/etc/sysconfig/bacula-fd
+ExecStartPre=/usr/sbin/bacula-checkconf $CONFIG
+ExecStart=/usr/sbin/bacula-fd -f $OPTS -c $CONFIG -u $FD_USER -g $FD_GROUP
+IOSchedulingClass=idle
+StandardOutput=syslog
+Restart=always
+
+[Install]
+WantedBy=multi-user.target
diff --git a/bacula-fd.sysconfig b/bacula-fd.sysconfig
index 796ad1a..68dfb1e 100644
--- a/bacula-fd.sysconfig
+++ b/bacula-fd.sysconfig
@@ -2,4 +2,11 @@
 # If no user is set bacula will run as root
 
 FD_USER=root
-FD_GROUP=root
\ No newline at end of file
+FD_GROUP=root
+
+# Set the following options if you want to run bacula-fd with ReadAll
+# capabilities after UID/GID switch.
+# This allows the File Daemon to keep root read but drop write permission. 
+# OPTS="-k"
+# FD_USER="bacula"
+# FD_GROUP="bacula"
diff --git a/bacula-gconsole.desktop b/bacula-gconsole.desktop
deleted file mode 100644
index f21e4a7..0000000
--- a/bacula-gconsole.desktop
+++ /dev/null
@@ -1,12 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Encoding=UTF-8
-Name=Bacula Console
-GenericName=Backup Management Console
-Comment=Control your Bacula Server
-Exec=/usr/sbin/bgnome-console -c /etc/bacula/bgnome-console.conf
-Icon=bacula.png
-Terminal=false
-Type=Application
-Categories=System;Application;Utility
-
diff --git a/bacula-pamd.patch b/bacula-pamd.patch
deleted file mode 100644
index 469335a..0000000
--- a/bacula-pamd.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- bacula-2.0.3/scripts/wxconsole.pamd.orig    2007-07-11 18:43:10.000000000 +0200
-+++ bacula-2.0.3/scripts/wxconsole.pamd 2007-07-11 18:43:23.000000000 +0200
-@@ -1,7 +1,7 @@
- #%PAM-1.0
- auth       sufficient   pam_rootok.so
- auth       sufficient   pam_timestamp.so
--auth       required     pam_stack.so service=system-auth
-+auth       include      system-auth
- session    optional     pam_xauth.so
- session    optional     pam_timestamp.so
- account    required     pam_permit.so
---- 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
- auth       sufficient   pam_timestamp.so
--auth       required     pam_stack.so service=system-auth
-+auth       include      system-auth
- session    optional     pam_xauth.so
- session    optional     pam_timestamp.so
- account    required     pam_permit.so
-
diff --git a/bacula-sd.init b/bacula-sd.init
index 98bb972..6fb5e8d 100644
--- a/bacula-sd.init
+++ b/bacula-sd.init
@@ -32,19 +32,6 @@ if [ "$SD_GROUP" != '' ]; then
 	OPTS="$OPTS -g $SD_GROUP"
 fi
 
-checkconf() {
-	# Check if we still have our @@PLACEHOLDERS@@ in the config.
-	# If yes, refuse to start, the user has never touched the config.
-	grep -q '^[^#].*_PASSWORD@@' $CONFIG
-	if [ $? -eq 0 ]; then
-		echo -n "Error: Default password in config"
-		echo_failure
-		echo
-		exit 6
-	fi
-}
-
-
 checkdatabase() {
 	# First, get the currently selected database backend from the
 	# alternatives system.
@@ -86,7 +73,7 @@ start() {
 	[ "$EUID" != "0" ] && exit 4
 
 	echo -n "Starting $prog: "
-	checkconf
+	bacula-checkconf $CONFIG
 # Disabled, the DB does not necessarily run on the same machine
 #	checkdatabase
 	daemon $prog $OPTS
diff --git a/bacula-sd.service b/bacula-sd.service
new file mode 100644
index 0000000..d32bee3
--- /dev/null
+++ b/bacula-sd.service
@@ -0,0 +1,15 @@
+[Unit]
+Description=Bacula-StorageDaemon, the storage-server
+Requires=syslog.target network.target
+After=network.target
+
+[Service]
+Environment=CONFIG=/etc/bacula/bacula-sd.conf
+EnvironmentFile=-/etc/sysconfig/bacula-sd
+ExecStartPre=/usr/sbin/bacula-checkconf $CONFIG
+ExecStart=/usr/sbin/bacula-sd -f $OPTS -c $CONFIG -u $SD_USER -g $SD_GROUP
+StandardOutput=syslog
+Restart=always
+
+[Install]
+WantedBy=multi-user.target
diff --git a/bacula.spec b/bacula.spec
index 4e31fb5..a76b5c6 100644
--- a/bacula.spec
+++ b/bacula.spec
@@ -1,72 +1,78 @@
-%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: 11%{?dist}
+%bcond_without	fedora
+
+Name:			bacula
+Version:		5.0.3
+Release:		16%{?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-%{docs_version}.tar.bz2
-#Source2: http://download.sourceforge.net/bacula/bacula-rescue-%{rescue_version}.tar.gz
-#Source3: bacula-gconsole.desktop
-Source4: bacula-wxconsole.desktop
-Source5: bacula-traymonitor.desktop
-Source6: bacula.logrotate
-Source7: bacula-fd.init
-Source8: bacula-dir.init
-Source9: bacula-sd.init
-#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-fd.sysconfig
-Source16: bacula-dir.sysconfig
-Source17: bacula-sd.sysconfig
-#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
-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
+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
+Source2:		bacula.logrotate
+Source3:		bacula-checkconf
+Source4:		bacula-fd.init
+Source5:		bacula-dir.init
+Source6:		bacula-sd.init
+Source7:		bacula-fd.service
+Source8:		bacula-dir.service
+Source9:		bacula-sd.service
+Source10:		bacula-wxconsole.desktop
+Source11:		bacula-traymonitor.desktop
+Source12:		bacula-bat.desktop
+Source13:		bacula-traymonitor.console_apps
+Source14:		bacula-wxconsole.console_apps
+Source15:		bacula-fd.sysconfig
+Source16:		bacula-dir.sysconfig
+Source17:		bacula-sd.sysconfig
+
+Patch1:			bacula-5.0.3-config.patch
+Patch2:			bacula-5.0.3-nagios-ent-fd.patch
+Patch3:			bacula-5.0.3-pamd.patch
+Patch4:			bacula-5.0.2-openssl.patch
+Patch5:			bacula-5.0.3-queryfile.patch
+Patch6:			bacula-5.0.2-python27.patch
+Patch7:			bacula-5.0.3-log-path.patch
+Patch8:			bacula-5.0.3-sqlite-priv.patch
+Patch9:			bacula-5.0.3-tray-dir.patch
+Patch10:		bacula-5.0.3-mysql55.patch
+Patch11:		bacula-5.0.3-maxvalue.patch
+
+BuildRequires:		openssl-devel, ncurses-devel, perl, glibc-devel
+BuildRequires:		libstdc++-devel, libxml2-devel, zlib-devel
+BuildRequires:		mysql-devel, postgresql-devel, sqlite-devel
+BuildRequires:		desktop-file-utils, python-devel, lzo-devel, sed
+BuildRequires:		libacl-devel, tetex-latex, tetex, ghostscript
+BuildRequires:		readline-devel, libcap-devel
+
+BuildRequires:		atk-devel, pango-devel, pkgconfig, wxGTK-devel
+BuildRequires:		gtk2-devel, libgnomeui-devel, GConf2-devel, bonobo-activation-devel
+BuildRequires:		ORBit2-devel, libbonobo-devel, libbonoboui-devel
+
+%if 0%{?fedora} >= 12 || 0%{?rhel} >= 6
+BuildRequires:		qt4-devel >= 4.6.2
+%endif
+
+%if 0%{?fedora} >= 7 || 0%{?rhel} >= 6
+BuildRequires:		tcp_wrappers-devel
+%else
+BuildRequires:		tcp_wrappers
+%endif
+
+%if 0%{?fedora} >= 9 || 0%{?rhel} >= 6
+BuildRequires:		dvipdfm
+%endif
+
+%if 0%{?fedora} >= 15 || 0%{?rhel} > 6
+BuildRequires:		systemd-units
+%endif
+
+%if 0%{?fedora} >= 9 || 0%{?rhel} >= 5
+BuildRequires:		latex2html
+%endif
 
 %description
 Bacula is a set of programs that allow you to manage the backup,
@@ -78,11 +84,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,
@@ -95,11 +101,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,
@@ -112,11 +118,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,
@@ -129,13 +135,24 @@ 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
+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
+%if 0%{?fedora} >= 15 || 0%{?rhel} > 6
+Requires(post):		systemd-sysv
+Requires(post):		systemd-units
+Requires(preun):	systemd-units
+Requires(postun):	systemd-units
+%else
+Requires(post):		/sbin/chkconfig
+Requires(preun):	/sbin/chkconfig
+Requires(preun):	/sbin/service
+Requires(postun):	/sbin/service
+%endif
 
 %description director-common
 Bacula is a set of programs that allow you to manage the backup,
@@ -150,13 +167,20 @@ bacula-director-sqlite or bacula-director-postgresql.
 
 
 %package client
-Summary: Bacula backup client
-Group: System Environment/Daemons
-Requires: bacula-common = %{version}-%{release}
-Requires(post): /sbin/chkconfig
-Requires(preun): /sbin/chkconfig
-Requires(preun): /sbin/service
-Requires(postun): /sbin/service
+Summary:		Bacula backup client
+Group:			System Environment/Daemons
+Requires:		bacula-common = %{version}-%{release}
+%if 0%{?fedora} >= 15 || 0%{?rhel} > 6
+Requires(post):		systemd-sysv
+Requires(post):		systemd-units
+Requires(preun):	systemd-units
+Requires(postun):	systemd-units
+%else
+Requires(post):		/sbin/chkconfig
+Requires(preun):	/sbin/chkconfig
+Requires(preun):	/sbin/service
+Requires(postun):	/sbin/service
+%endif
 
 %description client
 Bacula is a set of programs that allow you to manage the backup,
@@ -168,10 +192,21 @@ 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}
+Summary:		Common Bacula storage daemon files
+Group:			System Environment/Daemons
+Requires:		bacula-storage = %{version}-%{release}
+Requires:		bacula-common = %{version}-%{release}
+%if 0%{?fedora} >= 15 || 0%{?rhel} > 6
+Requires(post):		systemd-sysv
+Requires(post):		systemd-units
+Requires(preun):	systemd-units
+Requires(postun):	systemd-units
+%else
+Requires(post):		/sbin/chkconfig
+Requires(preun):	/sbin/chkconfig
+Requires(preun):	/sbin/service
+Requires(postun):	/sbin/service
+%endif
 
 %description storage-common
 Bacula is a set of programs that allow you to manage the backup,
@@ -184,11 +219,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,
@@ -201,11 +236,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,
@@ -218,11 +253,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,
@@ -235,10 +270,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,
@@ -247,9 +282,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,
@@ -259,25 +294,12 @@ different computers. It is based on a client/server architecture.
 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
-
+%if 0%{?fedora} >= 12 || 0%{?rhel} >= 6
 %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,
@@ -285,13 +307,13 @@ recovery, and verification of computer data across a network of
 different computers. It is based on a client/server architecture.
 
 This package contains the bat version of the bacula management console
-
+%endif
 
 %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,
@@ -303,9 +325,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,
@@ -316,24 +338,9 @@ 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
+Summary:		Bacula documentation
+Group:			Documentation
 
 %description docs
 Bacula is a set of programs that allow you to manage the backup,
@@ -343,39 +350,30 @@ different computers. It is based on a client/server architecture.
 This package contains the documentation for most of the bacula-packages.
 
 
+%package -n nagios-plugins-bacula
+Summary:		Nagios Plugin - check_bacula
+Group:			Applications/System
+
+%description -n nagios-plugins-bacula
+Provides check_bacula support for Nagios.
+
+
 %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
-%patch17 -p0 -b .python27
-%patch18 -p2
-%patch19 -p2 -b .log-path
-%patch20 -p0 -b .priv
-%patch21 -p2 -b .tray-dir
-%patch22 -p0 -b .mysql55
-#quoting MaxValue in sql scripts
-%patch23 -p1 -b .maxvalue
-
+%patch1 -p1 -b .config
+%patch2 -p1 -b .nagios-ent-fd
+%patch3 -p1 -b .pamd
+%patch4 -p2 -b .openssl
+%patch5 -p1 -b .queryfile
+%patch6 -p0 -b .python27
+%patch7 -p2 -b .log-path
+%patch8 -p0 -b .priv
+%patch9 -p2 -b .tray-dir
+%patch10 -p0 -b .mysql55
+%patch11 -p1 -b .maxvalue
 
 
 # Remove execution permissions from files we're packaging as docs later on
@@ -390,23 +388,20 @@ 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
+# and all the common files separated so we can also reduce compilation time
+# and build graphical consoles where allowed.
+mkdir bacula-mysql bacula-postgresql bacula-sqlite bacula-base
 
 %build
 # Shell function to configure and build a Bacula tree
 build() {
 cp -rl ../bacula-%{version}/* .
 export CFLAGS="$RPM_OPT_FLAGS -I%{_includedir}/ncurses"
-export CPPFLAGS=-I%{_includedir}/ncurses
-export QMAKE=/usr/bin/qmake-qt4
+export CPPFLAGS="$RPM_OPT_FLAGS -I%{_includedir}/ncurses"
 %configure \
 	--sysconfdir=%{_sysconfdir}/bacula \
+	--with-basename=bacula \
 	--with-dir-user=bacula \
 	--with-dir-group=bacula \
 	--with-sd-user=bacula \
@@ -419,27 +414,21 @@ 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 \
-	--enable-conio \
+	--with-plugindir=%{_libdir}/bacula \
+	--disable-conio \
+	--enable-readline \
 	--enable-largefile \
-	--enable-bwx-console \
-	--enable-tray-monitor \
-	--enable-build-dird \
-	--enable-build-stored \
 	--with-openssl \
 	--with-tcp-wrappers \
 	--with-python \
 	--enable-smartalloc \
 	--with-x \
-	--enable-bat \
-	--disable-libtool \
 	$*
-# Scratch this, it is trouble
-#	--with-readline \
 
 if test $? != 0; then 
   tail -500 config.log
@@ -447,65 +436,117 @@ if test $? != 0; then
   exit 1
 fi
 
+# Remove RPATH
+sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
+sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
+
 %{__make} %{?_smp_mflags} NO_ECHO=
 
 }				
 
-# Build sqlite director
-pushd bacula-sqlite
-%if 0%{?fedora}%{?rhel}
-	%if 0%{?fedora}
-		%if 0%{fedora} >= 5
-			%define	sqlite_suffix 3
-			build --with-sqlite3
-		%else
-			build --with-sqlite
-		%endif
-	%endif
-	%if 0%{?rhel}
-		%if 0%{rhel} >=  5
-			%define	sqlite_suffix 3
-			build --with-sqlite3
-		%else
-			build --with-sqlite
-		%endif
+# Regen bat QT project file and build tools
+pushd bacula-base
+	%if 0%{?fedora} >= 12 || 0%{?rhel} >= 6
+	export QMAKE=/usr/bin/qmake-qt4
+	build \
+		--enable-bat \
+		--enable-bwx-console \
+		--enable-tray-monitor \
+		--enable-client-only
+	pushd src/qt-console
+		/usr/bin/qmake-qt4
+		make
+	popd
+	%else
+	build \
+		--disable-bat \
+		--enable-bwx-console \
+		--enable-tray-monitor \
+		--enable-client-only
 	%endif
-%else
-	echo 'Neither %%{fedora} nor %%{rhel} are defined.'
-	echo 'Please call rpmbuild with at least --define "fedora 7" or --define "rhel 5"'
-	echo 'depending on your release version you are building on.'
-	exit 1
-%endif
-
-#Regen bat qt project file and build
-pushd src
-pushd qt-console
-/usr/bin/qmake-qt4
-make
-popd
+	pushd examples/nagios/check_bacula
+		CFLAGS="%{optflags}" %{__make} LIBS="-lpthread -ldl -lssl -lcrypto -lz"
+	popd
 popd
 
+# Build sqlite director
+pushd bacula-sqlite
+	build \
+		--disable-bat \
+		--disable-bwx-console \
+		--disable-tray-monitor \
+		--enable-build-stored \
+		--enable-build-dird \
+		--with-sqlite3
 popd
 
 # Build MySQL director
 pushd bacula-mysql
-	build --with-mysql
+	build \
+		--disable-bat \
+		--disable-bwx-console \
+		--disable-tray-monitor \
+		--enable-build-stored \
+		--enable-build-dird \
+		--with-mysql
 popd
 
 # Build PostgreSQL director
 pushd bacula-postgresql
-	build --with-postgresql
+	build \
+		--disable-bat \
+		--disable-bwx-console \
+		--disable-tray-monitor \
+		--enable-build-stored \
+		--enable-build-dird \
+		--with-postgresql
 popd
 
 # Build the docs
-pushd bacula-docs-%{docs_version}
- %configure --with-bacula=%{_builddir}/bacula-%{version}/bacula-%{version}
- make
+pushd bacula-docs-%{version}
+	%configure --with-bacula=%{_builddir}/bacula-%{version}/bacula-%{version}
+	make
 popd
 
 %install
 rm -rf %{buildroot}
 
+pushd bacula-base
+	make install DESTDIR=%{buildroot}
+
+	# install the nagios plugin
+	%{__mkdir_p} %{buildroot}%{_libdir}/nagios/plugins
+	%{__install} -m0755 examples/nagios/check_bacula/.libs/check_bacula %{buildroot}%{_libdir}/nagios/plugins/
+
+	# Desktop Integration
+	mkdir -p %{buildroot}%{_bindir}
+	install -m 644 -D scripts/bacula.png %{buildroot}%{_datadir}/pixmaps/bacula.png
+
+	# bwxconsole
+	install -m 644 -D src/wx-console/wxwin16x16.xpm %{buildroot}%{_datadir}/pixmaps/wxwin16x16.xpm
+	install -m 644 -D scripts/wxconsole.pamd %{buildroot}%{_sysconfdir}/pam.d/bwxconsole
+	install -m 644 -D %{SOURCE14} %{buildroot}%{_sysconfdir}/security/console.apps/bwxconsole
+	ln -sf consolehelper %{buildroot}%{_bindir}/bwxconsole
+	desktop-file-install --vendor="fedora" --dir=%{buildroot}%{_datadir}/applications %{SOURCE10}
+
+	install -m 644 -D src/tray-monitor/generic.xpm %{buildroot}%{_datadir}/pixmaps/bacula-tray-monitor.xpm
+	install -m 644 -D scripts/bgnome-console.pamd %{buildroot}%{_sysconfdir}/pam.d/bacula-tray-monitor
+	install -m 644 -D %{SOURCE13} %{buildroot}%{_sysconfdir}/security/console.apps/bacula-tray-monitor
+	ln -sf consolehelper %{buildroot}%{_bindir}/bacula-tray-monitor
+	desktop-file-install --vendor="fedora" --dir=%{buildroot}%{_datadir}/applications %{SOURCE11}
+
+	%if 0%{?fedora} >= 12 || 0%{?rhel} >= 6
+	install -m 644 -D src/qt-console/images/bat_icon.png %{buildroot}%{_datadir}/pixmaps/bat_icon.png
+	install -m 644 -D scripts/bgnome-console.pamd %{buildroot}%{_sysconfdir}/pam.d/bat
+	install -m 644 -D scripts/bat.console_apps %{buildroot}%{_sysconfdir}/security/console.apps/bat
+	ln -sf consolehelper %{buildroot}%{_bindir}/bat
+	desktop-file-install --vendor="fedora" --dir=%{buildroot}%{_datadir}/applications %{SOURCE12}
+
+	install -m 755 -D src/qt-console/.libs/bat %{buildroot}%{_sbindir}
+	install -m 644 -D src/qt-console/bat.conf %{buildroot}%{_sysconfdir}/bacula/bat.conf
+	%endif
+popd
+
 pushd bacula-sqlite
 	make install DESTDIR=%{buildroot}
 	mv %{buildroot}%{_sbindir}/bacula-dir  %{buildroot}%{_sbindir}/bacula-dir.sqlite
@@ -548,110 +589,59 @@ 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
-#bat.pamd is broken.
-install -m 644 -D bacula-sqlite/scripts/bgnome-console.pamd %{buildroot}%{_sysconfdir}/pam.d/bat
-install -m 644 -D bacula-sqlite/scripts/bat.console_apps %{buildroot}%{_sysconfdir}/security/console.apps/bat
-install -m 644 -D bacula-sqlite/src/tray-monitor/generic.xpm %{buildroot}%{_datadir}/pixmaps/bacula-tray-monitor.xpm
-install -m 644 -D bacula-sqlite/src/qt-console/images/bat_icon.png %{buildroot}%{_datadir}/pixmaps/bat_icon.png
-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}
-
-
 # logrotate
 mkdir -p %{buildroot}%{_localstatedir}/log/bacula
-install -m 644 -D %{SOURCE6} %{buildroot}%{_sysconfdir}/logrotate.d/bacula
-
+install -m 644 -D %{SOURCE2} %{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
-install -m 644 -D bacula-sqlite/scripts/logwatch/logfile.bacula.conf %{buildroot}%{_sysconfdir}/logwatch/conf/logfiles/bacula.conf
-install -m 644 -D bacula-sqlite/scripts/logwatch/services.bacula.conf %{buildroot}%{_sysconfdir}/logwatch/conf/services/bacula.conf
-
-
+install -m 755 -D bacula-base/scripts/logwatch/bacula %{buildroot}%{_sysconfdir}/logwatch/scripts/services/bacula
+install -m 755 -D bacula-base/scripts/logwatch/applybaculadate %{buildroot}%{_sysconfdir}/logwatch/scripts/shared/applybaculadate
+install -m 644 -D bacula-base/scripts/logwatch/logfile.bacula.conf %{buildroot}%{_sysconfdir}/logwatch/conf/logfiles/bacula.conf
+install -m 644 -D bacula-base/scripts/logwatch/services.bacula.conf %{buildroot}%{_sysconfdir}/logwatch/conf/services/bacula.conf
+
+%if 0%{?fedora} >= 15 || 0%{?rhel} > 6
+# Systemd unit files
+mkdir -p ${buildroot}%{_unitdir}
+install -m 755 -D %{SOURCE7}  %{buildroot}%{_unitdir}/bacula-fd.service
+install -m 755 -D %{SOURCE8}  %{buildroot}%{_unitdir}/bacula-dir.service
+install -m 755 -D %{SOURCE9}  %{buildroot}%{_unitdir}/bacula-sd.service
+install -m 755 -D %{SOURCE3} %{buildroot}%{_sbindir}/bacula-checkconf
+%else
 # Initscripts
 install -m 755 -D %{SOURCE7}  %{buildroot}%{_initrddir}/bacula-fd
 install -m 755 -D %{SOURCE8}  %{buildroot}%{_initrddir}/bacula-dir
 install -m 755 -D %{SOURCE9}  %{buildroot}%{_initrddir}/bacula-sd
-
+%endif
 
 # Sysconfig
 install -m 644 -D %{SOURCE15}  %{buildroot}%{_sysconfdir}/sysconfig/bacula-fd
 install -m 644 -D %{SOURCE16}  %{buildroot}%{_sysconfdir}/sysconfig/bacula-dir
 install -m 644 -D %{SOURCE17}  %{buildroot}%{_sysconfdir}/sysconfig/bacula-sd
 
-
 # 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} 
 
-# Install bat.conf
-install -m 644 bacula-sqlite/src/qt-console/bat.conf %{buildroot}%{_sysconfdir}/bacula/bat.conf
-
 # Fix up some perms so rpmlint does not complain too much
 chmod 755 %{buildroot}%{_sbindir}/*
 chmod 755 %{buildroot}%{_libexecdir}/bacula/*
@@ -659,6 +649,13 @@ chmod 644 %{buildroot}%{_libexecdir}/bacula/btraceback.*
 
 # Remove extra docs
 rm -rf %{buildroot}%{_datadir}/doc/bacula/
+find %{_builddir}/%{name}-%{version}/%{name}-docs-%{version}/manuals/en -name "*.idx" -exec rm -f {} \;
+find %{_builddir}/%{name}-%{version}/%{name}-docs-%{version}/manuals/en -name "*.pl" -exec rm -f {} \;
+find %{_builddir}/%{name}-%{version}/%{name}-docs-%{version}/manuals/en -name "*.tex" -exec rm -f {} \;
+
+# Remove local archives
+rm -f %{buildroot}%{_libdir}/*.la
+
 
 %clean
 rm -rf %{buildroot}
@@ -675,7 +672,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 \
@@ -687,7 +683,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 \
@@ -699,19 +694,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
@@ -722,22 +714,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
@@ -753,6 +741,100 @@ if [ "$1" = 0 ]; then
 	/usr/sbin/alternatives --remove bacula-sd /usr/sbin/bcopy.postgresql
 fi
 
+%if 0%{?fedora} >= 15 || 0%{?rhel} > 6
+
+%post client
+if [ $1 -eq 1 ] ; then 
+    # Initial installation 
+    /bin/systemctl daemon-reload >/dev/null 2>&1 || :
+fi
+
+%preun client
+if [ $1 -eq 0 ] ; then
+    # Package removal, not upgrade
+    /bin/systemctl --no-reload disable bacula-fd.service > /dev/null 2>&1 || :
+    /bin/systemctl stop bacula-fd.service > /dev/null 2>&1 || :
+fi
+
+%postun client
+/bin/systemctl daemon-reload >/dev/null 2>&1 || :
+if [ $1 -ge 1 ] ; then
+    # Package upgrade, not uninstall
+    /bin/systemctl try-restart bacula-fd.service >/dev/null 2>&1 || :
+fi
+
+%triggerun client -- bacula-client < 5.0.3-10
+# Save the current service runlevel info
+# User must manually run systemd-sysv-convert --apply bacula-fd
+# to migrate them to systemd targets
+/usr/bin/systemd-sysv-convert --save bacula-fd >/dev/null 2>&1 ||:
+
+# Run these because the SysV package being removed won't do them
+/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 
+    /bin/systemctl daemon-reload >/dev/null 2>&1 || :
+fi
+
+%preun director-common
+if [ $1 -eq 0 ] ; then
+    # Package removal, not upgrade
+    /bin/systemctl --no-reload disable bacula-dir.service > /dev/null 2>&1 || :
+    /bin/systemctl stop bacula-dir.service > /dev/null 2>&1 || :
+fi
+
+%postun director-common
+/bin/systemctl daemon-reload >/dev/null 2>&1 || :
+if [ $1 -ge 1 ] ; then
+    # Package upgrade, not uninstall
+    /bin/systemctl try-restart bacula-dir.service >/dev/null 2>&1 || :
+fi
+
+%triggerun director-common -- bacula-director-common < 5.0.3-10
+# Save the current service runlevel info
+# User must manually run systemd-sysv-convert --apply bacula-dir
+# to migrate them to systemd targets
+/usr/bin/systemd-sysv-convert --save bacula-dir >/dev/null 2>&1 ||:
+
+# Run these because the SysV package being removed won't do them
+/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 
+    /bin/systemctl daemon-reload >/dev/null 2>&1 || :
+fi
+
+%preun storage-common
+if [ $1 -eq 0 ] ; then
+    # Package removal, not upgrade
+    /bin/systemctl --no-reload disable bacula-sd.service > /dev/null 2>&1 || :
+    /bin/systemctl stop bacula-sd.service > /dev/null 2>&1 || :
+fi
+
+%postun storage-common
+/bin/systemctl daemon-reload >/dev/null 2>&1 || :
+if [ $1 -ge 1 ] ; then
+    # Package upgrade, not uninstall
+    /bin/systemctl try-restart bacula-sd.service >/dev/null 2>&1 || :
+fi
+
+%triggerun storage-common -- bacula-storage-common < 5.0.3-10 
+# Save the current service runlevel info
+# User must manually run systemd-sysv-convert --apply bacula-sd
+# to migrate them to systemd targets
+/usr/bin/systemd-sysv-convert --save bacula-sd >/dev/null 2>&1 ||:
+
+# Run these because the SysV package being removed won't do them
+/sbin/chkconfig --del bacula-sd >/dev/null 2>&1 || :
+/bin/systemctl try-restart bacula-sd.service >/dev/null 2>&1 || :
+
+%else
+
 %post client
 /sbin/chkconfig --add bacula-fd
 
@@ -803,58 +885,65 @@ if [ "$1" -ge "1" ]; then
 	/sbin/service bacula-sd condrestart >/dev/null 2>&1 || :
 fi
 
+%endif
+
 
 %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}/README bacula-%{version}/SUPPORT bacula-%{version}/VERIFYING bacula-%{version}/ReleaseNotes
 %doc bacula-%{version}/examples/
 %config(noreplace) %{_sysconfdir}/logrotate.d/bacula
 %dir %{_sysconfdir}/bacula
 %dir %{_libexecdir}/bacula
+%{_libdir}/libbac-%{version}.so
+%{_libdir}/libbac.so
+%{_libdir}/libbaccfg-%{version}.so
+%{_libdir}/libbaccfg.so
+%{_libdir}/libbacfind-%{version}.so
+%{_libdir}/libbacfind.so
+%{_libdir}/libbacpy-%{version}.so
+%{_libdir}/libbacpy.so
+%{_libdir}/libbacsql-%{version}.so
+%{_libdir}/libbacsql.so
+%{_sbindir}/bacula-checkconf
 %{_sbindir}/bsmtp
 %{_sbindir}/btraceback
+%{_sbindir}/bacula
+%{_libexecdir}/bacula/bacula_config
 %{_libexecdir}/bacula/btraceback.dbx
 %{_libexecdir}/bacula/btraceback.gdb
+%{_libexecdir}/bacula/btraceback.mdb
+%{_libexecdir}/bacula/mtx-changer.conf
 %{_mandir}/man1/bsmtp.1*
 %{_mandir}/man8/bacula.8*
 %{_mandir}/man8/btraceback.8*
 %dir %attr(750, bacula, bacula) %{_localstatedir}/log/bacula
 %dir %attr(750, bacula, bacula) %{_localstatedir}/spool/bacula
-%{_sbindir}/bacula
-#%{_libdir}/bpipe-fd.so
-/usr/libexec/bacula/mtx-changer.conf
-%{_libexecdir}/bacula/bacula_config
-%{_libexecdir}/bacula/btraceback.mdb
+
 
 %files client
 %defattr(-,root,root,-)
-%{_sbindir}/bacula-fd
-%{_initrddir}/bacula-fd
 %config(noreplace) %{_sysconfdir}/bacula/bacula-fd.conf
 %config(noreplace) %{_sysconfdir}/sysconfig/bacula-fd
+%{_sbindir}/bacula-fd
+%{_libdir}/bacula/bpipe-fd.so
+%if 0%{?fedora} >= 15 || 0%{?rhel} > 6
+%{_unitdir}/bacula-fd.service
+%else
+%{_initrddir}/bacula-fd
+%endif
 %{_mandir}/man8/bacula-fd.8*
 
 
 %files console
 %defattr(-,root,root,-)
-%{_sbindir}/bconsole
 %attr(640,root,bacula) %config(noreplace) %{_sysconfdir}/bacula/bconsole.conf
+%{_sbindir}/bconsole
 %{_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
-
+%if 0%{?fedora} >= 12 || 0%{?rhel} >= 6
 %files console-bat
 %defattr(-,root,root,-)
 %config %{_sysconfdir}/security/console.apps/bat
@@ -866,6 +955,7 @@ fi
 %{_datadir}/applications/fedora-bacula-bat.desktop
 %{_datadir}/pixmaps/bat_icon.png
 %{_datadir}/pixmaps/bacula.png
+%endif
 
 
 %files console-wxwidgets
@@ -884,13 +974,17 @@ fi
 %defattr(-,root,root,-)
 %doc bacula-%{version}/updatedb/
 %attr(640,root,bacula) %config(noreplace) %{_sysconfdir}/bacula/bacula-dir.conf
+%config(noreplace) %{_sysconfdir}/sysconfig/bacula-dir
 %config(noreplace) %{_sysconfdir}/bacula/query.sql
 %config %{_sysconfdir}/logwatch/conf/logfiles/bacula.conf
 %config %{_sysconfdir}/logwatch/conf/services/bacula.conf
-%config(noreplace) %{_sysconfdir}/sysconfig/bacula-dir
 %{_sysconfdir}/logwatch/scripts/services/bacula
 %{_sysconfdir}/logwatch/scripts/shared/applybaculadate
+%if 0%{?fedora} >= 15 || 0%{?rhel} > 6
+%{_unitdir}/bacula-dir.service
+%else
 %{_initrddir}/bacula-dir
+%endif
 %{_sbindir}/bregex
 %{_sbindir}/bwild
 %{_mandir}/man8/dbcheck.8*
@@ -898,6 +992,7 @@ fi
 %{_libexecdir}/bacula/delete_catalog_backup
 %{_libexecdir}/bacula/make_catalog_backup.pl
 
+
 %files director-mysql
 %defattr(-,root,root,-)
 %{_sbindir}/bacula-dir.mysql
@@ -917,18 +1012,16 @@ fi
 %{_libexecdir}/bacula/update_bacula_tables.mysql
 
 
-
 %files director-sqlite
 %defattr(-,root,root,-)
 %{_sbindir}/bacula-dir.sqlite
 %{_sbindir}/dbcheck.sqlite
-# DANGER Will Robinson. Bacula has versioned sqlite filenames
-%{_libexecdir}/bacula/create_sqlite%{?sqlite_suffix}_database
-%{_libexecdir}/bacula/drop_sqlite%{?sqlite_suffix}_database
-%{_libexecdir}/bacula/drop_sqlite%{?sqlite_suffix}_tables
-%{_libexecdir}/bacula/grant_sqlite%{?sqlite_suffix}_privileges
-%{_libexecdir}/bacula/make_sqlite%{?sqlite_suffix}_tables
-%{_libexecdir}/bacula/update_sqlite%{?sqlite_suffix}_tables
+%{_libexecdir}/bacula/create_sqlite3_database
+%{_libexecdir}/bacula/drop_sqlite3_database
+%{_libexecdir}/bacula/drop_sqlite3_tables
+%{_libexecdir}/bacula/grant_sqlite3_privileges
+%{_libexecdir}/bacula/make_sqlite3_tables
+%{_libexecdir}/bacula/update_sqlite3_tables
 %{_libexecdir}/bacula/create_bacula_database.sqlite
 %{_libexecdir}/bacula/drop_bacula_database.sqlite
 %{_libexecdir}/bacula/drop_bacula_tables.sqlite
@@ -959,13 +1052,17 @@ fi
 
 %files storage-common
 %defattr(-,root,root,-)
+%config(noreplace) %{_sysconfdir}/bacula/bacula-sd.conf
+%config(noreplace) %{_sysconfdir}/sysconfig/bacula-sd
+%if 0%{?fedora} >= 15 || 0%{?rhel} > 6
+%{_unitdir}/bacula-sd.service
+%else
+%{_initrddir}/bacula-sd
+%endif
 %{_sbindir}/bacula-sd
 %{_sbindir}/bextract
 %{_sbindir}/bls
 %{_sbindir}/btape
-%config(noreplace) %{_sysconfdir}/bacula/bacula-sd.conf
-%config(noreplace) %{_sysconfdir}/sysconfig/bacula-sd
-%{_initrddir}/bacula-sd
 %{_libexecdir}/bacula/disk-changer
 %{_libexecdir}/bacula/dvd-handler
 %{_libexecdir}/bacula/mtx-changer
@@ -997,11 +1094,11 @@ fi
 
 %files traymonitor
 %defattr(-,root,root,-)
-%{_bindir}/bacula-tray-monitor
-%{_sbindir}/bacula-tray-monitor
 %attr(640,root,bacula) %config(noreplace) %{_sysconfdir}/bacula/tray-monitor.conf
 %config %{_sysconfdir}/security/console.apps/bacula-tray-monitor
 %config %{_sysconfdir}/pam.d/bacula-tray-monitor
+%{_bindir}/bacula-tray-monitor
+%{_sbindir}/bacula-tray-monitor
 %{_mandir}/man1/bacula-tray-monitor.1*
 %{_datadir}/applications/fedora-bacula-traymonitor.desktop
 %{_datadir}/pixmaps/bacula-tray-monitor.xpm
@@ -1009,34 +1106,61 @@ 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/problems/problems
+%doc bacula-docs-%{version}/manuals/en/console/console.pdf
+%doc bacula-docs-%{version}/manuals/en/console/console
+%doc bacula-docs-%{version}/manuals/en/utility/utility.pdf
+%doc bacula-docs-%{version}/manuals/en/utility/utility
+%doc bacula-docs-%{version}/manuals/en/developers/developers.pdf
+%doc bacula-docs-%{version}/manuals/en/developers/developers
+%doc bacula-docs-%{version}/manuals/en/main/main.pdf
+%doc bacula-docs-%{version}/manuals/en/main/main
+%doc bacula-docs-%{version}/manuals/en/misc/misc.pdf
+%doc bacula-docs-%{version}/manuals/en/misc/misc
+
+
+%files -n nagios-plugins-bacula
+%defattr(-,root,root)
+%{_libdir}/nagios/plugins/check_bacula
 
 
 %changelog
-* Thu Dec 22 2011 Lukáš Nykrýn <lnykryn@redhat.com> - 5.0.3-11
+* Fri Dec 23 2011 Simone Caronni <negativo17@gmail.com> - 5.0.3-16
+- Add Nagios plugin.
+- Add conditionals for RHEL building (initscripts, bat).
+- Enable libtool, bpipe-fd.so plugin and remove dsolink patches.
+
+* Fri Dec 23 2011 Simone Caronni <negativo17@gmail.com> - 5.0.3-15
+- Spec file cleanup.
+- Fix Buildrequires for RHEL.
+- Enable POSIX.1e capabilities.
+- Enable LZO compression.
+- Enable readline support and tab completion in bconsole.
+- Remove SQLite 2 support for RHEL 4.
+- Add HTML docs.
+- Change SQL query file patch.
+- Add back sysconf files and remove redundant user/group in systemd
+  service files.
+- Move build of common parts around to reduce build time and to prepare
+  for nagios-plugins and conditionals for RHEL.
+
+* Thu Dec 22 2011 Lukáš Nykrýn <lnykryn@redhat.com> - 5.0.3-14
 - removed duplicity from logrotate file (#755970)
 
-* Fri Oct  9 2011 Lukáš Nykrýn <lnykryn@redhat.com> - 5.0.3-10
+* Thu Nov 3 2011 Lukáš Nykrýn <lnykryn@redhat.com> - 5.0.3-13
+- fixed creating of bacula MySQL tables and bump
+
+* Fri Oct  9 2011 Lukáš Nykrýn <lnykryn@redhat.com> - 5.0.3-12
+- fixed restart option in service files (#745529)
 - fixed creating of bacula MySQL tables (#724894)
 
+* Fri Sep  9 2011 Tom Callaway <spot@fedoraproject.org> - 5.0.3-11
+- add missing scriptlets
+
+* Thu Sep  8 2011 Tom Callaway <spot@fedoraproject.org> - 5.0.3-10 
+- convert to systemd
+
 * Wed Mar 23 2011 Dan Horák <dan@danny.cz> - 5.0.3-9
 - rebuilt for mysql 5.5.10 (soname bump in libmysqlclient)