packages: bacula/bacula.spec - install and package upgrade scripts from 2.0...

[glen]

Author: glen                         Date: Mon Oct  4 14:19:05 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- install and package upgrade scripts from 2.0.x database (version 10); rel 4

---- Files affected:
packages/bacula:
   bacula.spec (1.151 -> 1.152) 

---- Diffs:

================================================================
Index: packages/bacula/bacula.spec
diff -u packages/bacula/bacula.spec:1.151 packages/bacula/bacula.spec:1.152
--- packages/bacula/bacula.spec:1.151	Mon Oct  4 16:04:48 2010
+++ packages/bacula/bacula.spec	Mon Oct  4 16:18:59 2010
@@ -7,7 +7,15 @@
 #make[1]: *** No rule to make target `../lib/libbac.la', needed by `bacula-dir'.  Stop.
 #make[1]: *** Waiting for unfinished jobs....
 #make[1]: Leaving directory `/home/users/glen/rpm/BUILD.x86_64-linux/bacula-5.0.2/src/dird'
-#	- unpackaged: /usr/lib64/bacula/btraceback.mdb
+#warning: Installed (but unpackaged) file(s) found:
+#   /usr/lib64/bacula/btraceback.mdb
+#   /usr/sbin/bat
+#*** WARNING: identical binaries are copied, not linked:
+#        /usr/sbin/bat
+#   and  /usr/bin/bat
+#*** WARNING: identical binaries are copied, not linked:
+#        /usr/lib64/libbacsql-postgresql-5.0.3.so
+#   and  /usr/lib64/libbacsql-5.0.3.so
 #
 # Conditional build:
 %bcond_without	console_wx		# wx-console program
@@ -29,7 +37,7 @@
 Summary(pl.UTF-8):	Bacula - rozwiązanie do wykonywania kopii zapasowych po sieci
 Name:		bacula
 Version:	5.0.3
-Release:	3
+Release:	4
 License:	extended GPL v2
 Group:		Networking/Utilities
 Source0:	http://downloads.sourceforge.net/bacula/%{name}-%{version}.tar.gz
@@ -574,8 +582,8 @@
 		file_prefix=${orig_name%%-*.so}
 		file_suffix=${orig_name#*-}
 		file_name=$file_prefix-$database-$file_suffix
-		install -p $libfile $RPM_BUILD_ROOT/%{_libdir}/$file_name
-		touch $RPM_BUILD_ROOT/%{_libdir}/$orig_name
+		install -p $libfile $RPM_BUILD_ROOT%{_libdir}/$file_name
+		touch $RPM_BUILD_ROOT%{_libdir}/$orig_name
 	done
 done
 
@@ -616,8 +624,9 @@
 
 touch $RPM_BUILD_ROOT/var/log/bacula/log
 
-# install the updatedb scripts
-install -p updatedb/update_sqlite* $RPM_BUILD_ROOT%{_libexecdir}/%{name}
+# install the updatedb scripts for older versions that last full release
+# 2.0 -> 3.0 : 10_to_11
+install -p updatedb/update_*_tables_10_to_11 $RPM_BUILD_ROOT%{_libexecdir}/%{name}
 
 # place for site passwords
 touch $RPM_BUILD_ROOT%{_sysconfdir}/{dir-password,fd-password,sd-password}
@@ -678,16 +687,16 @@
 %define update_configs \
 echo "Updating bacula passwords and names..." | %banner -a %{name} \
 cd /etc/bacula \
-for f in *-password ; do \
-	if [ ! -s $f ] ; then \
+for f in *-password; do \
+	if [ ! -s $f ]; then \
 		openssl rand -base64 33 > $f \
 	fi \
-	p=`cat $f` \
-	for cf in *.conf *.conf.rpmnew ; do \
+	p=$(cat $f) \
+	for cf in *.conf *.conf.rpmnew; do \
 		[ -f $cf ] && sed -i -e"s:#FAKE-$f#:$p:" "$cf" || : \
 	done \
 done \
-for cf in *.conf *.conf.rpmnew ; do \
+for cf in *.conf *.conf.rpmnew; do \
 	[ -f $cf ] && sed -i -e"s:--hostname--:`hostname`:" "$cf" || : \
 done
 
@@ -914,7 +923,6 @@
 %attr(755,root,root) %{_libexecdir}/%{name}/grant_sqlite3_privileges
 %attr(755,root,root) %{_libexecdir}/%{name}/make_sqlite3_tables
 %attr(755,root,root) %{_libexecdir}/%{name}/update_sqlite3_*
-%attr(755,root,root) %{_libexecdir}/%{name}/update_sqlite_*
 %attr(755,root,root) %{_libdir}/libbacsql-sqlite3-5*.so
 
 %ghost %attr(755,root,root) %{_libdir}/libbacsql-5*.so
@@ -945,7 +953,6 @@
 %attr(755,root,root) %{_libexecdir}/%{name}/grant_sqlite3_privileges
 %attr(755,root,root) %{_libexecdir}/%{name}/make_sqlite3_tables
 %attr(755,root,root) %{_libexecdir}/%{name}/update_sqlite3_*
-%attr(755,root,root) %{_libexecdir}/%{name}/update_sqlite_*
 %attr(755,root,root) %{_libdir}/libbacsql-dbi-5*.so
 
 %ghost %attr(755,root,root) %{_libdir}/libbacsql-5*.so
@@ -1055,6 +1062,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.152  2010/10/04 14:18:59  glen
+- install and package upgrade scripts from 2.0.x database (version 10); rel 4
+
 Revision 1.151  2010/10/04 14:04:48  glen
 - fix %banner
 
================================================================

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