From 3afc46b96a460a90df292777cff43dd26beb3163 Mon Sep 17 00:00:00 2001
From: Scott Barninger <scott@barninger.com>
Date: Sun, 25 Jun 2006 15:41:23 +0000
Subject: [PATCH] Add mysql5 tag, remove patch info left in on last commit.

git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@3076 91ce42f0-d328-0410-95d8-f526ca767f89
---
 bacula/platforms/mandrake/bacula.spec.in | 27 ++++++++++++++++++------
 bacula/platforms/redhat/bacula.spec.in   | 27 ++++++++++++++++++------
 bacula/platforms/suse/bacula.spec.in     | 27 ++++++++++++++++++------
 3 files changed, 63 insertions(+), 18 deletions(-)

diff --git a/bacula/platforms/mandrake/bacula.spec.in b/bacula/platforms/mandrake/bacula.spec.in
index 89e6d83299..2352b0148e 100644
--- a/bacula/platforms/mandrake/bacula.spec.in
+++ b/bacula/platforms/mandrake/bacula.spec.in
@@ -82,10 +82,15 @@ exit 1
 %define mysql 0
 %{?build_mysql:%define mysql 1}
 # if using mysql 4.x define this and mysql above
-# currently: Mandrake 10.1, SuSE 9.x & 10.x, RHEL4 and Fedora Core 4 & 5
+# currently: Mandrake 10.1, SuSE 9.x & 10.0, RHEL4 and Fedora Core 4
 %define mysql4 0
 %{?build_mysql4:%define mysql4 1}
 %{?build_mysql4:%define mysql 1}
+# if using mysql 5.x define this and mysql above
+# currently: SuSE 10.1 and Fedora Core 5
+%define mysql5 0
+%{?build_mysql5:%define mysql5 1}
+%{?build_mysql5:%define mysql 1}
 %define sqlite 0
 %{?build_sqlite:%define sqlite 1}
 %define postgresql 0
@@ -169,7 +174,6 @@ Source1: http://www.prdownloads.sourceforge.net/bacula/depkgs-%{depkgs_version}.
 Source2: Release_Notes-%{version}-%{release}.tar.gz
 Source3: http://www.prdownloads.sourceforge.net/bacula/%{name}-docs-%{version}.tar.gz
 Source4: http://www.prdownloads.sourceforge.net/bacula/%{name}-rescue-%{_rescuever}.tar.gz
-Patch0: bacula-1.38.9-gnome2console.patch
 BuildRoot: %{_tmppath}/%{name}-root
 URL: http://www.bacula.org/
 Vendor: The Bacula Team
@@ -315,7 +319,7 @@ BuildRequires: linc-devel
 BuildRequires: freetype-devel
 %endif
 
-%if %{mysql} && ! %{mysql4}
+%if %{mysql} && ! %{mysql4} && ! %{mysql5}
 BuildRequires: mysql-devel >= 3.23
 %endif
 
@@ -323,6 +327,10 @@ BuildRequires: mysql-devel >= 3.23
 BuildRequires: mysql-devel >= 4.0
 %endif
 
+%if %{mysql} && %{mysql5}
+BuildRequires: mysql-devel >= 5.0
+%endif
+
 %if %{postgresql} && %{wb3}
 BuildRequires: rh-postgresql-devel >= 7
 %endif
@@ -380,7 +388,7 @@ Requires: glibc >= 2.4
 Requires: libtermcap
 %endif
 
-%if %{mysql} && ! %{su9} && ! %{mdk} && ! %{mysql4}
+%if %{mysql} && ! %{su9} && ! %{mdk} && ! %{mysql4} && ! %{mysql5}
 Requires: mysql >= 3.23
 Requires: mysql-server >= 3.23
 %endif
@@ -388,6 +396,10 @@ Requires: mysql-server >= 3.23
 Requires: mysql >= 4.0
 Requires: mysql-server >= 4.0
 %endif
+%if %{mysql} && ! %{su9} && ! %{su10} && ! %{mdk} && %{mysql5}
+Requires: mysql >= 5.0
+Requires: mysql-server >= 5.0
+%endif
 
 %if %{mysql} && %{su9} && ! %{mysql4}
 Requires: mysql >= 3.23
@@ -401,6 +413,10 @@ Requires: mysql-client >= 4.0
 Requires: mysql >= 4.0
 Requires: mysql-client >= 4.0
 %endif
+%if %{mysql} && %{su10} && %{mysql5}
+Requires: mysql >= 5.0
+Requires: mysql-client >= 5.0
+%endif
 
 %if %{mysql} && %{mdk} && ! %{mysql4}
 Requires: mysql >= 3.23
@@ -700,8 +716,6 @@ server packages.
 %setup -T -D -b 3
 %setup -T -D -b 4
 
-%patch -p0
-
 %build
 
 %if %{su9} || %{su10}
