From: Scott Barninger <scott@barninger.com>
Date: Sat, 15 Jul 2006 11:59:35 +0000 (+0000)
Subject: Fix directory creation for wxconsole package, add provides and conflicts for standard... 
X-Git-Tag: Release-2.0.0~757
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=81f231a9cf30d57e00eb7dbf6ba953e5ada84d3a;p=bacula%2Fbacula

Fix directory creation for wxconsole package, add provides and conflicts for standard SuSE packages.


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

diff --git a/bacula/platforms/mandrake/bacula.spec.in b/bacula/platforms/mandrake/bacula.spec.in
index 82df176de4..2eea2a1c0e 100644
--- a/bacula/platforms/mandrake/bacula.spec.in
+++ b/bacula/platforms/mandrake/bacula.spec.in
@@ -193,7 +193,7 @@ Distribution: %{_dist}
 %{?nobuild_gconsole:%define gconsole 0}
 
 # Should we build wxconsole, only wxWidgets >=2.6 is supported
-# currently only SuSE 10 and FC4
+# currently only SuSE 10 and FC4/FC5
 %define wxconsole 0
 %{?build_wxconsole:%define wxconsole 1}
 
@@ -395,6 +395,11 @@ Group: System Environment/Daemons
 Provides: bacula-dir, bacula-sd, bacula-fd, bacula-server
 Conflicts: bacula-client
 Obsoletes: bacula-rescue
+
+%if %{su9} || %{su10}
+Conflicts: bacula
+%endif
+
 Requires: ncurses, libstdc++, zlib, openssl, mtx
 
 %if %{rh7}
@@ -513,6 +518,11 @@ Conflicts: bacula-mysql
 Conflicts: bacula-sqlite
 Conflicts: bacula-postgresql
 Obsoletes: bacula-rescue
+
+%if %{su9} || %{su10}
+Provides: bacula
+%endif
+
 Requires: libstdc++, zlib, openssl
 
 %if %{rh7}
@@ -868,12 +878,20 @@ mkdir -p $RPM_BUILD_ROOT/etc/logrotate.d
 mkdir -p $RPM_BUILD_ROOT/etc/log.d/conf/logfiles
 mkdir -p $RPM_BUILD_ROOT/etc/log.d/conf/services
 mkdir -p $RPM_BUILD_ROOT/etc/log.d/scripts/services
-mkdir -p $RPM_BUILD_ROOT/usr/share/pixmaps
-%if %{gconsole}
+mkdir -p $RPM_BUILD_ROOT/etc/bacula/updatedb
+
+%if %{gconsole} || %{wxconsole}
 mkdir -p $RPM_BUILD_ROOT/usr/share/applications
+mkdir -p $RPM_BUILD_ROOT/usr/share/pixmaps
 %endif
-mkdir -p $RPM_BUILD_ROOT/etc/bacula/updatedb
-%if %{gconsole} && ! %{su9} && ! %{su10}
+
+%if %{gconsole} || %{wxconsole}
+%define usermode_iftrick 1
+%else
+%define usermode_iftrick 0
+%endif
+
+%if %{usermode_iftrick} && ! %{su9} && ! %{su10}
 mkdir -p $RPM_BUILD_ROOT/etc/pam.d
 mkdir -p $RPM_BUILD_ROOT/etc/security/console.apps
 mkdir -p $RPM_BUILD_ROOT/usr/bin
@@ -1532,6 +1550,10 @@ fi
 %endif
 
 %changelog
+* Sat Jul 15 2006 D. Scott Barninger <barninger@fairfieldcomputers.com>
+- add provides and conflicts for standard suse packages
+* Thu Jul 13 2006 D. Scott Barninger <barninger@fairfieldcomputers.com>
+- fix directory creation when wxconsole and not gconsole
 * Tue Jul 04 2006 D. Scott Barninger <barninger@fairfieldcomputers.com>
 - add check to buildrequires to make sure libstdc++ version matches gcc
 * Mon Jul 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 82df176de4..2eea2a1c0e 100644
--- a/bacula/platforms/redhat/bacula.spec.in
+++ b/bacula/platforms/redhat/bacula.spec.in
@@ -193,7 +193,7 @@ Distribution: %{_dist}
 %{?nobuild_gconsole:%define gconsole 0}
 
 # Should we build wxconsole, only wxWidgets >=2.6 is supported
-# currently only SuSE 10 and FC4
+# currently only SuSE 10 and FC4/FC5
 %define wxconsole 0
 %{?build_wxconsole:%define wxconsole 1}
 
@@ -395,6 +395,11 @@ Group: System Environment/Daemons
 Provides: bacula-dir, bacula-sd, bacula-fd, bacula-server
 Conflicts: bacula-client
 Obsoletes: bacula-rescue
+
+%if %{su9} || %{su10}
+Conflicts: bacula
+%endif
+
 Requires: ncurses, libstdc++, zlib, openssl, mtx
 
 %if %{rh7}
@@ -513,6 +518,11 @@ Conflicts: bacula-mysql
 Conflicts: bacula-sqlite
 Conflicts: bacula-postgresql
 Obsoletes: bacula-rescue
+
+%if %{su9} || %{su10}
+Provides: bacula
+%endif
+
 Requires: libstdc++, zlib, openssl
 
 %if %{rh7}
