Fix SuSE LSB init info, misc rpm fixes

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

diff --git a/bacula/platforms/mandrake/bacula.spec.in b/bacula/platforms/mandrake/bacula.spec.in
index 7fcb127b0c7603c4166da603b647de9cb57e595e..ff99153541d1c1773d88ef3bb5809f5e9224bd80 100644 (file)
--- a/bacula/platforms/mandrake/bacula.spec.in
+++ b/bacula/platforms/mandrake/bacula.spec.in
@@ -84,6 +84,7 @@ BuildRequires: freetype-devel
 %endif
 %if %{su9}
 BuildRequires: termcap
+BuildRequires: libgnome >= 2.0
 BuildRequires: gtk2-devel >= 2.0
 BuildRequires: libgnomeui-devel >= 2.0
 BuildRequires: glibc-devel >= 2.3
@@ -332,6 +333,7 @@ Requires: freetype
 %endif
 %if %{su9}
 Requires: gtk2 >= 2.0
+Requires: libgnome >= 2.0
 Requires: libgnomeui >= 2.0
 Requires: glibc >= 2.3
 Requires: ORBit2
@@ -389,9 +391,10 @@ server packages.
 
 %prep
 
-%setup -b 1
-%setup -b 2
-%setup -b 3
+%setup
+%setup -T -D -b 1
+%setup -T -D -b 2
+%setup -T -D -b 3
 
 %build
 
@@ -421,6 +424,11 @@ patch src/cats/make_catalog_backup.in src/cats/make_catalog_backup.in.patch
 # patch the update_sqlite_tables script for installation bindir
 patch src/cats/update_sqlite_tables.in src/cats/update_sqlite_tables.in.patch
 
+# patch the bacula-dir init script to remove sqlite service
+%if %{sqlite} && %{su9}
+patch platforms/suse/bacula-dir.in platforms/suse/bacula-dir-suse-sqlite.patch
+%endif
+
 %configure \
         --prefix=/usr \
         --sbindir=/usr/sbin \
@@ -436,7 +444,7 @@ patch src/cats/update_sqlite_tables.in src/cats/update_sqlite_tables.in.patch
         --with-mysql \
 %endif
 %if %{sqlite}
-        --with-sqlite=${cwd}/../depkgs/sqlite \
+        --with-sqlite=${cwd}/%{depkgs}/sqlite \
 %endif
 %if %{postgresql}
         --with-postgresql \
@@ -567,9 +575,9 @@ cp -p scripts/bacula-tray-monitor.desktop $RPM_BUILD_ROOT/usr/share/applications
 
 # install sqlite
 %if %{sqlite}
-cp -p ../depkgs/sqlite/sqlite $RPM_BUILD_ROOT%{sqlite_bindir}/sqlite
-cp -p ../depkgs/sqlite/sqlite.h $RPM_BUILD_ROOT%{sqlite_bindir}/sqlite.h
-cp -p ../depkgs/sqlite/libsqlite.a $RPM_BUILD_ROOT%{sqlite_bindir}/libsqlite.a
+cp -p %{depkgs}/sqlite/sqlite $RPM_BUILD_ROOT%{sqlite_bindir}/sqlite
+cp -p %{depkgs}/sqlite/sqlite.h $RPM_BUILD_ROOT%{sqlite_bindir}/sqlite.h
+cp -p %{depkgs}/sqlite/libsqlite.a $RPM_BUILD_ROOT%{sqlite_bindir}/libsqlite.a
 %endif
 
 # install the logrotate file
@@ -1101,6 +1109,8 @@ echo "The database update scripts were installed to /etc/bacula/updatedb"
 
 
 %changelog
+* Sun Oct 31 2004 D. Scott Barninger <barninger at fairfieldcomputers.com>
+- misc fixes from 1.36.0 suse feedback
 * Fri Oct 22 2004 D. Scott Barninger <barninger at fairfieldcomputers.com>
 - remove tray-monitor from RH8 build
 - fix permissions on tray-monitor files

diff --git a/bacula/platforms/redhat/bacula.spec.in b/bacula/platforms/redhat/bacula.spec.in
index 7fcb127b0c7603c4166da603b647de9cb57e595e..ff99153541d1c1773d88ef3bb5809f5e9224bd80 100644 (file)
--- a/bacula/platforms/redhat/bacula.spec.in
+++ b/bacula/platforms/redhat/bacula.spec.in
@@ -84,6 +84,7 @@ BuildRequires: freetype-devel
 %endif
 %if %{su9}
 BuildRequires: termcap
+BuildRequires: libgnome >= 2.0
 BuildRequires: gtk2-devel >= 2.0
 BuildRequires: libgnomeui-devel >= 2.0
 BuildRequires: glibc-devel >= 2.3
@@ -332,6 +333,7 @@ Requires: freetype
 %endif
 %if %{su9}
 Requires: gtk2 >= 2.0