@@ -1479,6 +1493,7 @@ fi
 %changelog
 * Sun Jun 25 2006 D. Scott Barninger <barninger@fairfieldcomputers.com>
 - update depkgs to 25Jun06
+- add mysql5 build tag
 * Mon Jun 12 2006 D. Scott Barninger <barninger@fairfieldcomputers.com>
 - 1.38.10 bump rescue version
 * Sun Jun 03 2006 D. Scott Barninger <barninger@fairfieldcomputers.com>
diff --git a/bacula/platforms/redhat/bacula.spec.in b/bacula/platforms/redhat/bacula.spec.in
index 89e6d83299..2352b0148e 100644
--- a/bacula/platforms/redhat/bacula.spec.in
+++ b/bacula/platforms/redhat/bacula.spec.in
@@ -82,10 +82,15 @@ exit 1
 %define mysql 0
 %{?build_mysql:%define mysql 1}
 # if using mysql 4.x define this and mysql above
-# currently: Mandrake 10.1, SuSE 9.x & 10.x, RHEL4 and Fedora Core 4 & 5
+# currently: Mandrake 10.1, SuSE 9.x & 10.0, RHEL4 and Fedora Core 4
 %define mysql4 0
 %{?build_mysql4:%define mysql4 1}
 %{?build_mysql4:%define mysql 1}
+# if using mysql 5.x define this and mysql above
+# currently: SuSE 10.1 and Fedora Core 5
+%define mysql5 0
+%{?build_mysql5:%define mysql5 1}
+%{?build_mysql5:%define mysql 1}
 %define sqlite 0
 %{?build_sqlite:%define sqlite 1}
 %define postgresql 0
@@ -169,7 +174,6 @@ Source1: http://www.prdownloads.sourceforge.net/bacula/depkgs-%{depkgs_version}.
 Source2: Release_Notes-%{version}-%{release}.tar.gz
 Source3: http://www.prdownloads.sourceforge.net/bacula/%{name}-docs-%{version}.tar.gz
 Source4: http://www.prdownloads.sourceforge.net/bacula/%{name}-rescue-%{_rescuever}.tar.gz
-Patch0: bacula-1.38.9-gnome2console.patch
 BuildRoot: %{_tmppath}/%{name}-root
 URL: http://www.bacula.org/
 Vendor: The Bacula Team
@@ -315,7 +319,7 @@ BuildRequires: linc-devel
 BuildRequires: freetype-devel
 %endif
 
-%if %{mysql} && ! %{mysql4}
+%if %{mysql} && ! %{mysql4} && ! %{mysql5}
 BuildRequires: mysql-devel >= 3.23
 %endif
 
@@ -323,6 +327,10 @@ BuildRequires: mysql-devel >= 3.23
 BuildRequires: mysql-devel >= 4.0
 %endif
 
+%if %{mysql} && %{mysql5}
+BuildRequires: mysql-devel >= 5.0
+%endif
+
 %if %{postgresql} && %{wb3}
 BuildRequires: rh-postgresql-devel >= 7
 %endif
@@ -380,7 +388,7 @@ Requires: glibc >= 2.4
 Requires: libtermcap
 %endif
 
-%if %{mysql} && ! %{su9} && ! %{mdk} && ! %{mysql4}
+%if %{mysql} && ! %{su9} && ! %{mdk} && ! %{mysql4} && ! %{mysql5}
 Requires: mysql >= 3.23
 Requires: mysql-server >= 3.23
 %endif
@@ -388,6 +396,10 @@ Requires: mysql-server >= 3.23
 Requires: mysql >= 4.0
 Requires: mysql-server >= 4.0
 %endif
+%if %{mysql} && ! %{su9} && ! %{su10} && ! %{mdk} && %{mysql5}
+Requires: mysql >= 5.0
+Requires: mysql-server >= 5.0
+%endif
 
 %if %{mysql} && %{su9} && ! %{mysql4}
 Requires: mysql >= 3.23
@@ -401,6 +413,10 @@ Requires: mysql-client >= 4.0
 Requires: mysql >= 4.0
 Requires: mysql-client >= 4.0
 %endif
+%if %{mysql} && %{su10} && %{mysql5}
+Requires: mysql >= 5.0
+Requires: mysql-client >= 5.0
+%endif
 
 %if %{mysql} && %{mdk} && ! %{mysql4}
 Requires: mysql >= 3.23
@@ -700,8 +716,6 @@ server packages.
 %setup -T -D -b 3
 %setup -T -D -b 4
 
-%patch -p0
-
 %build
 
 %if %{su9} || %{su10}
@@ -1479,6 +1493,7 @@ fi
 %changelog
 * Sun Jun 25 2006 D. Scott Barninger <barninger@fairfieldcomputers.com>
 - update depkgs to 25Jun06
