- rel 2

- conditional (off by default) wm-properties (only used in gnome2)

Changed files:
    mutter.spec -> 1.8

diff --git a/mutter.spec b/mutter.spec
index 7726eb2db21a8e86d86cca9db486001b8d4f4065..bc117564212080769917dfbe42461683b12574ba 100644 (file)
--- a/mutter.spec
+++ b/mutter.spec
@@ -1,7 +1,11 @@
+#
+# Conditional build:
+%bcond_with    gnome2          # build with support for GNOME2 wm-properties
+#
 Summary:       Window and compositing manager based on Clutter
 Name:          mutter
 Version:       3.0.2.1
-Release:       1
+Release:       2
 License:       GPL v2+
 Group:         X11/Window Managers
 Source0:       http://ftp.gnome.org/pub/GNOME/sources/mutter/3.0/%{name}-%{version}.tar.bz2
@@ -82,6 +86,8 @@ rm -rf $RPM_BUILD_ROOT
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT
 
+%{!?with_gnome2:%{__rm} %{_datadir}/gnome/wm-properties/mutter-wm.desktop}
+
 %{__rm} $RPM_BUILD_ROOT%{_libdir}/*.la
 
 %find_lang %{name}
@@ -113,7 +119,7 @@ rm -rf $RPM_BUILD_ROOT
 # 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*