+Requires: libgnome >= 2.0
 Requires: libgnomeui >= 2.0
 Requires: glibc >= 2.3
 Requires: ORBit2
@@ -389,9 +391,10 @@ server packages.
 
 %prep
 
-%setup -b 1
-%setup -b 2
-%setup -b 3
+%setup
+%setup -T -D -b 1
+%setup -T -D -b 2
+%setup -T -D -b 3
 
 %build
 
@@ -421,6 +424,11 @@ patch src/cats/make_catalog_backup.in src/cats/make_catalog_backup.in.patch
 # patch the update_sqlite_tables script for installation bindir
 patch src/cats/update_sqlite_tables.in src/cats/update_sqlite_tables.in.patch
 
+# patch the bacula-dir init script to remove sqlite service
+%if %{sqlite} && %{su9}
+patch platforms/suse/bacula-dir.in platforms/suse/bacula-dir-suse-sqlite.patch
+%endif
+
 %configure \
         --prefix=/usr \
         --sbindir=/usr/sbin \
@@ -436,7 +444,7 @@ patch src/cats/update_sqlite_tables.in src/cats/update_sqlite_tables.in.patch
         --with-mysql \
 %endif
 %if %{sqlite}
-        --with-sqlite=${cwd}/../depkgs/sqlite \
+        --with-sqlite=${cwd}/%{depkgs}/sqlite \
 %endif
 %if %{postgresql}
         --with-postgresql \
@@ -567,9 +575,9 @@ cp -p scripts/bacula-tray-monitor.desktop $RPM_BUILD_ROOT/usr/share/applications
 
 # install sqlite
 %if %{sqlite}
-cp -p ../depkgs/sqlite/sqlite $RPM_BUILD_ROOT%{sqlite_bindir}/sqlite
-cp -p ../depkgs/sqlite/sqlite.h $RPM_BUILD_ROOT%{sqlite_bindir}/sqlite.h
-cp -p ../depkgs/sqlite/libsqlite.a $RPM_BUILD_ROOT%{sqlite_bindir}/libsqlite.a
+cp -p %{depkgs}/sqlite/sqlite $RPM_BUILD_ROOT%{sqlite_bindir}/sqlite
+cp -p %{depkgs}/sqlite/sqlite.h $RPM_BUILD_ROOT%{sqlite_bindir}/sqlite.h
+cp -p %{depkgs}/sqlite/libsqlite.a $RPM_BUILD_ROOT%{sqlite_bindir}/libsqlite.a
 %endif
 
 # install the logrotate file
@@ -1101,6 +1109,8 @@ echo "The database update scripts were installed to /etc/bacula/updatedb"
 
 
 %changelog
+* Sun Oct 31 2004 D. Scott Barninger <barninger at fairfieldcomputers.com>
+- misc fixes from 1.36.0 suse feedback
 * Fri Oct 22 2004 D. Scott Barninger <barninger at fairfieldcomputers.com>
 - remove tray-monitor from RH8 build
 - fix permissions on tray-monitor files

diff --git a/bacula/platforms/suse/bacula-dir-suse-sqlite.patch b/bacula/platforms/suse/bacula-dir-suse-sqlite.patch
new file mode 100644 (file)
index 0000000..44c3f66
--- /dev/null
+++ b/bacula/platforms/suse/bacula-dir-suse-sqlite.patch
@@ -0,0 +1,16 @@
+--- bacula-1.36.0/platforms/suse/bacula-dir.in 2004-10-19 09:35:09.000000000 -0400
++++ bacula-1.36.0/platforms/suse/bacula-dir.sqlite.in  2004-10-31 09:17:40.000000000 -0500
+@@ -11,10 +11,11 @@
+ # Added rc.status functions 3/13/2004 D. Scott Barninger <barninger at fairfieldcomputers.com>
+ # Added LSB init info 10/14/2004 D. Scott Barninger <barninger at fairfieldcomputers.com>
+ #
++# Configured for @DB_NAME@ support
+ ### BEGIN INIT INFO
+ # Provides:                   bacula-dir
+-# Required-Start:             $local_fs $network @DB_NAME@
+-# Required-Stop:              $local_fs $network @DB_NAME@
++# Required-Start:             $local_fs $network
++# Required-Stop:              $local_fs $network
+ # Default-Start:              3 5
+ # Default-Stop:       0 1 2 6
+ # Short-Description:  bacula director

diff --git a/bacula/platforms/suse/bacula-fd.in b/bacula/platforms/suse/bacula-fd.in
index d8363de5f3b0e7a6171ca65d20641082e818648d..547acd20bcac8a430f2fc584f491762a6987cf01 100755 (executable)
--- a/bacula/platforms/suse/bacula-fd.in
+++ b/bacula/platforms/suse/bacula-fd.in
@@ -13,8 +13,8 @@
 #
 ### BEGIN INIT INFO
 # Provides:                    bacula-fd
