[ccsm] new release 0.9.2.1

[Adam Williamson]

commit be79b4a1ed100a5245caeaf69c9ab74885b89d3e
Author: Adam Williamson <awilliam at redhat.com>
Date:   Tue Jan 18 15:17:11 2011 +0000

    new release 0.9.2.1

 .gitignore |    1 +
 ccsm.spec  |   32 ++++++++++++++++----------------
 sources    |    2 +-
 3 files changed, 18 insertions(+), 17 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index b032978..8030a7d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 ccsm-0.8.4.tar.bz2
+/ccsm-0.9.2.1.tar.bz2
diff --git a/ccsm.spec b/ccsm.spec
index 6aca085..ab26a56 100644
--- a/ccsm.spec
+++ b/ccsm.spec
@@ -2,29 +2,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))")}
 %endif
-%define         basever 0.8.4
+%define         basever 0.9.2.1
 
 Name:           ccsm
-Version:        0.8.4
-Release:        5%{?dist}
+Version:        0.9.2.1
+Release:        1%{?dist}
 Summary:        Plugin and configuration tool - Compiz Fusion Project
 
 Group:          User Interface/Desktops
 License:        GPLv2+
-URL:            http://www.opencompositing.org
+URL:            http://www.compiz.org
 
-Source0:        http://releases.compiz-fusion.org/%{version}/%{name}-%{version}.tar.bz2
+Source0:        http://releases.compiz.org/%{version}/%{name}-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Patch101:       ccsm-removeshebangs.patch
 Patch102:       widgets_filter.patch
-Patch103:       widget_dialog.patch
 # libdrm is not available on these arches
-
 ExcludeArch:    s390 s390x ppc64
 BuildArch:      noarch
 BuildRequires:  python-devel, gettext, desktop-file-utils, intltool
 Requires:       compizconfig-python >= %{basever} , libcompizconfig >= %{basever}
-Requires:       pygtk2 >= 2.10, python-sexy, compiz-manager
+Requires:       pygtk2 >= 2.10, python-sexy
 
 %description
 The Compiz Project brings 3D desktop visual effects that improve
@@ -37,19 +34,14 @@ plugins and the composite window manager.
 
 %prep
 %setup -q 
-%patch101 -p1 -b .ccsm-removeshebangs
 %patch102 -p1 -b .widgets_filter
-%patch103 -p1 -b .widget_dialog
 
 %build
-#configure 
-#make %{?_smp_mflags}
-python setup.py build
+CFLAGS="$RPM_OPT_FLAGS" python setup.py build
 
 %install
 rm -rf $RPM_BUILD_ROOT
-#make install DESTDIR=$RPM_BUILD_ROOT
-python setup.py install --prefix=%{_prefix} --root=$RPM_BUILD_ROOT
+python setup.py install --prefix=%{_prefix} --skip-build --root=$RPM_BUILD_ROOT
 desktop-file-install --vendor="fedora" \
       --dir=${RPM_BUILD_ROOT}%{_datadir}/applications \
       --remove-category="Compiz" \
@@ -88,6 +80,14 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sat Jan 15 2011 Adam Williamson <awilliam at redhat.com> - 0.9.2.1-1
+- new release 0.9.2.1
+- drop two patches now upstreamed
+- apply cflags when building
+- skip build when installing
+- depending on compiz-manager is a silly fix for the settings issue
+  correct fix is to have compiz-gtk launch compiz correctly
+
 * Fri Nov 19 2010 Izhar Firdaus <kagesenshi.87 at gmail.com> - 0.8.4-5
 - added dependency to compiz-manager as compiz-manager loads compiz with ccp,
   and gnome-wm loads compiz-manager if it exist. This should fix the long 
diff --git a/sources b/sources
index a7790f8..a03169a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-6bad7a02a91cc8fc9c4c48f83e91c08c  ccsm-0.8.4.tar.bz2
+194bd80635441841be4fc145c2d71134  ccsm-0.9.2.1.tar.bz2