packages: openbox/openbox.spec - rel 2 - conditional (off by default) wm-pr...

[baggins]

Author: baggins                      Date: Thu Jul 28 06:07:13 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- rel 2
- conditional (off by default) wm-properties (only used in gnome2)
- gnome-session should probably go away too (no support for gnome3?)

---- Files affected:
packages/openbox:
   openbox.spec (1.77 -> 1.78) 

---- Diffs:

================================================================
Index: packages/openbox/openbox.spec
diff -u packages/openbox/openbox.spec:1.77 packages/openbox/openbox.spec:1.78
--- packages/openbox/openbox.spec:1.77	Tue Aug 24 21:37:59 2010
+++ packages/openbox/openbox.spec	Thu Jul 28 08:07:08 2011
@@ -1,9 +1,13 @@
 # $Revision$, $Date$
+#
+# Conditional build:
+%bcond_with	gnome		# build with support for GNOME2 wm-properties
+#
 Summary:	Small and fast window manger for the X Window
 Summary(pl.UTF-8):	Mały i szybki zarządca okien dla X Window
 Name:		openbox
 Version:	3.4.11.2
-Release:	1
+Release:	2
 Epoch:		1
 License:	GPL v2+
 Group:		X11/Window Managers
@@ -237,7 +241,10 @@
 	DESTDIR=$RPM_BUILD_ROOT \
 	gnomewmfilesdir=%{_wmpropsdir}
 
-rm -rf $RPM_BUILD_ROOT%{_datadir}/doc/openbox
+%{!?with_gnome:%{__rm} $RPM_BUILD_ROOT%{_wmpropsdir}/openbox.desktop}
+
+%{__rm} -r $RPM_BUILD_ROOT%{_datadir}/doc/openbox
+
 mv $RPM_BUILD_ROOT%{_datadir}/locale/{no,nb}
 
 %find_lang %{name} --all-name
@@ -271,7 +278,7 @@
 %{_sysconfdir}/xdg/openbox/autostart.sh
 %{_sysconfdir}/xdg/openbox/menu.xml
 %{_sysconfdir}/xdg/openbox/rc.xml
-%{_wmpropsdir}/openbox.desktop
+%{?with_gnome:%{_wmpropsdir}/openbox.desktop}
 %{_desktopdir}/openbox.desktop
 %{_pixmapsdir}/openbox.png
 %dir %{_libdir}/openbox
@@ -348,6 +355,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.78  2011/07/28 06:07:08  baggins
+- rel 2
+- conditional (off by default) wm-properties (only used in gnome2)
+- gnome-session should probably go away too (no support for gnome3?)
+
 Revision 1.77  2010/08/24 19:37:59  lisu
 - updated to 3.4.11.2
 - add man page for obxprop
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/openbox/openbox.spec?r1=1.77&r2=1.78&f=u