'[Bacula-commits] SF.net SVN: bacula: [6153] trunk/bacula/platforms'

[prev in list] [next in list] [prev in thread] [next in thread] 

List:       bacula-commits
Subject:    [Bacula-commits] SF.net SVN: bacula: [6153] trunk/bacula/platforms
From:       fleetworks () users ! sourceforge ! net
Date:       2007-12-29 15:44:49
Message-ID: E1J8drl-00046E-UE () sc8-pr-svn2 ! sourceforge ! net
[Download RAW message or body]

Revision: 6153
          http://bacula.svn.sourceforge.net/bacula/?rev=6153&view=rev
Author:   fleetworks
Date:     2007-12-29 07:44:49 -0800 (Sat, 29 Dec 2007)

Log Message:
-----------
release 2.2.7

Modified Paths:
--------------
    trunk/bacula/platforms/mandrake/bacula.spec.in
    trunk/bacula/platforms/redhat/bacula.spec.in
    trunk/bacula/platforms/suse/bacula.spec.in

Modified: trunk/bacula/platforms/mandrake/bacula.spec.in
===================================================================
--- trunk/bacula/platforms/mandrake/bacula.spec.in	2007-12-29 15:44:05 UTC (rev 6152)
+++ trunk/bacula/platforms/mandrake/bacula.spec.in	2007-12-29 15:44:49 UTC (rev 6153)
@@ -33,6 +33,7 @@
 Source2: Release_Notes-%{version}-%{release}.tar.gz
 Source3: http://www.prdownloads.sourceforge.net/bacula/%{name}-docs-%{docs_version}.tar.gz
  Source4: http://www.prdownloads.sourceforge.net/bacula/%{name}-rescue-%{_rescuever}.tar.gz
 +Source5: bacula-2.2.7-postgresql.patch
 BuildRoot: %{_tmppath}/%{name}-root
 URL: http://www.bacula.org/
 Vendor: The Bacula Team
@@ -256,6 +257,14 @@
 %define python 0
 %{?build_python:%define python 1}
 
+# specifically disallow build of mtx package if desired
+%define mtx 1
+%{?nobuild_mtx:%define mtx 0}
+
+# do we need to patch for old postgresql version?
+%define old_pgsql 0
+%{?build_old_pgsql:%define old_pgsql 1}
+
 # Mandriva somehow forces the manpage file extension to bz2 rather than gz
 %if %{mdk}
 %define manpage_ext bz2
@@ -679,7 +688,7 @@
 This build includes python scripting support.
 %endif
 
-%if ! %{client_only}
+%if ! %{client_only} && %{mtx}
 %package mtx
 Summary: Bacula - The Network Backup Solution
 Group: System Environment/Daemons
@@ -1140,7 +1149,7 @@
 %if %{sqlite}
 make sqlite3
 %endif
-%if ! %{client_only}
+%if ! %{client_only} && %{mtx}
 make mtx
 %endif
 %if %{bat}
@@ -1148,6 +1157,10 @@
 %endif
 cd ${cwd}
 
+%if %{wb3} || %{old_pgsql}
+patch -p3 src/cats/postgresql.c < %SOURCE5
+%endif
+
 # patches for the bundled sqlite scripts
 
 # patch the make_sqlite_tables script for installation bindir
@@ -1319,7 +1332,7 @@
 	mandir=$RPM_BUILD_ROOT%{_mandir} \
         install
 
-%if ! %{client_only}
+%if ! %{client_only} && %{mtx}
 cd %{depkgs}
 make \
         prefix=$RPM_BUILD_ROOT/usr \
@@ -1522,9 +1535,6 @@
 %endif
 
 # now clean up permissions that are left broken by the install
-%if ! %{client_only}
-chmod o-r $RPM_BUILD_ROOT%{script_dir}/query.sql
-%endif
 chmod o-rwx $RPM_BUILD_ROOT%{working_dir}
 %if %{gconsole} && ! %{rh8}
 chmod 755 $RPM_BUILD_ROOT/usr/sbin/bacula-tray-monitor
@@ -1686,7 +1696,9 @@
 	echo "After the upgrade is complete, restore your catalog"
 	echo "with the following commands:"
 	echo "%{script_dir}/drop_sqlite3_tables"
-	echo "%{sqlite_bindir}/sqlite3 $* bacula.db < %{working_dir}/bacula_backup.sql"
+	echo "cd %{working_dir}"
+	echo "%{sqlite_bindir}/sqlite3 $* bacula.db < bacula_backup.sql"
+	echo "chown bacula.bacula bacula.db"
 	exit 1
 fi
 # test for bacula database older than version 9 and sqlite3
@@ -1906,7 +1918,7 @@
 %endif
 
 
-%if ! %{client_only}
+%if ! %{client_only} && %{mtx}
 %files mtx
 %defattr(-,root,root)
 %attr(-, root, %{storage_daemon_group}) /usr/sbin/loaderinfo
