packages: bacula/bacula.spec, bacula/bacula-config_no_clean.patch (NEW) - i...

[jajcus]

Author: jajcus                       Date: Tue Mar 16 15:15:53 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- improving the multi-backend build. NFY

---- Files affected:
packages/bacula:
   bacula.spec (1.126 -> 1.127) , bacula-config_no_clean.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/bacula/bacula.spec
diff -u packages/bacula/bacula.spec:1.126 packages/bacula/bacula.spec:1.127
--- packages/bacula/bacula.spec:1.126	Tue Mar 16 15:12:36 2010
+++ packages/bacula/bacula.spec	Tue Mar 16 16:15:47 2010
@@ -23,7 +23,7 @@
 Summary(pl.UTF-8):	Bacula - rozwiązanie do wykonywania kopii zapasowych po sieci
 Name:		bacula
 Version:	5.0.1
-Release:	0.2
+Release:	0.5
 Epoch:		0
 License:	extended GPL v2
 Group:		Networking/Utilities
@@ -49,6 +49,7 @@
 Patch6:		%{name}-64bitbuild_fix.patch
 Patch7:		%{name}-dbi_fixes.patch
 Patch8:		%{name}-dbi_dbcheck.patch
+Patch9:		%{name}-config_no_clean.patch
 URL:		http://www.bacula.org/
 BuildRequires:	acl-devel
 BuildRequires:	autoconf
@@ -468,8 +469,9 @@
 %patch4 -p1
 %patch5 -p1
 #%patch6 -p1
-%{?with_dbi:%patch7 -p1}
+%patch7 -p1
 %patch8 -p1
+%patch9 -p1
 
 tar -xf %{SOURCE2} && ln -s bacula-rescue-* rescue
 
@@ -492,10 +494,13 @@
 cd ..
 %{__autoconf} --prepend-include=$(pwd)/autoconf autoconf/configure.in > configure
 
+CPPFLAGS="-I/usr/include/ncurses -I%{_includedir}/readline"
+
+# we wan't the 'base' build built with the first database in the list,
+# to make sure it is full-featured
 base_built="no"
 
 for database in %{databases} ; do
-	CPPFLAGS="-I/usr/include/ncurses -I%{_includedir}/readline"
 	WXCONFIG=%{_bindir}/wx-gtk2-unicode-config \
 	%configure \
 		--with-scriptdir=%{_libexecdir}/%{name} \
@@ -848,20 +853,43 @@
 	prefix="${name%% *}" \
 	suffix="${name#* }" \
 	ln -sf "${prefix}_%{1}_${suffix}" %{_libexecdir}/%{name}/"${prefix}_bacula_${suffix}" || :  \
-done
+done \
+%service bacula-dir restart "Bacula Director daemon"
+
+%define db_postun() \
+/sbin/ldconfig \
+if [ "$1" = "0" ]; then \
+	for f in %{_libexecdir}/%{name}/*_bacula_* ; do \
+		if [ ! -e "$f" ] ; then \
+			rm "$f" \
+		fi \
+	done \
+fi
 
 %post db-postgresql
 %db_post postgresql
 
+%postun db-postgresql
+%db_postun postgresql
+
 %post db-mysql
 %db_post mysql
 
+%postun db-mysql
+%db_postun mysql
+
 %post db-sqlite3
 %db_post sqlite3
 
+%postun db-sqlite3
+%db_postun sqlite3
+
+# dbi backend is different, as it is not bound with a specific db engine
 %post db-dbi
 /sbin/ldconfig
 
+%postun db-dbi -p /sbin/ldconfig
+
 %files common
 %defattr(644,root,root,755)
 %doc LICENSE
@@ -1082,6 +1110,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.127  2010/03/16 15:15:47  jajcus
+- improving the multi-backend build. NFY
+
 Revision 1.126  2010/03/16 14:12:36  jajcus
 - build all database backends and put each in a separate package
 

================================================================
Index: packages/bacula/bacula-config_no_clean.patch
diff -u /dev/null packages/bacula/bacula-config_no_clean.patch:1.1
--- /dev/null	Tue Mar 16 16:15:53 2010
+++ packages/bacula/bacula-config_no_clean.patch	Tue Mar 16 16:15:47 2010
@@ -0,0 +1,23 @@
+--- bacula-5.0.1/autoconf/configure.in~	2010-03-16 15:55:32.000000000 +0100
++++ bacula-5.0.1/autoconf/configure.in	2010-03-16 15:56:00.000000000 +0100
+@@ -3120,7 +3120,6 @@
+    chmod 755 bat
+    rm -f Makefile
+    $QMAKEBIN
+-   ${MAKE:-make} clean
+    cd ${BUILD_DIR}
+ fi
+ 
+@@ -3194,12 +3193,6 @@
+    fi
+ fi
+ 
+-# clean up any old junk
+-echo " "
+-echo "Cleaning up"
+-echo " "
+-${MAKE:-make} clean
+-
+ if test "x${db_type}" = "xInternal" ; then
+    echo " "
+    echo " "
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/bacula/bacula.spec?r1=1.126&r2=1.127&f=u