diff --git a/compiz.spec b/compiz.spec index c367f33..26ac590 100644 --- a/compiz.spec +++ b/compiz.spec @@ -40,7 +40,6 @@ BuildRequires: fuse-devel BuildRequires: cairo-devel BuildRequires: libtool BuildRequires: libxslt-devel -BuildRequires: dbus-devel Source0: http://releases.compiz-fusion.org/%{version}/%{name}-%{version}.tar.bz2 Source1: compiz-gtk @@ -65,9 +64,6 @@ Patch115: compiz-0.8.6-focus-denied-stacking-fix.patch #http://gitweb.compiz.org/?p=compiz/core;a=commit;h=5ea5e2130c56d405fcccd63932918fc49ca1f1b9 Patch116: gdk_display_deprecated.patch -#build patch -Patch120: dbus_build.patch - %description Compiz is one of the first OpenGL-accelerated compositing window managers for the X Window System. The integration allows it to perform @@ -137,7 +133,6 @@ and other kde integration related stuff. %patch114 -p1 -b .map-request %patch115 -p1 -b .focus-denied-stacking %patch116 -p1 -b .gdk_display_deprecated -%patch120 -p1 -b .dbus_build %build rm -rf $RPM_BUILD_ROOT @@ -153,7 +148,7 @@ libtoolize aclocal autoconf automake -%configure \ +%configure \ --enable-gconf \ --enable-dbus \ --enable-place \ @@ -295,8 +290,7 @@ rm -rf $RPM_BUILD_ROOT %changelog * Thu Oct 14 2010 leigh scott - 0.8.6-5 - Don't rely on deprecated gdk symbol gdk_display. -- Add Br libxslt-devel and dbus-devel -- add patch to fix dbus build error +- Add Br libxslt-devel * Wed Oct 06 2010 Kevin Kofler - 0.8.6-4 - Remove kde-desktop-effects.sh ("Compiz Switcher"), use System Settings instead diff --git a/dbus_build.patch b/dbus_build.patch deleted file mode 100644 index 37e9f6a..0000000 --- a/dbus_build.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- compiz-0.8.6/gtk/Makefile.in.orig 2010-03-28 13:28:53.000000000 +0100 -+++ compiz-0.8.6/gtk/Makefile.in 2010-10-14 18:53:38.634400786 +0100 -@@ -153,7 +153,7 @@ GNOME_KEY_BINDINGS_LIBS = @GNOME_KEY_BIN - GNOME_WINDOW_SETTINGS_CFLAGS = @GNOME_WINDOW_SETTINGS_CFLAGS@ - GNOME_WINDOW_SETTINGS_LIBS = @GNOME_WINDOW_SETTINGS_LIBS@ - GREP = @GREP@ --GTK_WINDOW_DECORATOR_CFLAGS = @GTK_WINDOW_DECORATOR_CFLAGS@ -+GTK_WINDOW_DECORATOR_CFLAGS = @GTK_WINDOW_DECORATOR_CFLAGS@ -I/usr/include/dbus-1.0 - GTK_WINDOW_DECORATOR_LIBS = @GTK_WINDOW_DECORATOR_LIBS@ - INSTALL = @INSTALL@ - INSTALL_DATA = @INSTALL_DATA@