gnome-wm-settings is no more

compiz.spec

@@ -13,7 +13,7 @@ URL:            http://www.go-compiz.org
 License:        GPLv2+ and LGPLv2+ and MIT
 Group:          User Interface/Desktops
 Version:        0.8.6
-Release:        1%{?dist}
+Release:        2%{?dist}
 
 Summary:        OpenGL window and compositing manager
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -57,6 +57,7 @@ Patch106: redhat-logo.patch
 Patch107: compiz-0.8.6-wall.patch
 #Patch110: scale-key.patch
 Patch111: compiz-0.8.6-unloadpluginfix.patch
+Patch112: no-more-gnome-wm-settings.patch
 
 %description
 Compiz is one of the first OpenGL-accelerated compositing window
@@ -123,6 +124,7 @@ and other kde integration related stuff.
 %patch107 -p1 -b .wall
 #%patch110 -p1 -b .scale-key
 %patch111 -p1 -b .unloadfix
+%patch112 -p1 -b .gnome-wm-settings
 
 %build
 rm -rf $RPM_BUILD_ROOT
@@ -270,8 +272,6 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-, root, root)
 %{_bindir}/compiz-gtk
 %{_bindir}/gtk-window-decorator
-%{_libdir}/window-manager-settings/libcompiz.so
-%{_datadir}/gnome/wm-properties/compiz-wm.desktop
 %{_datadir}/gnome-control-center/keybindings/50-compiz-desktop-key.xml
 %{_datadir}/gnome-control-center/keybindings/50-compiz-key.xml
 %{_datadir}/applications/compiz-gtk.desktop
@@ -301,6 +301,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Jul 15 2010 Adel Gadllah <adel.gadllah@gmail.com> - 0.8.6-2
+- gnome-window-manager-settings is no more ...
+
 * Tue Mar 30 2010 Adel Gadllah <adel.gadllah@gmail.com> - 0.8.6-1
 - Update to 0.8.6
 - Drop upstreamed patches

no-more-gnome-wm-settings.patch

@@ -0,0 +1,74 @@
+diff -upNr compiz-0.8.6.orign/gtk/gnome/Makefile.am compiz-0.8.6/gtk/gnome/Makefile.am
+--- compiz-0.8.6.orign/gtk/gnome/Makefile.am	2010-03-28 14:15:35.000000000 +0200
++++ compiz-0.8.6/gtk/gnome/Makefile.am	2010-07-15 20:51:40.241254711 +0200
+@@ -1,21 +1,9 @@
+ moduledir = $(DESTDIR)$(windowsettingslibdir)/window-manager-settings
+ 
+-if USE_GNOME
+-libcompiz_la_LDFLAGS = -export-dynamic -avoid-version -rpath $(moduledir)
+-libcompiz_la_LIBADD  = @GNOME_WINDOW_SETTINGS_LIBS@
+-libcompiz_la_SOURCES = 		\
+-	compiz-window-manager.c	\
+-	compiz-window-manager.h
+-libcompiz_module     = libcompiz.la
+-
+ desktopfilesdir	      = $(DESTDIR)$(datadir)/applications
+ desktopfiles_in_files = compiz.desktop.in
+ desktopfiles_files    = $(desktopfiles_in_files:.desktop.in=.desktop)
+ 
+-wmpropertiesdir	      = $(DESTDIR)$(windowsettingsdatadir)/gnome/wm-properties
+-wmproperties_in_files = compiz-wm.desktop.in
+-wmproperties_files    = $(wmproperties_in_files:.desktop.in=.desktop)
+-
+ @INTLTOOL_DESKTOP_RULE@
+ 
+ if USE_GNOME_KEYBINDINGS
+@@ -28,24 +16,12 @@ xml_files    = $(xml_in_files:.xml.in=.x
+ 
+ endif
+ 
+-install-exec-local:
+-	if mkdir -p $(moduledir) && test -w $(moduledir); then ( \
+-		$(LIBTOOL) --mode=install $(INSTALL) $(libcompiz_module) \
+-		$(moduledir) \
+-		); \
+-	fi
+-
+ install-data-local:
+ 	if mkdir -p $(desktopfilesdir) && test -w $(desktopfilesdir); then ( \
+ 		$(INSTALL) -m 644 $(desktopfiles_files) \
+ 		$(desktopfilesdir) \
+ 		); \
+ 	fi
+-	if mkdir -p $(wmpropertiesdir) && test -w $(wmpropertiesdir); then ( \
+-		$(INSTALL) -m 644 $(wmproperties_files) \
+-		$(wmpropertiesdir) \
+-		); \
+-	fi
+ 
+ if USE_GNOME_KEYBINDINGS
+ 	if mkdir -p $(xmldir) && test -w $(xmldir); then ( \
+@@ -74,23 +50,18 @@ if USE_GNOME_KEYBINDINGS
+ 		); \
+ 	fi
+ endif
+-endif
+ 
+ INCLUDES = @GNOME_WINDOW_SETTINGS_CFLAGS@			   \
+ 	-DMETACITY_THEME_DIR=\""$(windowsettingsdatadir)/themes"\" \
+ 	-DLOCALEDIR="\"@datadir@/locale"\"
+ 
+-noinst_LTLIBRARIES = \
+-	$(libcompiz_module)
+ 
+ noinst_DATA =		      \
+ 	$(desktopfiles_files) \
+-	$(wmproperties_files) \
+ 	$(xml_files)
+ 
+ EXTRA_DIST =			 \
+ 	$(desktopfiles_in_files) \
+-	$(wmproperties_in_files) \
+ 	$(xml_in_files)
+ 
+ DISTCLEANFILES = \