Author: jareq Date: Fri Jan 5 17:23:43 2007 GMT
Module: SPECS Tag: HEAD
---- Log message:
- finished support for sqlite3
---- Files affected:
SPECS:
bacula.spec (1.54 -> 1.55)
---- Diffs:
================================================================
Index: SPECS/bacula.spec
diff -u SPECS/bacula.spec:1.54 SPECS/bacula.spec:1.55
--- SPECS/bacula.spec:1.54 Fri Jan 5 12:50:27 2007
+++ SPECS/bacula.spec Fri Jan 5 18:23:38 2007
@@ -166,7 +166,7 @@
up. The Catalog services permit the System Administrator or user to
quickly locate and restore any desired file, since it maintains a
record of all Volumes used, all Jobs run, and all Files saved. This
-build requires sqlite to be installed separately as the catalog
+build requires sqlite%{?with_sqlite3:3} to be installed separately as the
catalog
database.
%description dir -l pl
@@ -181,7 +181,7 @@
katalogowe umożliwiają administratorowi lub użytkownikowi szybko
zlokalizować i odtworzyć dowolny plik, ponieważ utrzymują rekord ze
wszystkimi używanymi wolumenami, uruchomionymi zadaniami i zapisanymi
-plikami. Pakiet wymaga sqlite zainstalowanego oddzielnie jako bazy
+plikami. Pakiet wymaga sqlite%{?with_sqlite3:3} zainstalowanego oddzielnie
jako bazy
danych dla katalogu.
%package console
@@ -524,7 +524,7 @@
umask 077
[ -s %{_localstatedir}/bacula.db ] && \
DB_VER=`echo "select * from Version;" | \
- %{_bindir}/sqlite %{_localstatedir}/bacula.db | tail -n 1 2>/dev/null`
+ %{_bindir}/sqlite%{?with_sqlite3:3} %{_localstatedir}/bacula.db | tail
-n 1 2>/dev/null`
if [ -z "$DB_VER" ]; then
# grant privileges and create tables
%{_libexecdir}/%{name}/grant_bacula_privileges > dev/null
@@ -532,24 +532,31 @@
%{_libexecdir}/%{name}/make_bacula_tables > dev/null
elif [ "$DB_VER" -lt "9" ]; then
echo "Backing up bacula tables"
- echo ".dump" | sqlite %{_localstatedir}/bacula.db | bzip2 >
%{_localstatedir}/bacula_backup.sql.bz2
- type=sqlite
+ echo ".dump" | sqlite%{?with_sqlite3:3} %{_localstatedir}/bacula.db |
bzip2 > %{_localstatedir}/bacula_backup.sql.bz2
echo "Upgrading bacula tables"
- if [ "$DB_VER" -lt "9" ]; then
- if [ "$DB_VER" -lt "8" ]; then
- if [ "$DB_VER" -lt "7" ]; then
- if [ "$DB_VER" -lt "6" ]; then
- if [ "$DB_VER" -lt "5" ]; then
-
%{_libexecdir}/%{name}/update_${type}_tables_4_to_5
+ %if %{with sqlite3}
+ type=sqlite3
+ if [ "$DB_VER" -lt "9" ]; then
+ %{_libexecdir}/%{name}/update_${type}_tables_8_to_9
+ fi
+ %else
+ type=sqlite
+ if [ "$DB_VER" -lt "9" ]; then
+ if [ "$DB_VER" -lt "8" ]; then
+ if [ "$DB_VER" -lt "7" ]; then
+ if [ "$DB_VER" -lt "6" ]; then
+ if [ "$DB_VER" -lt "5" ]; then
+
%{_libexecdir}/%{name}/update_${type}_tables_4_to_5
+ fi
+
%{_libexecdir}/%{name}/update_${type}_tables_5_to_6
fi
-
%{_libexecdir}/%{name}/update_${type}_tables_5_to_6
+
%{_libexecdir}/%{name}/update_${type}_tables_6_to_7
fi
-
%{_libexecdir}/%{name}/update_${type}_tables_6_to_7
+
%{_libexecdir}/%{name}/update_${type}_tables_7_to_8
fi
- %{_libexecdir}/%{name}/update_${type}_tables_7_to_8
+ %{_libexecdir}/%{name}/update_${type}_tables_8_to_9
fi
- %{_libexecdir}/%{name}/update_${type}_tables_8_to_9
- fi
+ %endif
%{_libexecdir}/%{name}/update_bacula_tables
echo "If bacula works correctly you can remove the backup file
%{_localstatedir}/bacula_backup.sql.bz2"
fi
@@ -821,6 +828,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.55 2007/01/05 17:23:38 jareq
+- finished support for sqlite3
+
Revision 1.54 2007/01/05 11:50:27 jareq
- updated patchs
- removed Source1 (actual manual pages are in Source0)
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SPECS/bacula.spec?r1=1.54&r2=1.55&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