-# Required-Start:              $local_fs $network @DB_NAME@
-# Required-Stop:               $local_fs $network @DB_NAME@
+# Required-Start:              $local_fs $network
+# Required-Stop:               $local_fs $network
 # Default-Start:               3 5
 # Default-Stop:        0 1 2 6
 # Short-Description:   bacula file daemon

diff --git a/bacula/platforms/suse/bacula-sd.in b/bacula/platforms/suse/bacula-sd.in
index e772cb79e2df0ef432c328a4e0904d9afab745ef..a6093db23b803d77e18629ad16def638d7fcaf12 100755 (executable)
--- a/bacula/platforms/suse/bacula-sd.in
+++ b/bacula/platforms/suse/bacula-sd.in
@@ -13,8 +13,8 @@
 #
 ### BEGIN INIT INFO
 # Provides:                    bacula-sd
-# Required-Start:              $local_fs $network @DB_NAME@
-# Required-Stop:               $local_fs $network @DB_NAME@
+# Required-Start:              $local_fs $network
+# Required-Stop:               $local_fs $network
 # Default-Start:               3 5
 # Default-Stop:        0 1 2 6
 # Short-Description:   bacula storage daemon

diff --git a/bacula/platforms/suse/bacula.spec.in b/bacula/platforms/suse/bacula.spec.in
index 7fcb127b0c7603c4166da603b647de9cb57e595e..ff99153541d1c1773d88ef3bb5809f5e9224bd80 100644 (file)
--- a/bacula/platforms/suse/bacula.spec.in
+++ b/bacula/platforms/suse/bacula.spec.in
@@ -84,6 +84,7 @@ BuildRequires: freetype-devel
 %endif
 %if %{su9}
 BuildRequires: termcap
+BuildRequires: libgnome >= 2.0
 BuildRequires: gtk2-devel >= 2.0
 BuildRequires: libgnomeui-devel >= 2.0
 BuildRequires: glibc-devel >= 2.3
@@ -332,6 +333,7 @@ Requires: freetype
 %endif
 %if %{su9}
 Requires: gtk2 >= 2.0
+Requires: libgnome >= 2.0
 Requires: libgnomeui >= 2.0
 Requires: glibc >= 2.3
 Requires: ORBit2
@@ -389,9 +391,10 @@ server packages.
 
 %prep
 
-%setup -b 1
-%setup -b 2
-%setup -b 3
+%setup
+%setup -T -D -b 1
+%setup -T -D -b 2
+%setup -T -D -b 3
 
 %build
 
@@ -421,6 +424,11 @@ patch src/cats/make_catalog_backup.in src/cats/make_catalog_backup.in.patch
 # patch the update_sqlite_tables script for installation bindir
 patch src/cats/update_sqlite_tables.in src/cats/update_sqlite_tables.in.patch
 
+# patch the bacula-dir init script to remove sqlite service
+%if %{sqlite} && %{su9}
+patch platforms/suse/bacula-dir.in platforms/suse/bacula-dir-suse-sqlite.patch
+%endif
+
 %configure \
         --prefix=/usr \
         --sbindir=/usr/sbin \
@@ -436,7 +444,7 @@ patch src/cats/update_sqlite_tables.in src/cats/update_sqlite_tables.in.patch
         --with-mysql \
 %endif
 %if %{sqlite}
-        --with-sqlite=${cwd}/../depkgs/sqlite \
+        --with-sqlite=${cwd}/%{depkgs}/sqlite \
 %endif
 %if %{postgresql}
         --with-postgresql \
@@ -567,9 +575,9 @@ cp -p scripts/bacula-tray-monitor.desktop $RPM_BUILD_ROOT/usr/share/applications
 
 # install sqlite
 %if %{sqlite}
-cp -p ../depkgs/sqlite/sqlite $RPM_BUILD_ROOT%{sqlite_bindir}/sqlite
-cp -p ../depkgs/sqlite/sqlite.h $RPM_BUILD_ROOT%{sqlite_bindir}/sqlite.h
-cp -p ../depkgs/sqlite/libsqlite.a $RPM_BUILD_ROOT%{sqlite_bindir}/libsqlite.a
+cp -p %{depkgs}/sqlite/sqlite $RPM_BUILD_ROOT%{sqlite_bindir}/sqlite
+cp -p %{depkgs}/sqlite/sqlite.h $RPM_BUILD_ROOT%{sqlite_bindir}/sqlite.h
+cp -p %{depkgs}/sqlite/libsqlite.a $RPM_BUILD_ROOT%{sqlite_bindir}/libsqlite.a
 %endif
 
 # install the logrotate file
@@ -1101,6 +1109,8 @@ echo "The database update scripts were installed to /etc/bacula/updatedb"
 
 
 %changelog
+* Sun Oct 31 2004 D. Scott Barninger <barninger at fairfieldcomputers.com>
+- misc fixes from 1.36.0 suse feedback
 * Fri Oct 22 2004 D. Scott Barninger <barninger at fairfieldcomputers.com>
 - remove tray-monitor from RH8 build
 - fix permissions on tray-monitor files