Move sqlite install dir and remove readline dependency.

git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@2005 91ce42f0-d328-0410-95d8-f526ca767f89

diff --git a/bacula/platforms/mandrake/bacula.spec.in b/bacula/platforms/mandrake/bacula.spec.in
index 3374e8d0a78bece689c60ed759a394913cdda4b4..a739e2dd460347041d600fce61b2f73306c5fe49 100644 (file)
--- a/bacula/platforms/mandrake/bacula.spec.in
+++ b/bacula/platforms/mandrake/bacula.spec.in
@@ -7,7 +7,7 @@
 %define depkgs ../depkgs
 %define depkgs_version 29Oct04
 %define tomsrtbt tomsrtbt-2.0.103
-%define sqlite_bindir /usr/lib/sqlite
+%define sqlite_bindir /usr/lib/bacula/sqlite
 %define working_dir /var/bacula
 %define daemon_user root
 %define daemon_group bacula
@@ -115,7 +115,7 @@ URL: http://www.bacula.org/
 Vendor: The Bacula Team
 Distribution: %{_dist}
 Packager: D. Scott Barninger <barninger@fairfieldcomputers.com>
-BuildRequires: readline-devel, atk-devel, ncurses-devel, pango-devel, perl
+BuildRequires: atk-devel, ncurses-devel, pango-devel, perl
 BuildRequires: libstdc++-devel, libxml2-devel, zlib-devel, pkgconfig
 %if %{rh7}
 BuildRequires: libtermcap-devel
@@ -236,10 +236,11 @@ Summary: Bacula - The Network Backup Solution
 Group: System Environment/Daemons
 Provides: bacula-dir, bacula-sd, bacula-fd, bacula-server
 Conflicts: bacula-client
-Requires: readline, ncurses, libstdc++, zlib
-%if %{sqlite}
-Conflicts: sqlite, sqlite-tools
-%endif
+Requires: ncurses, libstdc++, zlib
+# sqlite binary now installed to /usr/lib/bacula/sqlite
+#%if %{sqlite}
+#Conflicts: sqlite, sqlite-tools
+#%endif
 
 %if %{rh7}
 Requires: glibc >= 2.2
@@ -324,7 +325,7 @@ This build incorporates sqlite as the catalog database, statically compiled.
 Summary: Bacula - The Network Backup Solution
 Group: System Environment/Daemons
 Provides: bacula-fd
-Requires: readline, libstdc++, zlib
+Requires: libstdc++, zlib
 
 %if %{rh7}
 Requires: glibc >= 2.2
@@ -415,7 +416,7 @@ database.
 %package gconsole
 Summary: Bacula - The Network Backup Solution
 Group: System Environment/Daemons
-Requires: readline, atk, libstdc++, zlib, pango, libxml2, bacula-fd
+Requires: atk, libstdc++, zlib, pango, libxml2, bacula-fd
 
 %if %{rh7}
 Requires: gtk+ >= 1.2
@@ -1272,6 +1273,9 @@ echo "The database update scripts were installed to /etc/bacula/updatedb"
 
 
 %changelog
+* Sat May 07 2005 D. Scott Barninger <barninger@fairfieldcomputers.com>
+- move sqlite installation bindir to /usr/lib/bacula/sqlite and remove
+- conflict with sqlite packages. remove readline dependency.
 * Sun Apr 17 2005 D. Scott Barninger <barninger@fairfieldcomputers.com>
 - release 1.36.3 update docs
 * Tue Apr 05 2005 D. Scott Barninger <barninger@fairfieldcomputers.com>

diff --git a/bacula/platforms/redhat/bacula.spec.in b/bacula/platforms/redhat/bacula.spec.in
index 3374e8d0a78bece689c60ed759a394913cdda4b4..a739e2dd460347041d600fce61b2f73306c5fe49 100644 (file)
--- a/bacula/platforms/redhat/bacula.spec.in
+++ b/bacula/platforms/redhat/bacula.spec.in
@@ -7,7 +7,7 @@
 %define depkgs ../depkgs
 %define depkgs_version 29Oct04
 %define tomsrtbt tomsrtbt-2.0.103
-%define sqlite_bindir /usr/lib/sqlite
+%define sqlite_bindir /usr/lib/bacula/sqlite
 %define working_dir /var/bacula
 %define daemon_user root
 %define daemon_group bacula
