[libcompizconfig] new release 0.9.2.1

[Adam Williamson]

commit bfef320a779f8ff7a6cc51f6b2b75543f5a9f11a
Author: Adam Williamson <awilliam at redhat.com>
Date:   Tue Jan 18 15:19:55 2011 +0000

    new release 0.9.2.1

 .gitignore           |    1 +
 libcompizconfig.spec |   46 +++++++++++++++++++++++++++++++++++-----------
 sources              |    2 +-
 3 files changed, 37 insertions(+), 12 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index e2e55d2..dac554a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 libcompizconfig-0.8.4.tar.bz2
+/libcompizconfig-0.9.2.1.tar.bz2
diff --git a/libcompizconfig.spec b/libcompizconfig.spec
index cb02adb..fc82ec5 100644
--- a/libcompizconfig.spec
+++ b/libcompizconfig.spec
@@ -1,25 +1,27 @@
-%define         basever 0.8.4
+%define         basever 0.9.2.1
 
 Name:           libcompizconfig
-Version:        0.8.4
-Release:        4%{?dist}
+Version:        0.9.2.1
+Release:        2%{?dist}
 Summary:        Configuration backend for compiz
 
 Group:          System Environment/Libraries
 # backends/libini.so is GPLv2+, other parts are LGPLv2+
 License:        LGPLv2+ and GPLv2+
-URL:            http://www.opencompositing.org/
+URL:            http://www.compiz.org/
 
 Source0:        http://releases.compiz-fusion.org/%{version}/%{name}-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # libdrm is not available on these arches
 ExcludeArch:    s390 s390x
-BuildRequires:  compiz-devel >= %{basever}, compiz-bcop >= %{basever}
+BuildRequires:  compiz-devel >= %{basever}
 BuildRequires:  libX11-devel, gettext, intltool
+BuildRequires:  cmake
 BuildRequires:  perl(XML::Parser)
 BuildRequires:  mesa-libGL-devel
 BuildRequires:  protobuf-devel
+BuildRequires:  boost-devel
 
 %description
 The Compiz Project brings 3D desktop visual effects that improve
@@ -45,16 +47,31 @@ developing applications that use %{name}.
 
 
 %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 -DCOMPIZ_PLUGIN_INSTALL_TYPE=package -DCOMPIZ_DISABLE_SCHEMAS_INSTALL=ON -DCOMPIZ_INSTALL_GCONF_SCHEMA_DIR=%{_sysconfdir}/gconf/schemas ..
+make VERBOSE=1 %{?_smp_mflags}
+popd
 
 
 %install
+pushd build
 rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
+make DESTDIR=$RPM_BUILD_ROOT install
+
+# This should work, but is buggy upstream:
+# make DESTDIR=$RPM_BUILD_ROOT findcompizconfig_install
+# So we do this instead:
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/cmake/Modules
+%__cmake -E copy ../cmake/FindCompizConfig.cmake $RPM_BUILD_ROOT%{_datadir}/cmake/Modules
+
+popd
+
 find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
 
+#schema is useless
+rm -f $RPM_BUILD_ROOT/%{_sysconfdir}/gconf/schemas/compiz-ccp.schemas
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -64,11 +81,9 @@ rm -rf $RPM_BUILD_ROOT
 
 %postun -p /sbin/ldconfig
 
-
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING NEWS VERSION
-%{_sysconfdir}/compizconfig/
 %{_libdir}/*.so.*
 %{_datadir}/compiz/ccp.xml
 %{_libdir}/compiz/*.so
@@ -79,11 +94,20 @@ rm -rf $RPM_BUILD_ROOT
 %files devel
 %defattr(-,root,root,-)
 %{_includedir}/*
+%{_datadir}/cmake/Modules/FindCompizConfig.cmake
+%{_datadir}/compiz/cmake/LibCompizConfigCommon.cmake
 %{_libdir}/*.so
 %{_libdir}/pkgconfig/libcompizconfig.pc
 
 
 %changelog
+* Sun Jan 16 2011 Adam Williamson <awilliam at redhat.com> - 0.9.2.1-2
+- drop gconf stuff entirely
+
+* Sat Jan 15 2011 Adam Williamson <awilliam at redhat.com> - 0.9.2.1-1
+- new release 0.9.2.1
+- switch to cmake build system
+
 * Sat Nov 06 2010 leigh scott <leigh123linux at googlemail.com> - 0.8.4-4
 - rebuilt
 
diff --git a/sources b/sources
index 57d654a..06d1512 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-723e076722370c35c47c2ab2ae445422  libcompizconfig-0.8.4.tar.bz2
+e55190b8986c0fcc69a882fc87c0073c  libcompizconfig-0.9.2.1.tar.bz2