[fusion-icon] add several patches to fix it up for compiz 0.9

[Adam Williamson]

commit c695343405410efdb88caf77216ddc98fef02331
Author: Adam Williamson <awilliam at redhat.com>
Date:   Wed Jan 19 01:17:28 2011 +0000

    add several patches to fix it up for compiz 0.9

 fusion-icon-0.1-compiz09_decor.patch         |   17 +++++++++++++++++
 fusion-icon-0.1-compiz09_desktop_hints.patch |   11 +++++++++++
 fusion-icon-0.1-compiz09_screen.patch        |   11 +++++++++++
 fusion-icon.spec                             |   21 ++++++++++++++++++---
 4 files changed, 57 insertions(+), 3 deletions(-)
---
diff --git a/fusion-icon-0.1-compiz09_decor.patch b/fusion-icon-0.1-compiz09_decor.patch
new file mode 100644
index 0000000..65156c5
--- /dev/null
+++ b/fusion-icon-0.1-compiz09_decor.patch
@@ -0,0 +1,17 @@
+--- fusion-icon-5e2dc9/FusionIcon/util.py	2008-03-16 22:58:07.000000000 +0000
++++ fusion-icon-5e2dc9/FusionIcon/util.py.new	2011-01-19 00:47:38.791230764 +0000
+@@ -220,12 +220,12 @@
+ 
+ 		try:
+ 			context = compizconfig.Context( \
+-				plugins=['decoration'], basic_metadata=True)
++				plugins=['decor'], basic_metadata=True)
+ 
+ 		except:
+ 			context = compizconfig.Context()
+ 
+-		self.command = context.Plugins['decoration'].Display['command']
++		self.command = context.Plugins['decor'].Display['command']
+ 
+ 		for decorator in installed.decorators:
+ 			self[decorator] = CompizDecorator(decorator, self, installed)
diff --git a/fusion-icon-0.1-compiz09_desktop_hints.patch b/fusion-icon-0.1-compiz09_desktop_hints.patch
new file mode 100644
index 0000000..4ad712f
--- /dev/null
+++ b/fusion-icon-0.1-compiz09_desktop_hints.patch
@@ -0,0 +1,11 @@
+--- fusion-icon-5e2dc9/FusionIcon/data.py	2008-03-16 22:58:07.000000000 +0000
++++ fusion-icon-5e2dc9/FusionIcon/data.py.new	2011-01-19 01:14:49.907802877 +0000
+@@ -33,7 +33,7 @@
+ 	'/usr/share/nvidia-glx/diversions/libGL.so.1.2',
+ )
+ 
+-compiz_args = ['--replace', '--sm-disable', '--ignore-desktop-hints', 'ccp']
++compiz_args = ['--replace', '--sm-disable', 'ccp']
+ 
+ config_home = os.environ.get('XDG_CONFIG_HOME',
+ 			os.path.join(os.environ['HOME'], '.config'))
diff --git a/fusion-icon-0.1-compiz09_screen.patch b/fusion-icon-0.1-compiz09_screen.patch
new file mode 100644
index 0000000..a79ab5b
--- /dev/null
+++ b/fusion-icon-0.1-compiz09_screen.patch
@@ -0,0 +1,11 @@
+--- fusion-icon-5e2dc9/FusionIcon/util.py	2011-01-19 00:47:38.791230764 +0000
++++ fusion-icon-5e2dc9/FusionIcon/util.py.new2	2011-01-19 00:59:02.386674996 +0000
+@@ -225,7 +225,7 @@
+ 		except:
+ 			context = compizconfig.Context()
+ 
+-		self.command = context.Plugins['decor'].Display['command']
++		self.command = context.Plugins['decor'].Screen['command']
+ 
+ 		for decorator in installed.decorators:
+ 			self[decorator] = CompizDecorator(decorator, self, installed)
diff --git a/fusion-icon.spec b/fusion-icon.spec
index 4acbc82..d727e09 100644
--- a/fusion-icon.spec
+++ b/fusion-icon.spec
@@ -3,22 +3,28 @@
 
 Name:           fusion-icon
 Version:        0.1.0
-Release:        0.8.%{commit}git%{?dist}
+Release:        0.9.%{commit}git%{?dist}
 Summary:        Compiz Fusion panel applet
 Group:          User Interface/Desktops
 License:        GPLv2+
 
 # The source for this package was pulled from upstream's vcs.  Use the
 # following commands to generate the tarball:
-# git clone git://anongit.opencompositing.org/users/crdlb/fusion-icon fusion-icon-5e2dc9
+# git clone git://anongit.compiz-fusion.org/users/crdlb/fusion-icon fusion-icon-5e2dc9
 # cd fusion-icon-5e2dc9
 # git checkout 5e2dc9
 # rm -rf .git ; cd ../
 # tar -czvf fusion-icon-5e2dc9.tar.gz fusion-icon-5e2dc9
 
-URL:            http://www.opencompositing.org
+URL:            http://www.compiz.org
 Source0:        %{name}-%{commit}.tar.gz
 Patch0:         %{name}-runpatch.patch
+# 'decoration' plugin changed name to 'decor' in Compiz 0.9
+Patch1:         fusion-icon-0.1-compiz09_decor.patch
+# 'Display' changed to 'Screen' in compizconfig-python 0.9
+Patch2:         fusion-icon-0.1-compiz09_screen.patch
+# --ignore-desktop-hints parameter no longer exists in Compiz 0.9
+Patch3:         fusion-icon-0.1-compiz09_desktop_hints.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  python-devel
 BuildRequires:  desktop-file-utils
@@ -55,6 +61,9 @@ This package provides the qt UI for fusion-icon
 %prep
 %setup -q -n %{name}-%{commit}
 %patch0
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
 
 %build
 
@@ -104,6 +113,12 @@ rm -rf $RPM_BUILD_ROOT
 %{python_sitelib}/FusionIcon/interface_qt4/
 
 %changelog
+* Wed Jan 18 2011 Adam Williamson <awilliam at redhat.com> - 0.1.0-0.9.5e2dc9git
+- compiz09_decor.patch: adjust for renamed plugin in compiz 0.9
+- compiz09_screen.patch: Display renamed Screen in compizconfig 0.9
+- compiz09_desktop_hints.patch: --ignore-desktop-hints not in 0.9
+- update git repo location and package URL
+
 * Wed Jul 21 2010 David Malcolm <dmalcolm at redhat.com> - 0.1.0-0.8.5e2dc9git
 - Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild