packages (DEVEL): mutter/mutter.spec - merge gnome2 bcond from HEAD

[wiget]

Author: wiget                        Date: Sun Sep 25 14:41:12 2011 GMT
Module: packages                      Tag: DEVEL
---- Log message:
- merge gnome2 bcond from HEAD

---- Files affected:
packages/mutter:
   mutter.spec (1.7.2.6 -> 1.7.2.7) 

---- Diffs:

================================================================
Index: packages/mutter/mutter.spec
diff -u packages/mutter/mutter.spec:1.7.2.6 packages/mutter/mutter.spec:1.7.2.7
--- packages/mutter/mutter.spec:1.7.2.6	Tue Sep 20 22:20:18 2011
+++ packages/mutter/mutter.spec	Sun Sep 25 16:41:07 2011
@@ -1,8 +1,12 @@
 # $Revision$, $Date$
+#
+# Conditional build:
+%bcond_with	gnome2		# build with support for GNOME2 wm-properties
+#
 Summary:	Window and compositing manager based on Clutter
 Name:		mutter
 Version:	3.1.92
-Release:	1
+Release:	2
 License:	GPL v2+
 Group:		X11/Window Managers
 Source0:	http://ftp.gnome.org/pub/GNOME/sources/mutter/3.1/%{name}-%{version}.tar.xz
@@ -85,6 +89,8 @@
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
+%{!?with_gnome2:%{__rm} $RPM_BUILD_ROOT%{_datadir}/gnome/wm-properties/mutter-wm.desktop}
+
 %{__rm} $RPM_BUILD_ROOT%{_libdir}/*.la
 
 %find_lang %{name}
@@ -116,7 +122,7 @@
 # intentionally installed in package-private dir
 %{_libdir}/mutter/Meta-*.typelib
 %{_desktopdir}/mutter.desktop
-%{_datadir}/gnome/wm-properties/mutter-wm.desktop
+%{?with_gnome2:%{_datadir}/gnome/wm-properties/mutter-wm.desktop}
 %{_sysconfdir}/gconf/schemas/mutter.schemas
 %{_datadir}/mutter
 %{_mandir}/man1/mutter.1*
@@ -139,6 +145,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.7.2.7  2011/09/25 14:41:07  wiget
+- merge gnome2 bcond from HEAD
+
 Revision 1.7.2.6  2011/09/20 20:20:18  megabajt
 - updated to 3.1.92
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mutter/mutter.spec?r1=1.7.2.6&r2=1.7.2.7&f=u