@@ -115,7 +115,7 @@ URL: http://www.bacula.org/
 Vendor: The Bacula Team
 Distribution: %{_dist}
 Packager: D. Scott Barninger <barninger@fairfieldcomputers.com>
-BuildRequires: readline-devel, atk-devel, ncurses-devel, pango-devel, perl
+BuildRequires: atk-devel, ncurses-devel, pango-devel, perl
 BuildRequires: libstdc++-devel, libxml2-devel, zlib-devel, pkgconfig
 %if %{rh7}
 BuildRequires: libtermcap-devel
@@ -236,10 +236,11 @@ Summary: Bacula - The Network Backup Solution
 Group: System Environment/Daemons
 Provides: bacula-dir, bacula-sd, bacula-fd, bacula-server
 Conflicts: bacula-client
-Requires: readline, ncurses, libstdc++, zlib
-%if %{sqlite}
-Conflicts: sqlite, sqlite-tools
-%endif
+Requires: ncurses, libstdc++, zlib
+# sqlite binary now installed to /usr/lib/bacula/sqlite
+#%if %{sqlite}
+#Conflicts: sqlite, sqlite-tools
+#%endif
 
 %if %{rh7}
 Requires: glibc >= 2.2
@@ -324,7 +325,7 @@ This build incorporates sqlite as the catalog database, statically compiled.
 Summary: Bacula - The Network Backup Solution
 Group: System Environment/Daemons
 Provides: bacula-fd
-Requires: readline, libstdc++, zlib
+Requires: libstdc++, zlib
 
 %if %{rh7}
 Requires: glibc >= 2.2
@@ -415,7 +416,7 @@ database.
 %package gconsole
 Summary: Bacula - The Network Backup Solution
 Group: System Environment/Daemons
-Requires: readline, atk, libstdc++, zlib, pango, libxml2, bacula-fd
+Requires: atk, libstdc++, zlib, pango, libxml2, bacula-fd
 
 %if %{rh7}
 Requires: gtk+ >= 1.2
@@ -1272,6 +1273,9 @@ echo "The database update scripts were installed to /etc/bacula/updatedb"
 
 
 %changelog
+* Sat May 07 2005 D. Scott Barninger <barninger@fairfieldcomputers.com>
+- move sqlite installation bindir to /usr/lib/bacula/sqlite and remove
+- conflict with sqlite packages. remove readline dependency.
 * Sun Apr 17 2005 D. Scott Barninger <barninger@fairfieldcomputers.com>
 - release 1.36.3 update docs
 * Tue Apr 05 2005 D. Scott Barninger <barninger@fairfieldcomputers.com>

diff --git a/bacula/platforms/suse/bacula.spec.in b/bacula/platforms/suse/bacula.spec.in
index 3374e8d0a78bece689c60ed759a394913cdda4b4..a739e2dd460347041d600fce61b2f73306c5fe49 100644 (file)
--- a/bacula/platforms/suse/bacula.spec.in
+++ b/bacula/platforms/suse/bacula.spec.in
@@ -7,7 +7,7 @@
 %define depkgs ../depkgs
 %define depkgs_version 29Oct04
 %define tomsrtbt tomsrtbt-2.0.103
-%define sqlite_bindir /usr/lib/sqlite
+%define sqlite_bindir /usr/lib/bacula/sqlite
 %define working_dir /var/bacula
 %define daemon_user root
 %define daemon_group bacula
@@ -115,7 +115,7 @@ URL: http://www.bacula.org/
 Vendor: The Bacula Team
 Distribution: %{_dist}
 Packager: D. Scott Barninger <barninger@fairfieldcomputers.com>
-BuildRequires: readline-devel, atk-devel, ncurses-devel, pango-devel, perl
+BuildRequires: atk-devel, ncurses-devel, pango-devel, perl
 BuildRequires: libstdc++-devel, libxml2-devel, zlib-devel, pkgconfig
 %if %{rh7}
 BuildRequires: libtermcap-devel
@@ -236,10 +236,11 @@ Summary: Bacula - The Network Backup Solution
 Group: System Environment/Daemons
 Provides: bacula-dir, bacula-sd, bacula-fd, bacula-server
 Conflicts: bacula-client
-Requires: readline, ncurses, libstdc++, zlib
-%if %{sqlite}
-Conflicts: sqlite, sqlite-tools
-%endif
+Requires: ncurses, libstdc++, zlib
+# sqlite binary now installed to /usr/lib/bacula/sqlite
+#%if %{sqlite}
+#Conflicts: sqlite, sqlite-tools
+#%endif
 
 %if %{rh7}
 Requires: glibc >= 2.2
@@ -324,7 +325,7 @@ This build incorporates sqlite as the catalog database, statically compiled.
 Summary: Bacula - The Network Backup Solution
 Group: System Environment/Daemons
 Provides: bacula-fd
-Requires: readline, libstdc++, zlib
+Requires: libstdc++, zlib
 
 %if %{rh7}
 Requires: glibc >= 2.2
@@ -415,7 +416,7 @@ database.
 %package gconsole
 Summary: Bacula - The Network Backup Solution
 Group: System Environment/Daemons
-Requires: readline, atk, libstdc++, zlib, pango, libxml2, bacula-fd
+Requires: atk, libstdc++, zlib, pango, libxml2, bacula-fd
 
 %if %{rh7}
 Requires: gtk+ >= 1.2
@@ -1272,6 +1273,9 @@ echo "The database update scripts were installed to /etc/bacula/updatedb"
 
 
 %changelog
+* Sat May 07 2005 D. Scott Barninger <barninger@fairfieldcomputers.com>
+- move sqlite installation bindir to /usr/lib/bacula/sqlite and remove
+- conflict with sqlite packages. remove readline dependency.
 * Sun Apr 17 2005 D. Scott Barninger <barninger@fairfieldcomputers.com>
 - release 1.36.3 update docs
 * Tue Apr 05 2005 D. Scott Barninger <barninger@fairfieldcomputers.com>

diff --git a/bacula/src/cats/create_sqlite_database.in.patch b/bacula/src/cats/create_sqlite_database.in.patch
index 85d2dcbe8c56e8d829d491aa1a4fbe7f53ad2df0..0469756f8e61bc753d503ae3caaf01ad4cd11351 100644 (file)
--- a/bacula/src/cats/create_sqlite_database.in.patch
+++ b/bacula/src/cats/create_sqlite_database.in.patch
@@ -1,4 +1,4 @@
 5c5
 < bindir=@SQL_BINDIR@
 ---
-> bindir=/usr/lib/sqlite
+> bindir=/usr/lib/bacula/sqlite

diff --git a/bacula/src/cats/make_catalog_backup.in.patch b/bacula/src/cats/make_catalog_backup.in.patch
index 99ea7a320845ee11234b87e76a91e76f9094fd21..68e12c51c907f2e7b76e0fb41f2964e513150d06 100644 (file)
--- a/bacula/src/cats/make_catalog_backup.in.patch
+++ b/bacula/src/cats/make_catalog_backup.in.patch
@@ -1,7 +1,7 @@
 15c15
 <   echo ".dump" | @SQL_BINDIR@/sqlite $1.db >$1.sql
 ---
->   echo ".dump" | /usr/lib/sqlite/sqlite $1.db >$1.sql
+>   echo ".dump" | /usr/lib/bacula/sqlite/sqlite $1.db >$1.sql
 18c18
 <     @SQL_BINDIR@/mysqldump -u $2 -f --opt $1 >$1.sql
 ---

diff --git a/bacula/src/cats/make_sqlite_tables.in.patch b/bacula/src/cats/make_sqlite_tables.in.patch
index 85d2dcbe8c56e8d829d491aa1a4fbe7f53ad2df0..0469756f8e61bc753d503ae3caaf01ad4cd11351 100644 (file)
--- a/bacula/src/cats/make_sqlite_tables.in.patch
+++ b/bacula/src/cats/make_sqlite_tables.in.patch
@@ -1,4 +1,4 @@
 5c5
 < bindir=@SQL_BINDIR@
 ---
-> bindir=/usr/lib/sqlite
+> bindir=/usr/lib/bacula/sqlite

diff --git a/bacula/src/cats/update_sqlite_tables.in.patch b/bacula/src/cats/update_sqlite_tables.in.patch
index 7dba46c15ead2e5a03905e89c5e5c4c0da182d81..3ecb408c5d67c7913ebc980a166b8eec16149d39 100644 (file)
--- a/bacula/src/cats/update_sqlite_tables.in.patch
+++ b/bacula/src/cats/update_sqlite_tables.in.patch
@@ -1,4 +1,4 @@
 11c11
 < bindir=@SQL_BINDIR@
 ---
-> bindir=/usr/lib/sqlite
+> bindir=/usr/lib/bacula/sqlite