rpms/bacula/EL-4 bacula.spec,1.2,1.3

[Andreas Thienemann (ixs)]

Author: ixs

Update of /cvs/pkgs/rpms/bacula/EL-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30898

Modified Files:
	bacula.spec 
Log Message:
"Silent fix" to remove the wxGTK dep on el4 without having to bump all other builds.



Index: bacula.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bacula/EL-4/bacula.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- bacula.spec	25 Jul 2007 15:28:20 -0000	1.2
+++ bacula.spec	30 Jul 2007 21:43:37 -0000	1.3
@@ -1,3 +1,6 @@
+# NB: This spec file differs from all other branches as the
+# wxGTK dependency does not exist on RHEL4
+
 %define working_dir	/var/spool/bacula
 %define script_dir	/usr/libexec/bacula
 #%define rescue_version	2.0.0
@@ -41,7 +44,7 @@
 BuildRequires: libtermcap-devel, gtk2-devel, libgnomeui-devel, GConf2-devel
 BuildRequires: glibc-devel, ORBit2-devel, libart_lgpl-devel, freetype-devel
 BuildRequires: libbonobo-devel, libbonoboui-devel, bonobo-activation-devel
-BuildRequires: mysql-devel, cdrecord, postgresql-devel, wxGTK-devel
+BuildRequires: mysql-devel, cdrecord, postgresql-devel
 BuildRequires: desktop-file-utils, python-devel, sqlite-devel, sed,
 BuildRequires: libacl-devel, latex2html, tetex-latex, tetex, ghostscript
 
@@ -258,18 +261,18 @@
 This package contains the gnome version of the bacula management console
 
 
-%package console-wxwidgets
-Summary: Bacula console using the wx widgets toolkit
-Group: System Environment/Daemons
-Requires: usermode
+#%package console-wxwidgets
+#Summary: Bacula console using the wx widgets toolkit
+#Group: System Environment/Daemons
+#Requires: usermode
 
-%description console-wxwidgets
-Bacula is a set of programs that allow you to manage the backup,
-recovery, and verification of computer data across a network of
-different computers. It is based on a client/server architecture.
+#%description console-wxwidgets
+#Bacula is a set of programs that allow you to manage the backup,
+#recovery, and verification of computer data across a network of
+#different computers. It is based on a client/server architecture.
 
-This package contains the wxWidgets version of the bacula management 
-console.
+#This package contains the wxWidgets version of the bacula management 
+#console.
 
 
 %package traymonitor
@@ -377,7 +380,6 @@
 	--enable-conio \
 	--enable-largefile \
 	--enable-gnome \
-	--enable-wx-console \
 	--enable-tray-monitor \
 	--enable-build-dird \
 	--enable-build-stored \
@@ -389,6 +391,8 @@
 	$*
 # Scratch this, it is trouble
 #	--with-readline \
+# Removed as we have no wxGTK on rhel4
+#	--enable-wx-console \
 
 if test $? != 0; then 
   tail -500 config.log
@@ -517,8 +521,8 @@
 # Fix some wrapper braindeadness
 rm -f %{buildroot}%{_libexecdir}/bacula/bconsole
 rm -f %{buildroot}%{_libexecdir}/bacula/gconsole
-mv %{buildroot}%{_sbindir}/wx-console %{buildroot}%{_sbindir}/wxconsole
-mv %{buildroot}%{_sysconfdir}/bacula/wx-console.conf %{buildroot}%{_sysconfdir}/bacula/wxconsole.conf
+# mv %{buildroot}%{_sbindir}/wx-console %{buildroot}%{_sbindir}/wxconsole
+# mv %{buildroot}%{_sysconfdir}/bacula/wx-console.conf %{buildroot}%{_sysconfdir}/bacula/wxconsole.conf
 
 
 # Desktop Integration for the console apps and the traymonitor
@@ -526,13 +530,13 @@
 install -m 644 -D bacula-sqlite/scripts/bacula.png %{buildroot}%{_datadir}/pixmaps/bacula.png
 install -m 644 -D bacula-sqlite/scripts/gnome-console.pamd %{buildroot}%{_sysconfdir}/pam.d/gnome-console
 install -m 644 -D bacula-sqlite/scripts/gnome-console.console_apps %{buildroot}%{_sysconfdir}/security/console.apps/gnome-console
-install -m 644 -D bacula-sqlite/src/wx-console/wxwin16x16.xpm %{buildroot}%{_datadir}/pixmaps/wxwin16x16.xpm
-install -m 644 -D bacula-sqlite/scripts/wxconsole.pamd %{buildroot}%{_sysconfdir}/pam.d/wxconsole
-install -m 644 -D bacula-sqlite/scripts/wxconsole.desktop.consolehelper %{buildroot}%{_sysconfdir}/security/console.apps/wxconsole
+# install -m 644 -D bacula-sqlite/src/wx-console/wxwin16x16.xpm %{buildroot}%{_datadir}/pixmaps/wxwin16x16.xpm
+# install -m 644 -D bacula-sqlite/scripts/wxconsole.pamd %{buildroot}%{_sysconfdir}/pam.d/wxconsole
+# install -m 644 -D bacula-sqlite/scripts/wxconsole.desktop.consolehelper %{buildroot}%{_sysconfdir}/security/console.apps/wxconsole
 install -m 644 -D bacula-sqlite/src/tray-monitor/generic.xpm %{buildroot}%{_datadir}/pixmaps/bacula-tray-monitor.xpm
 
 ln -sf consolehelper %{buildroot}%{_bindir}/gnome-console
-ln -sf consolehelper %{buildroot}%{_bindir}/wxconsole
+# ln -sf consolehelper %{buildroot}%{_bindir}/wxconsole
 
 desktop-file-install --vendor="fedora" --dir=%{buildroot}%{_datadir}/applications %{SOURCE3}
 desktop-file-install --vendor="fedora" --dir=%{buildroot}%{_datadir}/applications %{SOURCE4}
@@ -766,16 +770,16 @@
 %{_datadir}/pixmaps/bacula.png
 
 
-%files console-wxwidgets
-%defattr(-,root,root,-)
-%config %{_sysconfdir}/security/console.apps/wxconsole
-%config %{_sysconfdir}/pam.d/wxconsole
-%config(noreplace) %{_sysconfdir}/bacula/wxconsole.conf
-%{_bindir}/wxconsole
-%{_sbindir}/wxconsole
-%{_mandir}/man1/bacula-wxconsole.1*
-%{_datadir}/applications/fedora-bacula-wxconsole.desktop
-%{_datadir}/pixmaps/wxwin16x16.xpm
+#%files console-wxwidgets
+#%defattr(-,root,root,-)
+#%config %{_sysconfdir}/security/console.apps/wxconsole
+#%config %{_sysconfdir}/pam.d/wxconsole
+#%config(noreplace) %{_sysconfdir}/bacula/wxconsole.conf
+#%{_bindir}/wxconsole
+#%{_sbindir}/wxconsole
+#%{_mandir}/man1/bacula-wxconsole.1*
+#%{_datadir}/applications/fedora-bacula-wxconsole.desktop
+#%{_datadir}/pixmaps/wxwin16x16.xpm
 
 
 %files director-common