[compizconfig-backend-gconf] new release 0.9.2.1 (plus git)

[Adam Williamson]

commit 425fb9d51d5d08b471e48aea70bd7061c965133d
Author: Adam Williamson <awilliam at redhat.com>
Date:   Tue Jan 18 15:23:37 2011 +0000

    new release 0.9.2.1 (plus git)

 .gitignore                      |    1 +
 compizconfig-backend-gconf.spec |   42 +++++++++++++++++++++++++-------------
 sources                         |    2 +-
 3 files changed, 29 insertions(+), 16 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 27f1911..131e3de 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 compizconfig-backend-gconf-0.8.4.tar.bz2
+/compizconfig-backend-gconf-861a1d44b2041d760226ffc2e7d8f62f4afd4d0d.tar.bz2
diff --git a/compizconfig-backend-gconf.spec b/compizconfig-backend-gconf.spec
index b298109..ebfeab9 100644
--- a/compizconfig-backend-gconf.spec
+++ b/compizconfig-backend-gconf.spec
@@ -1,25 +1,28 @@
-%define         basever 0.8.4
+%define         basever 0.9.2.1
 
 Name:           compizconfig-backend-gconf
-Version:        0.8.4
-Release:        2%{?dist}
+Version:        0.9.2.2
+Release:        0.1.git86d949fad4%{?dist}
 Summary:        GConf backend for compizconfig
 
 Group:          System Environment/Libraries
 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-fusion.org/%{version}/%{name}-%{version}.tar.bz2
+
+# git clone git://anongit.compiz.org/compiz/compizconfig/compizconfig-backend-gconf
+# cd compizconfig-backend-gconf
+# git archive --format=tar > compizconfig-backend-gconf-(commitid).tar
+# bzip2 compizconfig-backend-gconf-(commitid).tar
+Source0:        %{name}-861a1d44b2041d760226ffc2e7d8f62f4afd4d0d.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  libcompizconfig-devel >= %{basever}, GConf2-devel
 BuildRequires:  intltool, libtool
+BuildRequires:  cmake
 # backend-gconf requires the gconf schemas from compiz-gnome to work
 Requires:       compiz-gnome >= %{basever}
 
-#upstream patches
-#http://gitweb.compiz.org/?p=fusion/compizconfig/compizconfig-backend-gconf;a=commit;h=74c3fd404f0879b5d36c1167d0b43986d949fad4
-Patch0:         compizconfig-backend-gconf-74c3fd404f0879b5d36c1167d0b43986d949fad4.patch
-
 # libdrm is not available on these arches
 ExcludeArch:    s390 s390x ppc64 
 
@@ -32,17 +35,22 @@ rich desktop experience.
 This package contains the Gconf backend for libcompizconfig
 
 %prep
-%setup -q
-%patch0 -p1
+%setup -q -c compizconfig-backend-gconf-0.9.2.2
 
 %build
-%configure --disable-static
-make %{?_smp_mflags}
-
+rm -rf $RPM_BUILD_ROOT
+mkdir build
+pushd build
+%cmake -DCOMPIZ_BUILD_WITH_RPATH=OFF -DCOMPIZ_PACKAGING_ENABLED=ON ..
+make VERBOSE=1 %{?_smp_mflags}
+popd
 
 %install
+pushd build
 rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
+make DESTDIR=$RPM_BUILD_ROOT install
+popd
+
 find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
 
 %clean
@@ -54,6 +62,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/compizconfig/backends/libgconf.so
 
 %changelog
+* Sat Jan 15 2011 Adam Williamson <awilliam at redhat.com> - 0.9.2.2-0.1.git86d949fad4
+- new release (use a post-0.9.2.1 snapshot as there's a few significant
+  fixes)
+
 * Wed May 05 2010 Leigh Scott <leigh123linux at googlemail.com> - 0.8.4-2
 - add patch to integrate metacity's resize_with_right_button option
 
diff --git a/sources b/sources
index 881df58..3115db7 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-3149b45d1099c26735f3b6a91d946b1b  compizconfig-backend-gconf-0.8.4.tar.bz2
+d538a64a00a2dd3a231f1a97535648e4  compizconfig-backend-gconf-861a1d44b2041d760226ffc2e7d8f62f4afd4d0d.tar.bz2