diff --git a/.gitignore b/.gitignore index d2f18bd..b31f6e8 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ compiz-0.8.4.tar.bz2 kde-desktop-effects-0.0.6.tar.bz2 compiz-0.8.6.tar.bz2 /compiz-with-glib-mainloop-ecc61dc04567947e92cbb9686c1041619abc05b1.tar.bz2 +/compiz-core-0.9.4.tar.bz2 diff --git a/compiz-0.9.2.1-cflags.patch b/compiz-0.9.2.1-cflags.patch deleted file mode 100644 index fa97afc..0000000 --- a/compiz-0.9.2.1-cflags.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- compiz-with-glib-mainloop/cmake/CompizCommon.cmake 2011-01-23 10:26:25.896687232 -0800 -+++ compiz-with-glib-mainloop/cmake/CompizCommon.cmake.new 2011-01-23 17:25:58.739038552 -0800 -@@ -42,11 +42,11 @@ - option (COMPIZ_SIGN_WARNINGS "Should compiz use -Wsign-conversion during compilation." OFF) - - if (COMPIZ_SIGN_WARNINGS) -- set (CMAKE_CXX_FLAGS "-Wall -Wsign-conversion") -- set (CMAKE_C_FLAGS "-Wall -Wsign-conversion") -+ set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wsign-conversion") -+ set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wsign-conversion") - else () -- set (CMAKE_CXX_FLAGS "-Wall") -- set (CMAKE_C_FLAGS "-Wall") -+ set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall") -+ set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall") - endif () - - function (compiz_ensure_linkage) diff --git a/compiz-0.9.2.1-schemas.patch b/compiz-0.9.2.1-schemas.patch deleted file mode 100644 index 0cd88c0..0000000 --- a/compiz-0.9.2.1-schemas.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- compiz-with-glib-mainloop/cmake/plugin_extensions/CompizGenGconf.cmake 2011-01-15 13:20:16.373169983 +0000 -+++ compiz-with-glib-mainloop/cmake/plugin_extensions/CompizGenGconf.cmake.new 2011-01-15 16:19:59.265021752 +0000 -@@ -63,7 +63,7 @@ - find_program (XSLTPROC_EXECUTABLE xsltproc) - mark_as_advanced (FORCE XSLTPROC_EXECUTABLE) - --if (XSLTPROC_EXECUTABLE AND NOT COMPIZ_DISABLE_SCHEMAS_INSTALL) -+if (XSLTPROC_EXECUTABLE) - compiz_gconf_prepare_install_dirs () - add_custom_command ( - OUTPUT "${CMAKE_BINARY_DIR}/generated/compiz-${COMPIZ_CURRENT_PLUGIN}.schemas" diff --git a/compiz.spec b/compiz.spec index fce4953..5392e13 100644 --- a/compiz.spec +++ b/compiz.spec @@ -16,8 +16,8 @@ Name: compiz URL: http://www.compiz.org License: GPLv2+ and LGPLv2+ and MIT Group: User Interface/Desktops -Version: 0.9.2.2 -Release: 0.13.git619abc05b1%{?dist} +Version: 0.9.4 +Release: 1%{?dist} Summary: OpenGL window and compositing manager BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -51,13 +51,7 @@ BuildRequires: libxslt-devel BuildRequires: dbus-glib-devel BuildRequires: boost-devel BuildRequires: glibmm24-devel - -# This is the compiz-with-glib-mainloop branch of upstream compiz 0.9 -# git clone git://anongit.compiz.org/users/dbo/compiz-with-glib-mainloop -# cd compiz-with-glib-mainloop -# git archive --format=tar master > compiz-with-glib-mainloop-(commitid).tar -# bzip2 compiz-with-glib-mainloop-(commitid).tar -Source0: compiz-with-glib-mainloop-ecc61dc04567947e92cbb9686c1041619abc05b1.tar.bz2 +Source0: http://releases.compiz.org/%{version}/compiz-core-%{version}.tar.bz2 Source1: compiz-gtk Source2: compiz-gtk.desktop Source3: compiz-gnome.desktop @@ -69,17 +63,10 @@ Patch105: compiz-0.9-fedora-logo.patch Patch106: compiz-0.9-redhat-logo.patch #Patch110: scale-key.patch -# Fix behaviour of COMPIZ_DISABLE_SCHEMAS_INSTALL: it should install -# schema files but not do gconftool install (sent upstream) -Patch121: compiz-0.9.2.1-schemas.patch - # Allow installation of GNOME keybindings without GNOME window manager # settings stuff (sent upstream) Patch122: compiz-0.9.2.1-keybindings.patch -# Fix to not overwrite any passed-in cflags (sent upstream) -Patch123: compiz-0.9.2.1-cflags.patch - %description Compiz is one of the first OpenGL-accelerated compositing window managers for the X Window System. The integration allows it to perform @@ -177,16 +164,14 @@ and other kde integration related stuff. %prep -%setup -q -c compiz-0.9.2.1 +%setup -q -n core %if 0%{?fedora} %patch105 -p1 -b .fedora-logo %else %patch106 -p1 -b .redhat-logo %endif -%patch121 -p1 -b .schemas %patch122 -p1 -b .keybindings -%patch123 -p1 -b .cflags %build rm -rf $RPM_BUILD_ROOT @@ -223,9 +208,13 @@ install %SOURCE4 $RPM_BUILD_ROOT/%{_datadir}/gnome-session/sessions # lifted straight from Ubuntu, as long as installation of the upstream # ones is broken at least (I've reported this upstream) mkdir -p $RPM_BUILD_ROOT/%{_datadir}/gnome-control-center/keybindings - sed 's/wm_name=\"Metacity\" package=\"metacity\"/wm_name=\"Compiz\" package=\"compiz\"/' /usr/share/gnome-control-center/keybindings/50-metacity-desktop-key.xml > $RPM_BUILD_ROOT/%{_datadir}/gnome-control-center/keybindings/50-compiz-desktop-key.xml - sed 's/wm_name=\"Metacity\" package=\"metacity\"/wm_name=\"Compiz\" package=\"compiz\"/' /usr/share/gnome-control-center/keybindings/50-metacity-key.xml > $RPM_BUILD_ROOT/%{_datadir}/gnome-control-center/keybindings/50-compiz-key.xml - sed -i 's#key=\"/apps/metacity/general/num_workspaces\" comparison=\"gt\"##g' $RPM_BUILD_ROOT/%{_datadir}/gnome-control-center/keybindings/50-compiz-key.xml + sed 's/wm_name=\"Metacity\" package=\"metacity\"/wm_name=\"Compiz\" package=\"compiz\"/' /usr/share/gnome-control-center/keybindings/50-metacity-launchers.xml > $RPM_BUILD_ROOT/%{_datadir}/gnome-control-center/keybindings/50-compiz-launchers.xml + sed 's/wm_name=\"Metacity\" package=\"metacity\"/wm_name=\"Compiz\" package=\"compiz\"/' /usr/share/gnome-control-center/keybindings/50-metacity-navigation.xml > $RPM_BUILD_ROOT/%{_datadir}/gnome-control-center/keybindings/50-compiz-navigation.xml + sed 's/wm_name=\"Metacity\" package=\"metacity\"/wm_name=\"Compiz\" package=\"compiz\"/' /usr/share/gnome-control-center/keybindings/50-metacity-screenshot.xml > $RPM_BUILD_ROOT/%{_datadir}/gnome-control-center/keybindings/50-compiz-screenshot.xml + sed 's/wm_name=\"Metacity\" package=\"metacity\"/wm_name=\"Compiz\" package=\"compiz\"/' /usr/share/gnome-control-center/keybindings/50-metacity-system.xml > $RPM_BUILD_ROOT/%{_datadir}/gnome-control-center/keybindings/50-compiz-system.xml + sed 's/wm_name=\"Metacity\" package=\"metacity\"/wm_name=\"Compiz\" package=\"compiz\"/' /usr/share/gnome-control-center/keybindings/50-metacity-windows.xml > $RPM_BUILD_ROOT/%{_datadir}/gnome-control-center/keybindings/50-compiz-windows.xml + sed -i 's#key=\"/apps/metacity/general/num_workspaces\" comparison=\"gt\"##g' $RPM_BUILD_ROOT/%{_datadir}/gnome-control-center/keybindings/50-compiz-navigation.xml + sed -i 's#key=\"/apps/metacity/general/num_workspaces\" comparison=\"gt\"##g' $RPM_BUILD_ROOT/%{_datadir}/gnome-control-center/keybindings/50-compiz-windows.xml desktop-file-install --vendor="" \ --dir $RPM_BUILD_ROOT%{_datadir}/applications \ @@ -301,15 +290,15 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/libdecoration.so.* %dir %{_libdir}/compiz %dir %{_datadir}/compiz -%{_datadir}/compiz/images +%{_datadir}/compiz/cube/images %{_datadir}/compiz/core.xml +%{_datadir}/compiz/icon.png %files gtk -f gtk-files.txt %defattr(-, root, root) %{_bindir}/compiz-gtk %{_bindir}/gtk-window-decorator -%{_datadir}/gnome-control-center/keybindings/50-compiz-desktop-key.xml -%{_datadir}/gnome-control-center/keybindings/50-compiz-key.xml +%{_datadir}/gnome-control-center/keybindings/50-compiz-*.xml %{_datadir}/applications/compiz-gtk.desktop # gtk-window-decorator only stores config in gconf at present %{_sysconfdir}/gconf/schemas/gwd.schemas @@ -347,6 +336,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Mon Mar 14 2011 Adam Williamson - 0.9.4-1 +- new release 0.9.4 + * Tue Feb 08 2011 Fedora Release Engineering - 0.9.2.2-0.13.git619abc05b1 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild diff --git a/sources b/sources index cca4cea..974e6d4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -651926ef6ac98681ee2821579cb106b9 compiz-with-glib-mainloop-ecc61dc04567947e92cbb9686c1041619abc05b1.tar.bz2 +10841e91a442dcaad85381d79269d643 compiz-core-0.9.4.tar.bz2