+- add mysql5 build tag
 * Mon Jun 12 2006 D. Scott Barninger <barninger@fairfieldcomputers.com>
 - 1.38.10 bump rescue version
 * Sun Jun 03 2006 D. Scott Barninger <barninger@fairfieldcomputers.com>
diff --git a/bacula/platforms/suse/bacula.spec.in b/bacula/platforms/suse/bacula.spec.in
index 89e6d83299..2352b0148e 100644
--- a/bacula/platforms/suse/bacula.spec.in
+++ b/bacula/platforms/suse/bacula.spec.in
@@ -82,10 +82,15 @@ exit 1
 %define mysql 0
 %{?build_mysql:%define mysql 1}
 # if using mysql 4.x define this and mysql above
-# currently: Mandrake 10.1, SuSE 9.x & 10.x, RHEL4 and Fedora Core 4 & 5
+# currently: Mandrake 10.1, SuSE 9.x & 10.0, RHEL4 and Fedora Core 4
 %define mysql4 0
 %{?build_mysql4:%define mysql4 1}
 %{?build_mysql4:%define mysql 1}
+# if using mysql 5.x define this and mysql above
+# currently: SuSE 10.1 and Fedora Core 5
+%define mysql5 0
+%{?build_mysql5:%define mysql5 1}
+%{?build_mysql5:%define mysql 1}
 %define sqlite 0
 %{?build_sqlite:%define sqlite 1}
 %define postgresql 0
@@ -169,7 +174,6 @@ Source1: http://www.prdownloads.sourceforge.net/bacula/depkgs-%{depkgs_version}.
 Source2: Release_Notes-%{version}-%{release}.tar.gz
 Source3: http://www.prdownloads.sourceforge.net/bacula/%{name}-docs-%{version}.tar.gz
 Source4: http://www.prdownloads.sourceforge.net/bacula/%{name}-rescue-%{_rescuever}.tar.gz
-Patch0: bacula-1.38.9-gnome2console.patch
 BuildRoot: %{_tmppath}/%{name}-root
 URL: http://www.bacula.org/
 Vendor: The Bacula Team
@@ -315,7 +319,7 @@ BuildRequires: linc-devel
 BuildRequires: freetype-devel
 %endif
 
-%if %{mysql} && ! %{mysql4}
+%if %{mysql} && ! %{mysql4} && ! %{mysql5}
 BuildRequires: mysql-devel >= 3.23
 %endif
 
@@ -323,6 +327,10 @@ BuildRequires: mysql-devel >= 3.23
 BuildRequires: mysql-devel >= 4.0
 %endif
 
+%if %{mysql} && %{mysql5}
+BuildRequires: mysql-devel >= 5.0
+%endif
+
 %if %{postgresql} && %{wb3}
 BuildRequires: rh-postgresql-devel >= 7
 %endif
@@ -380,7 +388,7 @@ Requires: glibc >= 2.4
 Requires: libtermcap
 %endif
 
-%if %{mysql} && ! %{su9} && ! %{mdk} && ! %{mysql4}
+%if %{mysql} && ! %{su9} && ! %{mdk} && ! %{mysql4} && ! %{mysql5}
 Requires: mysql >= 3.23
 Requires: mysql-server >= 3.23
 %endif
@@ -388,6 +396,10 @@ Requires: mysql-server >= 3.23
 Requires: mysql >= 4.0
 Requires: mysql-server >= 4.0
 %endif
+%if %{mysql} && ! %{su9} && ! %{su10} && ! %{mdk} && %{mysql5}
+Requires: mysql >= 5.0
+Requires: mysql-server >= 5.0
+%endif
 
 %if %{mysql} && %{su9} && ! %{mysql4}
 Requires: mysql >= 3.23
@@ -401,6 +413,10 @@ Requires: mysql-client >= 4.0
 Requires: mysql >= 4.0
 Requires: mysql-client >= 4.0
 %endif
+%if %{mysql} && %{su10} && %{mysql5}
+Requires: mysql >= 5.0
+Requires: mysql-client >= 5.0
+%endif
 
 %if %{mysql} && %{mdk} && ! %{mysql4}
 Requires: mysql >= 3.23
@@ -700,8 +716,6 @@ server packages.
 %setup -T -D -b 3
 %setup -T -D -b 4
 
-%patch -p0
-
 %build
 
 %if %{su9} || %{su10}
@@ -1479,6 +1493,7 @@ fi
 %changelog
 * Sun Jun 25 2006 D. Scott Barninger <barninger@fairfieldcomputers.com>
 - update depkgs to 25Jun06
+- add mysql5 build tag
 * Mon Jun 12 2006 D. Scott Barninger <barninger@fairfieldcomputers.com>
 - 1.38.10 bump rescue version
 * Sun Jun 03 2006 D. Scott Barninger <barninger@fairfieldcomputers.com>
-- 
2.39.5