[bacula/f16] Remove dependency on WxGTK in RHEL

Lukáš Nykrýn lnykryn at fedoraproject.org
Mon Jan 30 10:49:47 UTC 2012


commit dd0c157f9eafd131da8a83193c830ebc3a69e9a6
Author: Lukas Nykryn <lnykryn at redhat.com>
Date:   Mon Jan 30 11:01:46 2012 +0100

    Remove dependency on WxGTK in RHEL

 bacula.spec |   20 ++++++++++++++++++--
 1 files changed, 18 insertions(+), 2 deletions(-)
---
diff --git a/bacula.spec b/bacula.spec
index 0087ec6..e4e6fc2 100644
--- a/bacula.spec
+++ b/bacula.spec
@@ -3,7 +3,7 @@
 
 Name:			bacula
 Version:		5.0.3
-Release:		24%{?dist}
+Release:		25%{?dist}
 Summary:		Cross platform network backup for Linux, Unix, Mac and Windows
 # See LICENSE for details
 License:		AGPLv3 with exceptions
@@ -47,7 +47,10 @@ BuildRequires:		mysql-devel, postgresql-devel, sqlite-devel
 BuildRequires:		desktop-file-utils, python-devel, lzo-devel, sed
 BuildRequires:		libacl-devel, readline-devel, libcap-devel
 
-BuildRequires:		atk-devel, pango-devel, pkgconfig, wxGTK-devel
+BuildRequires:		atk-devel, pango-devel, pkgconfig
+%if ! 0%{?rhel}
+BuildRequires:		wxGTK-devel
+%endif
 BuildRequires:		gtk2-devel, libgnomeui-devel, GConf2-devel, bonobo-activation-devel
 BuildRequires:		ORBit2-devel, libbonobo-devel, libbonoboui-devel
 
@@ -501,7 +504,9 @@ pushd bacula-base
 	export QMAKE=/usr/bin/qmake-qt4
 	build \
 		--enable-bat \
+ 	%if ! 0%{?rhel}
 		--enable-bwx-console \
+	%endif
 		--enable-tray-monitor \
 		--enable-client-only
 	pushd src/qt-console
@@ -571,12 +576,14 @@ pushd bacula-base
 	mkdir -p %{buildroot}%{_bindir}
 	install -m 644 -D scripts/bacula.png %{buildroot}%{_datadir}/pixmaps/bacula.png
 
+ 	%if ! 0%{?rhel}
 	# bwxconsole
 	install -m 644 -D src/wx-console/wxwin16x16.xpm %{buildroot}%{_datadir}/pixmaps/wxwin16x16.xpm
 	install -m 644 -D scripts/wxconsole.pamd %{buildroot}%{_sysconfdir}/pam.d/bwxconsole
 	install -m 644 -D %{SOURCE14} %{buildroot}%{_sysconfdir}/security/console.apps/bwxconsole
 	ln -sf consolehelper %{buildroot}%{_bindir}/bwxconsole
 	desktop-file-install --vendor="fedora" --dir=%{buildroot}%{_datadir}/applications %{SOURCE10}
+	%endif
 
 	install -m 644 -D src/tray-monitor/generic.xpm %{buildroot}%{_datadir}/pixmaps/bacula-tray-monitor.xpm
 	install -m 644 -D scripts/bgnome-console.pamd %{buildroot}%{_sysconfdir}/pam.d/bacula-tray-monitor
@@ -650,8 +657,12 @@ popd
 # Fix some wrapper braindeadness
 rm -f %{buildroot}%{_libexecdir}/bacula/bconsole
 rm -f %{buildroot}%{_libexecdir}/bacula/gconsole
+%if ! 0%{?rhel}
 mv %{buildroot}%{_sbindir}/bwx-console %{buildroot}%{_sbindir}/bwxconsole
 mv %{buildroot}%{_sysconfdir}/bacula/bwx-console.conf %{buildroot}%{_sysconfdir}/bacula/bwxconsole.conf
+%else
+rm -f %{buildroot}%{_mandir}/man1/bacula-bwxconsole*
+%endif
 
 # logrotate
 mkdir -p %{buildroot}%{_localstatedir}/log/bacula
@@ -1068,6 +1079,7 @@ fi
 %{_datadir}/pixmaps/bacula.png
 %endif
 
+%if ! 0%{?rhel}
 %files console-wxwidgets
 %defattr(-,root,root,-)
 %config %{_sysconfdir}/security/console.apps/bwxconsole
@@ -1078,6 +1090,7 @@ fi
 %{_mandir}/man1/bacula-bwxconsole.1*
 %{_datadir}/applications/fedora-bacula-wxconsole.desktop
 %{_datadir}/pixmaps/wxwin16x16.xpm
+%endif
 
 %files director-common
 %defattr(-,root,root,-)
@@ -1224,6 +1237,9 @@ fi
 
 
 %changelog
+* Mon Jan 30 2012 Lukas Nykryn <lnykryn at redhat.com> - 5.0.3-25
+- Remove dependency on WxGTK in RHEL.
+
 * Fri Jan 27 2012 Simone Caronni <negativo17 at gmail.com> - 5.0.3-24
 - Correct license to AGPLv3.
 - Split off libs in separate backends.


More information about the scm-commits mailing list