@@ -868,12 +878,20 @@ mkdir -p $RPM_BUILD_ROOT/etc/logrotate.d
 mkdir -p $RPM_BUILD_ROOT/etc/log.d/conf/logfiles
 mkdir -p $RPM_BUILD_ROOT/etc/log.d/conf/services
 mkdir -p $RPM_BUILD_ROOT/etc/log.d/scripts/services
-mkdir -p $RPM_BUILD_ROOT/usr/share/pixmaps
-%if %{gconsole}
+mkdir -p $RPM_BUILD_ROOT/etc/bacula/updatedb
+
+%if %{gconsole} || %{wxconsole}
 mkdir -p $RPM_BUILD_ROOT/usr/share/applications
+mkdir -p $RPM_BUILD_ROOT/usr/share/pixmaps
 %endif
-mkdir -p $RPM_BUILD_ROOT/etc/bacula/updatedb
-%if %{gconsole} && ! %{su9} && ! %{su10}
+
+%if %{gconsole} || %{wxconsole}
+%define usermode_iftrick 1
+%else
+%define usermode_iftrick 0
+%endif
+
+%if %{usermode_iftrick} && ! %{su9} && ! %{su10}
 mkdir -p $RPM_BUILD_ROOT/etc/pam.d
 mkdir -p $RPM_BUILD_ROOT/etc/security/console.apps
 mkdir -p $RPM_BUILD_ROOT/usr/bin
@@ -1532,6 +1550,10 @@ fi
 %endif
 
 %changelog
+* Sat Jul 15 2006 D. Scott Barninger <barninger@fairfieldcomputers.com>
+- add provides and conflicts for standard suse packages
+* Thu Jul 13 2006 D. Scott Barninger <barninger@fairfieldcomputers.com>
+- fix directory creation when wxconsole and not gconsole
 * Tue Jul 04 2006 D. Scott Barninger <barninger@fairfieldcomputers.com>
 - add check to buildrequires to make sure libstdc++ version matches gcc
 * Mon Jul 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 82df176de4..2eea2a1c0e 100644
--- a/bacula/platforms/suse/bacula.spec.in
+++ b/bacula/platforms/suse/bacula.spec.in
@@ -193,7 +193,7 @@ Distribution: %{_dist}
 %{?nobuild_gconsole:%define gconsole 0}
 
 # Should we build wxconsole, only wxWidgets >=2.6 is supported
-# currently only SuSE 10 and FC4
+# currently only SuSE 10 and FC4/FC5
 %define wxconsole 0
 %{?build_wxconsole:%define wxconsole 1}
 
@@ -395,6 +395,11 @@ Group: System Environment/Daemons
 Provides: bacula-dir, bacula-sd, bacula-fd, bacula-server
 Conflicts: bacula-client
 Obsoletes: bacula-rescue
+
+%if %{su9} || %{su10}
+Conflicts: bacula
+%endif
+
 Requires: ncurses, libstdc++, zlib, openssl, mtx
 
 %if %{rh7}
@@ -513,6 +518,11 @@ Conflicts: bacula-mysql
 Conflicts: bacula-sqlite
 Conflicts: bacula-postgresql
 Obsoletes: bacula-rescue
+
+%if %{su9} || %{su10}
+Provides: bacula
+%endif
+
 Requires: libstdc++, zlib, openssl
 
 %if %{rh7}
@@ -868,12 +878,20 @@ mkdir -p $RPM_BUILD_ROOT/etc/logrotate.d
 mkdir -p $RPM_BUILD_ROOT/etc/log.d/conf/logfiles
 mkdir -p $RPM_BUILD_ROOT/etc/log.d/conf/services
 mkdir -p $RPM_BUILD_ROOT/etc/log.d/scripts/services
-mkdir -p $RPM_BUILD_ROOT/usr/share/pixmaps
-%if %{gconsole}
+mkdir -p $RPM_BUILD_ROOT/etc/bacula/updatedb
+
+%if %{gconsole} || %{wxconsole}
 mkdir -p $RPM_BUILD_ROOT/usr/share/applications
+mkdir -p $RPM_BUILD_ROOT/usr/share/pixmaps
 %endif
-mkdir -p $RPM_BUILD_ROOT/etc/bacula/updatedb
-%if %{gconsole} && ! %{su9} && ! %{su10}
+
+%if %{gconsole} || %{wxconsole}
+%define usermode_iftrick 1
+%else
+%define usermode_iftrick 0
+%endif
+
+%if %{usermode_iftrick} && ! %{su9} && ! %{su10}
 mkdir -p $RPM_BUILD_ROOT/etc/pam.d
 mkdir -p $RPM_BUILD_ROOT/etc/security/console.apps
 mkdir -p $RPM_BUILD_ROOT/usr/bin
@@ -1532,6 +1550,10 @@ fi
 %endif
 
 %changelog
+* Sat Jul 15 2006 D. Scott Barninger <barninger@fairfieldcomputers.com>
+- add provides and conflicts for standard suse packages
+* Thu Jul 13 2006 D. Scott Barninger <barninger@fairfieldcomputers.com>
+- fix directory creation when wxconsole and not gconsole
 * Tue Jul 04 2006 D. Scott Barninger <barninger@fairfieldcomputers.com>
 - add check to buildrequires to make sure libstdc++ version matches gcc
 * Mon Jul 03 2006 D. Scott Barninger <barninger@fairfieldcomputers.com>