From 54b8dcffe5d3c1e671d8a16d71a387c491032167 Mon Sep 17 00:00:00 2001
From: Adam Williamson <awilliam@redhat.com>
Date: Jan 18 2011 15:21:15 +0000
Subject: new release 0.9.2.1

add cinit.patch

---

diff --git a/.gitignore b/.gitignore
index aaf582b..bd6d122 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 compizconfig-python-0.8.4.tar.bz2
+/compizconfig-python-0.9.2.1.tar.bz2
diff --git a/compizconfig-python-0.9.2.1-cinit.patch b/compizconfig-python-0.9.2.1-cinit.patch
new file mode 100644
index 0000000..bcd2efb
--- /dev/null
+++ b/compizconfig-python-0.9.2.1-cinit.patch
@@ -0,0 +1,56 @@
+--- compizconfig-python-0.9.2.1/src/compizconfig.pyx	2010-11-07 04:55:00.000000000 +0000
++++ compizconfig-python-0.9.2.1/src/compizconfig.pyx.new	2011-01-15 23:29:20.819139836 +0000
+@@ -570,7 +570,7 @@
+     cdef object extendedStrRestrictions
+     cdef object baseStrRestrictions
+ 
+-    def __new__ (self, Plugin plugin, name):
++    def __init__ (self, Plugin plugin, name):
+         cdef CCSSettingType t
+         cdef CCSSettingInfo * i
+ 
+@@ -674,7 +674,7 @@
+ cdef class SSGroup:
+     cdef object screen
+ 
+-    def __new__ (self, screen):
++    def __init__ (self, screen):
+         self.screen = screen
+ 
+     property Screen:
+@@ -692,7 +692,7 @@
+     cdef object ranking
+     cdef object hasExtendedString
+     
+-    def __new__ (self, Context context, name):
++    def __init__ (self, Context context, name):
+         self.ccsPlugin = ccsFindPlugin (context.ccsContext, name)
+         self.context = context
+         self.screen = {}
+@@ -1007,7 +1007,7 @@
+     cdef Context context
+     cdef char * name
+ 
+-    def __new__ (self, Context context, name):
++    def __init__ (self, Context context, name):
+         self.context = context
+         self.name = strdup (name)
+ 
+@@ -1029,7 +1029,7 @@
+     cdef Bool profileSupport
+     cdef Bool integrationSupport
+ 
+-    def __new__ (self, Context context, info):
++    def __init__ (self, Context context, info):
+         self.context = context
+         self.name = strdup (info[0])
+         self.shortDesc = strdup (info[1])
+@@ -1072,7 +1072,7 @@
+     cdef object currentBackend
+     cdef Bool integration
+ 
+-    def __new__ (self, screenNum = 0, plugins = [], basic_metadata = False):
++    def __init__ (self, screenNum = 0, plugins = [], basic_metadata = False):
+         cdef CCSPlugin * pl
+         cdef CCSList * pll
+         if basic_metadata:
diff --git a/compizconfig-python.spec b/compizconfig-python.spec
index a71722d..b3507f5 100644
--- a/compizconfig-python.spec
+++ b/compizconfig-python.spec
@@ -1,22 +1,26 @@
 %{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
-%define         basever 0.8.4
+%define         basever 0.9.2.1
 
 Name:           compizconfig-python
-Version:        0.8.4
-Release:        2%{?dist}
+Version:        0.9.2.1
+Release:        1%{?dist}
 Summary:        Python bindings for the Compiz Configuration System
 
 Group:          Development/Libraries
 License:        LGPLv2+
-URL:            http://www.compiz-fusion.org
+URL:            http://www.compiz.org
 
 Source0:        http://releases.compiz-fusion.org/%{version}/%{name}-%{version}.tar.bz2
+# Use __cinit__ instead of __new__
+# See https://github.com/cython/cython/commit/e3c9a78686b7a7f0d36da8e6189b1e1fb4037c73
+# Submitted upstream by email
+Patch0:         compizconfig-python-0.9.2.1-cinit.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # libdrm is not available on these arches
 ExcludeArch:    s390 s390x ppc64
-BuildRequires:  libcompizconfig-devel >= %{basever}, Pyrex, glib2-devel
+BuildRequires:  libcompizconfig-devel >= %{basever}, Cython, Pyrex, glib2-devel
 
 %description
 The Compiz Project brings 3D desktop visual effects that improve
@@ -29,15 +33,14 @@ plugins and the composite window manager.
 
 %prep
 %setup -q 
+%patch0 -p1 -b .cinit
 
 %build
-%configure --disable-static
-make %{?_smp_mflags}
-
+CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
+%{__python} setup.py install --skip-build --root $RPM_BUILD_ROOT
 find $RPM_BUILD_ROOT -type f -name "*.a" -o -name "*.la" | xargs rm -f
 
 
@@ -49,10 +52,14 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root,-)
 %doc COPYING
 %{python_sitearch}/compizconfig.so
-%exclude %{_libdir}/pkgconfig/compizconfig-python.pc
-
+%{python_sitearch}/compizconfig*.egg-info
 
 %changelog
+* Sat Jan 15 2011 Adam Williamson <awilliam@redhat.com> - 0.9.2.1-1
+- new release 0.9.2.1
+- switch to setup.py buildsystem
+- fix a wrong method which breaks build (cinit.patch)
+
 * Wed Jul 21 2010 David Malcolm <dmalcolm@redhat.com> - 0.8.4-2
 - Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild
 
diff --git a/sources b/sources
index 150cbc6..8f62968 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-702f83f63ce5dc3c6c1d27e07fb62fc3  compizconfig-python-0.8.4.tar.bz2
+44d4b56006a3766f92bb995ea0cc341d  compizconfig-python-0.9.2.1.tar.bz2