From 0cae3de338979c2a78aa78539dbda34daf29ef62 Mon Sep 17 00:00:00 2001 From: Scott Barninger Date: Sat, 7 May 2005 14:33:14 +0000 Subject: [PATCH] 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 --- bacula/platforms/mandrake/bacula.spec.in | 20 +++++++++++-------- bacula/platforms/redhat/bacula.spec.in | 20 +++++++++++-------- bacula/platforms/suse/bacula.spec.in | 20 +++++++++++-------- .../src/cats/create_sqlite_database.in.patch | 2 +- bacula/src/cats/make_catalog_backup.in.patch | 2 +- bacula/src/cats/make_sqlite_tables.in.patch | 2 +- bacula/src/cats/update_sqlite_tables.in.patch | 2 +- 7 files changed, 40 insertions(+), 28 deletions(-) diff --git a/bacula/platforms/mandrake/bacula.spec.in b/bacula/platforms/mandrake/bacula.spec.in index 3374e8d0a7..a739e2dd46 100644 --- 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 -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 +- 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 - release 1.36.3 update docs * Tue Apr 05 2005 D. Scott Barninger diff --git a/bacula/platforms/redhat/bacula.spec.in b/bacula/platforms/redhat/bacula.spec.in index 3374e8d0a7..a739e2dd46 100644 --- 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 -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 +- 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 - release 1.36.3 update docs * Tue Apr 05 2005 D. Scott Barninger diff --git a/bacula/platforms/suse/bacula.spec.in b/bacula/platforms/suse/bacula.spec.in index 3374e8d0a7..a739e2dd46 100644 --- 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 -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 +- 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 - release 1.36.3 update docs * Tue Apr 05 2005 D. Scott Barninger diff --git a/bacula/src/cats/create_sqlite_database.in.patch b/bacula/src/cats/create_sqlite_database.in.patch index 85d2dcbe8c..0469756f8e 100644 --- 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 99ea7a3208..68e12c51c9 100644 --- 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 85d2dcbe8c..0469756f8e 100644 --- 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 7dba46c15e..3ecb408c5d 100644 --- 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 -- 2.39.5