@@ -2164,6 +2176,9 @@
 %endif
 
 %changelog
+* Fri Dec 28 2007 D. Scott Barninger <barninger@fairfieldcomputers.com>
+- add nobuild_mtx switch
+- add patch for postgresql.c for old postgresql versions
 * Sat Nov 17 2007 D. Scott Barninger <barninger@fairfieldcomputers.com>
 - switch to sqlite3
 * Sun Nov 11 2007 D. Scott Barninger <barninger@fairfieldcomputers.com>

Modified: trunk/bacula/platforms/redhat/bacula.spec.in
===================================================================
--- trunk/bacula/platforms/redhat/bacula.spec.in	2007-12-29 15:44:05 UTC (rev 6152)
+++ trunk/bacula/platforms/redhat/bacula.spec.in	2007-12-29 15:44:49 UTC (rev 6153)
@@ -33,6 +33,7 @@
 Source2: Release_Notes-%{version}-%{release}.tar.gz
 Source3: http://www.prdownloads.sourceforge.net/bacula/%{name}-docs-%{docs_version}.tar.gz
  Source4: http://www.prdownloads.sourceforge.net/bacula/%{name}-rescue-%{_rescuever}.tar.gz
 +Source5: bacula-2.2.7-postgresql.patch
 BuildRoot: %{_tmppath}/%{name}-root
 URL: http://www.bacula.org/
 Vendor: The Bacula Team
@@ -256,6 +257,14 @@
 %define python 0
 %{?build_python:%define python 1}
 
+# specifically disallow build of mtx package if desired
+%define mtx 1
+%{?nobuild_mtx:%define mtx 0}
+
+# do we need to patch for old postgresql version?
+%define old_pgsql 0
+%{?build_old_pgsql:%define old_pgsql 1}
+
 # Mandriva somehow forces the manpage file extension to bz2 rather than gz
 %if %{mdk}
 %define manpage_ext bz2
@@ -679,7 +688,7 @@
 This build includes python scripting support.
 %endif
 
-%if ! %{client_only}
+%if ! %{client_only} && %{mtx}
 %package mtx
 Summary: Bacula - The Network Backup Solution
 Group: System Environment/Daemons
@@ -1140,7 +1149,7 @@
 %if %{sqlite}
 make sqlite3
 %endif
-%if ! %{client_only}
+%if ! %{client_only} && %{mtx}
 make mtx
 %endif
 %if %{bat}
@@ -1148,6 +1157,10 @@
 %endif
 cd ${cwd}
 
+%if %{wb3} || %{old_pgsql}
+patch -p3 src/cats/postgresql.c < %SOURCE5
+%endif
+
 # patches for the bundled sqlite scripts
 
 # patch the make_sqlite_tables script for installation bindir
@@ -1319,7 +1332,7 @@
 	mandir=$RPM_BUILD_ROOT%{_mandir} \
         install
 
-%if ! %{client_only}
+%if ! %{client_only} && %{mtx}
 cd %{depkgs}
 make \
         prefix=$RPM_BUILD_ROOT/usr \
@@ -1522,9 +1535,6 @@
 %endif
 
 # now clean up permissions that are left broken by the install
-%if ! %{client_only}
-chmod o-r $RPM_BUILD_ROOT%{script_dir}/query.sql
-%endif
 chmod o-rwx $RPM_BUILD_ROOT%{working_dir}
 %if %{gconsole} && ! %{rh8}
 chmod 755 $RPM_BUILD_ROOT/usr/sbin/bacula-tray-monitor
@@ -1686,7 +1696,9 @@
 	echo "After the upgrade is complete, restore your catalog"
 	echo "with the following commands:"
 	echo "%{script_dir}/drop_sqlite3_tables"
-	echo "%{sqlite_bindir}/sqlite3 $* bacula.db < %{working_dir}/bacula_backup.sql"
+	echo "cd %{working_dir}"
+	echo "%{sqlite_bindir}/sqlite3 $* bacula.db < bacula_backup.sql"
+	echo "chown bacula.bacula bacula.db"
 	exit 1
 fi
 # test for bacula database older than version 9 and sqlite3
@@ -1906,7 +1918,7 @@
 %endif
 
 
-%if ! %{client_only}
+%if ! %{client_only} && %{mtx}
 %files mtx
 %defattr(-,root,root)
 %attr(-, root, %{storage_daemon_group}) /usr/sbin/loaderinfo
@@ -2164,6 +2176,9 @@
 %endif
 
 %changelog
+* Fri Dec 28 2007 D. Scott Barninger <barninger@fairfieldcomputers.com>
+- add nobuild_mtx switch
+- add patch for postgresql.c for old postgresql versions
 * Sat Nov 17 2007 D. Scott Barninger <barninger@fairfieldcomputers.com>
 - switch to sqlite3
 * Sun Nov 11 2007 D. Scott Barninger <barninger@fairfieldcomputers.com>

