From: Scott Barninger <scott@barninger.com>
Date: Sat, 16 May 2009 18:53:01 +0000 (+0000)
Subject: Fix libxml dependency for rh7 per Pasi Kärkkäinen <pasik@iki.fi>.
X-Git-Tag: Release-3.0.2~229
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=566ff23d384231c569484bc3a100165d4473c156;p=bacula%2Fbacula

Fix libxml dependency for rh7 per Pasi Kärkkäinen <pasik@iki.fi>.



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

diff --git a/bacula/platforms/mandrake/bacula.spec.in b/bacula/platforms/mandrake/bacula.spec.in
index 63c73c289d..e5dfa58b60 100644
--- a/bacula/platforms/mandrake/bacula.spec.in
+++ b/bacula/platforms/mandrake/bacula.spec.in
@@ -323,8 +323,11 @@ Distribution: %{_dist}
 
 BuildRequires: gcc, gcc-c++, make, autoconf
 BuildRequires: ncurses-devel, perl
-BuildRequires: libstdc++-devel = %{gccver}-%{gccrel}, libxml2-devel, zlib-devel
+BuildRequires: libstdc++-devel = %{gccver}-%{gccrel}, zlib-devel
 BuildRequires: openssl-devel
+%if ! %{rh7}
+BuildRequires: libxml2-devel
+%endif
 %if %{python}
 BuildRequires: python, python-devel
 %{expand: %%define pyver %(python -c 'import sys;print(sys.version[0:3])')}
@@ -353,6 +356,7 @@ BuildRequires: qt4-devel >= 4.2
 %if %{rh7}
 BuildRequires: libtermcap-devel
 BuildRequires: glibc-devel >= 2.2
+BuildRequires: libxml-devel
 %endif
 %if %{su9}
 BuildRequires: termcap
@@ -2579,6 +2583,8 @@ fi
 %endif
 
 %changelog
+* Sat May 16 2009 D. Scott Barninger <barninger@fairfieldcomputers.com>
+- fix libxml dependency for rh7 per Pasi Kärkkäinen <pasik@iki.fi>
 * Mon May 04 2009 D. Scott Barninger <barninger@fairfieldcomputers.com>
 - Fix post ldconfig problem in client only build
 * Sun May 03 2009 D. Scott Barninger <barninger@fairfieldcomputers.com>
diff --git a/bacula/platforms/redhat/bacula.spec.in b/bacula/platforms/redhat/bacula.spec.in
index 63c73c289d..e5dfa58b60 100644
--- a/bacula/platforms/redhat/bacula.spec.in
+++ b/bacula/platforms/redhat/bacula.spec.in
@@ -323,8 +323,11 @@ Distribution: %{_dist}
 
 BuildRequires: gcc, gcc-c++, make, autoconf
 BuildRequires: ncurses-devel, perl
-BuildRequires: libstdc++-devel = %{gccver}-%{gccrel}, libxml2-devel, zlib-devel
+BuildRequires: libstdc++-devel = %{gccver}-%{gccrel}, zlib-devel
 BuildRequires: openssl-devel
+%if ! %{rh7}
+BuildRequires: libxml2-devel
+%endif
 %if %{python}
 BuildRequires: python, python-devel
 %{expand: %%define pyver %(python -c 'import sys;print(sys.version[0:3])')}
@@ -353,6 +356,7 @@ BuildRequires: qt4-devel >= 4.2
 %if %{rh7}
 BuildRequires: libtermcap-devel
 BuildRequires: glibc-devel >= 2.2
+BuildRequires: libxml-devel
 %endif
 %if %{su9}
 BuildRequires: termcap
@@ -2579,6 +2583,8 @@ fi
 %endif
 
 %changelog
+* Sat May 16 2009 D. Scott Barninger <barninger@fairfieldcomputers.com>
+- fix libxml dependency for rh7 per Pasi Kärkkäinen <pasik@iki.fi>
 * Mon May 04 2009 D. Scott Barninger <barninger@fairfieldcomputers.com>
 - Fix post ldconfig problem in client only build
 * Sun May 03 2009 D. Scott Barninger <barninger@fairfieldcomputers.com>
diff --git a/bacula/platforms/suse/bacula.spec.in b/bacula/platforms/suse/bacula.spec.in
index 63c73c289d..e5dfa58b60 100644
--- a/bacula/platforms/suse/bacula.spec.in
+++ b/bacula/platforms/suse/bacula.spec.in
@@ -323,8 +323,11 @@ Distribution: %{_dist}
 
 BuildRequires: gcc, gcc-c++, make, autoconf
 BuildRequires: ncurses-devel, perl
-BuildRequires: libstdc++-devel = %{gccver}-%{gccrel}, libxml2-devel, zlib-devel
+BuildRequires: libstdc++-devel = %{gccver}-%{gccrel}, zlib-devel
 BuildRequires: openssl-devel
+%if ! %{rh7}
+BuildRequires: libxml2-devel
+%endif
 %if %{python}
 BuildRequires: python, python-devel
 %{expand: %%define pyver %(python -c 'import sys;print(sys.version[0:3])')}
@@ -353,6 +356,7 @@ BuildRequires: qt4-devel >= 4.2
 %if %{rh7}
 BuildRequires: libtermcap-devel
 BuildRequires: glibc-devel >= 2.2
+BuildRequires: libxml-devel
 %endif
 %if %{su9}
 BuildRequires: termcap
@@ -2579,6 +2583,8 @@ fi
 %endif
 
 %changelog
+* Sat May 16 2009 D. Scott Barninger <barninger@fairfieldcomputers.com>
+- fix libxml dependency for rh7 per Pasi Kärkkäinen <pasik@iki.fi>
 * Mon May 04 2009 D. Scott Barninger <barninger@fairfieldcomputers.com>
 - Fix post ldconfig problem in client only build
 * Sun May 03 2009 D. Scott Barninger <barninger@fairfieldcomputers.com>