[compiz-fusion-unsupported] - Update to 0.9.2.1 - adjust build for CMake - use gconf macros

Mon Jan 24 21:49:12 UTC 2011

commit e2a5aba26770e8a4c7f9d26ca55b566d4cde86fd
Author: Leigh Scott <leigh123linux at googlemail.com>
Date:   Mon Jan 24 21:49:05 2011 +0000

    - Update to 0.9.2.1
    - adjust build for CMake
    - use gconf macros

 .gitignore                     |    1 +
 compiz-fusion-unsupported.spec |   92 ++++++++++++++++++----------------------
 sources                        |    2 +-
 3 files changed, 44 insertions(+), 51 deletions(-)
---

diff --git a/.gitignore b/.gitignore
index 6d78cd6..fc09c1f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 compiz-plugins-unsupported-0.8.4.tar.bz2
+/compiz-plugins-unsupported-0.9.2.1.tar.bz2
diff --git a/compiz-fusion-unsupported.spec b/compiz-fusion-unsupported.spec
index c689fa6..8925d78 100644
--- a/compiz-fusion-unsupported.spec
+++ b/compiz-fusion-unsupported.spec
@@ -1,9 +1,9 @@
-%define plugins atlantis cubemodel elements fakeargb mswitch snow tile
-%define compiz_version 0.8.6
+%global plugins atlantis autumn bubbles cubemodel elements fakeargb fireflies snow stars tile
+%global plugins_compiz %(echo %{plugins} | sed -e 's/\\</compiz-/g')
  
 Name:  compiz-fusion-unsupported
-Version: 0.8.4
-Release: 3%{?dist}
+Version: 0.9.2.1
+Release: 1%{?dist}
 Summary: Additional plugins for Compiz
 Group: User Interface/Desktops
 License: GPLv2+
@@ -14,15 +14,18 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 # libdrm is not available on these arches
 ExcludeArch: s390 s390x
 
-BuildRequires: compiz-fusion-devel >= %{compiz_version}
-BuildRequires: compiz-bcop >= %{version}
+BuildRequires: compiz-plugins-main-devel >= %{version}
+BuildRequires: compiz-fusion-unsupported-devel
+BuildRequires: compiz-bcop >= 0.8.4
 BuildRequires: perl(XML::Parser)
 BuildRequires: GConf2
+BuildRequires: cmake
+BuildRequires: boost-devel
 BuildRequires: intltool
 BuildRequires: mesa-libGL-devel
 
 
-Requires: compiz-fusion >= %{compiz_version}
+Requires: compiz-plugins-main >= %{version}
 
 
 %description
@@ -33,23 +36,23 @@ rich desktop experience.
 
 This package contains additional plugins from the Compiz Fusion Project
 
-%package gnome
+%package gconf
 Summary: Compiz Fusion Unsupported gnome configuration
 Group: User Interface/Desktops
-Requires: %{name} = %{version}-%{release}
+Requires: %{name} = %{version}
 Requires(pre): GConf2
 Requires(post): GConf2
 Requires(preun): GConf2
 
-%description gnome
+%description gconf
 This package contains the GNOME configuration for
 Compiz Fusion Unsupported
 
 %package devel
 Group: Development/Libraries
 Summary: Development files for Compiz-Fusion
-Requires: compiz-fusion-devel >= %{compiz_version}
-Requires: %{name} = %{version}-%{release}
+Requires: compiz-plugins-main-devel >= %{version}
+Requires: %{name} = %{version}
 
 %description devel
 This package contain development files required for developing other plugins
@@ -57,75 +60,64 @@ This package contain development files required for developing other plugins
 
 %prep
 %setup -q -n compiz-plugins-unsupported-%{version}
-chmod -x src/cubemodel/*.c src/cubemodel/*.h
+#chmod -x src/cubemodel/*.c src/cubemodel/*.h
 
 
 %build 
-%configure --enable-schemas
-make %{?_smp_mflags}
+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
+make DESTDIR=%{buildroot} install
+popd
 
 rm -f $RPM_BUILD_ROOT%{_libdir}/compiz/*.la
 rm -f $RPM_BUILD_ROOT%{_libdir}/compiz/*.a
 
-%find_lang compiz-plugins-unsupported
 
+%post gconf
+%gconf_schema_upgrade %{plugins_compiz}
 
-%post gnome
-  export GCONF_CONFIG_SOURCE=`%{_bindir}/gconftool-2 --get-default-source`
+%pre gconf
+%gconf_schema_prepare %{plugins_compiz}
 
-  for p in in %{plugins}; do
-      echo %{_sysconfdir}/gconf/schemas/compiz-${p}.schemas ; done \
-      | xargs %{_bindir}/gconftool-2 --makefile-install-rule >& /dev/null || :
-
-
-%pre gnome
-if [ "$1" -gt 1 ]; then
-  export GCONF_CONFIG_SOURCE=`%{_bindir}/gconftool-2 --get-default-source`
-
-  for p in in %{plugins}; do
-	echo %{_sysconfdir}/gconf/schemas/compiz-${p}.schemas ; done \
-	| xargs %{_bindir}/gconftool-2 --makefile-uninstall-rule >& /dev/null || :
-
-fi
-
-%preun gnome
-if [ "$1" -eq 0 ]; then
-  export GCONF_CONFIG_SOURCE=`%{_bindir}/gconftool-2 --get-default-source`
-
-  for p in in %{plugins}; do
-	echo %{_sysconfdir}/gconf/schemas/compiz-${p}.schemas ; done \
-	| xargs %{_bindir}/gconftool-2 --makefile-uninstall-rule >& /dev/null || :
-  
-fi
+%preun gconf
+%gconf_schema_remove %{plugins_compiz}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 
-%files -f compiz-plugins-unsupported.lang
+%files
 %defattr(-,root,root,-)
 %doc COPYING AUTHORS
 %{_libdir}/compiz/*.so
 %{_datadir}/compiz/*.xml
-%{_datadir}/compiz/*.png
-%{_datadir}/compiz/*.svg
+%{_datadir}/compiz/elements/images/*.png
+%{_datadir}/compiz/elements/images/*.svg
 
-%files gnome
+%files gconf
 %defattr(-,root,root,-)
-%config %{_sysconfdir}/gconf/schemas/*.schemas
+%{_sysconfdir}/gconf/schemas/*.schemas
 
 %files devel
 %defattr(-,root,root,-)
-%{_includedir}/compiz/compiz-elements.h
-
+%{_includedir}/compiz/elements/elements.h
+%{_libdir}/pkgconfig/compiz-elements.pc
 
 
 %changelog
+* Mon Jan 24 2011 Leigh Scott <leigh123linux at googlemail.com> - 0.9.2.1-1
+- Update to 0.9.2.1
+- adjust build for CMake
+- use gconf macros
+
 * Sun Apr 18 2010 Leigh Scott <leigh123linux at googlemail.com> - 0.8.4-3
 - bump requirements to 0.8.6 for compiz-fusion
 
diff --git a/sources b/sources
index 8467595..a531d41 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-73c7d70040cd4fd48ea29677b0f2f21e  compiz-plugins-unsupported-0.8.4.tar.bz2
+8ef2059fe31fbe0af9525ddfba70a017  compiz-plugins-unsupported-0.9.2.1.tar.bz2