Modified: trunk/bacula/platforms/suse/bacula.spec.in
===================================================================
--- trunk/bacula/platforms/suse/bacula.spec.in	2007-12-29 15:44:05 UTC (rev 6152)
+++ trunk/bacula/platforms/suse/bacula.spec.in	2007-12-29 15:44:49 UTC (rev 6153)
@@ -33,6 +33,7 @@
 Source2: Release_Notes-%{version}-%{release}.tar.gz
 Source3: http://www.prdownloads.sourceforge.net/bacula/%{name}-docs-%{docs_version}.tar.gz
  Source4: http://www.prdownloads.sourceforge.net/bacula/%{name}-rescue-%{_rescuever}.tar.gz
 +Source5: bacula-2.2.7-postgresql.patch
 BuildRoot: %{_tmppath}/%{name}-root
 URL: http://www.bacula.org/
 Vendor: The Bacula Team
@@ -256,6 +257,14 @@
 %define python 0
 %{?build_python:%define python 1}
 
+# specifically disallow build of mtx package if desired
+%define mtx 1
+%{?nobuild_mtx:%define mtx 0}
+
+# do we need to patch for old postgresql version?
+%define old_pgsql 0
+%{?build_old_pgsql:%define old_pgsql 1}
+
 # Mandriva somehow forces the manpage file extension to bz2 rather than gz
 %if %{mdk}
 %define manpage_ext bz2
@@ -679,7 +688,7 @@
 This build includes python scripting support.
 %endif
 
-%if ! %{client_only}
+%if ! %{client_only} && %{mtx}
 %package mtx
 Summary: Bacula - The Network Backup Solution
 Group: System Environment/Daemons
@@ -1140,7 +1149,7 @@
 %if %{sqlite}
 make sqlite3
 %endif
-%if ! %{client_only}
+%if ! %{client_only} && %{mtx}
 make mtx
 %endif
 %if %{bat}
@@ -1148,6 +1157,10 @@
 %endif
 cd ${cwd}
 
+%if %{wb3} || %{old_pgsql}
+patch -p3 src/cats/postgresql.c < %SOURCE5
+%endif
+
 # patches for the bundled sqlite scripts
 
 # patch the make_sqlite_tables script for installation bindir
@@ -1319,7 +1332,7 @@
 	mandir=$RPM_BUILD_ROOT%{_mandir} \
         install
 
-%if ! %{client_only}
+%if ! %{client_only} && %{mtx}
 cd %{depkgs}
 make \
         prefix=$RPM_BUILD_ROOT/usr \
@@ -1522,9 +1535,6 @@
 %endif
 
 # now clean up permissions that are left broken by the install
-%if ! %{client_only}
-chmod o-r $RPM_BUILD_ROOT%{script_dir}/query.sql
-%endif
 chmod o-rwx $RPM_BUILD_ROOT%{working_dir}
 %if %{gconsole} && ! %{rh8}
 chmod 755 $RPM_BUILD_ROOT/usr/sbin/bacula-tray-monitor
@@ -1686,7 +1696,9 @@
 	echo "After the upgrade is complete, restore your catalog"
 	echo "with the following commands:"
 	echo "%{script_dir}/drop_sqlite3_tables"
-	echo "%{sqlite_bindir}/sqlite3 $* bacula.db < %{working_dir}/bacula_backup.sql"
+	echo "cd %{working_dir}"
+	echo "%{sqlite_bindir}/sqlite3 $* bacula.db < bacula_backup.sql"
+	echo "chown bacula.bacula bacula.db"
 	exit 1
 fi
 # test for bacula database older than version 9 and sqlite3
@@ -1906,7 +1918,7 @@
 %endif
 
 
-%if ! %{client_only}
+%if ! %{client_only} && %{mtx}
 %files mtx
 %defattr(-,root,root)
 %attr(-, root, %{storage_daemon_group}) /usr/sbin/loaderinfo
@@ -2164,6 +2176,9 @@
 %endif
 
 %changelog
+* Fri Dec 28 2007 D. Scott Barninger <barninger@fairfieldcomputers.com>
+- add nobuild_mtx switch
+- add patch for postgresql.c for old postgresql versions
 * Sat Nov 17 2007 D. Scott Barninger <barninger@fairfieldcomputers.com>
 - switch to sqlite3
 * Sun Nov 11 2007 D. Scott Barninger <barninger@fairfieldcomputers.com>


This was sent by the SourceForge.net collaborative development platform, the world's \
largest Open Source development site.

-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2005.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Bacula-commits mailing list
Bacula-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/bacula-commits


[prev in list] [next in list] [prev in thread] [next in thread]
Configure | About | News | Add a list | Sponsored by KoreLogic