[compiz-fusion-extras] new release 0.9.2.1 adjust build for CMake, use gconf macros, rediff notify patch

Thu Jan 20 16:32:27 UTC 2011

commit 41f9fe0d0a931dc85ecda5daea4f5b2354d91f9e
Author: Adam Williamson <awilliam at redhat.com>
Date:   Thu Jan 20 16:32:02 2011 +0000

    new release 0.9.2.1
    adjust build for CMake, use gconf macros, rediff notify patch

 .gitignore                |    1 +
 compiz-fusion-extras.spec |  101 ++++++++++++++++++++++-----------------------
 libnotify-070-fix.diff    |   18 ++++----
 sources                   |    2 +-
 4 files changed, 60 insertions(+), 62 deletions(-)
---

diff --git a/.gitignore b/.gitignore
index 391edab..7e0a6d6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 compiz-plugins-extra-0.8.6.tar.bz2
+/compiz-plugins-extra-0.9.2.1.tar.bz2
diff --git a/compiz-fusion-extras.spec b/compiz-fusion-extras.spec
index 508b405..88ad3fb 100644
--- a/compiz-fusion-extras.spec
+++ b/compiz-fusion-extras.spec
@@ -1,20 +1,21 @@
-%define plugins 3d addhelper bench bicubic crashhandler cubeaddon extrawm fadedesktop firepaint gears group loginout maximumize mblur notification reflex scalefilter shelf showdesktop showmouse splash trailfocus wallpaper widget grid
+%global plugins 3d addhelper animationaddon bench bicubic crashhandler cubeaddon extrawm fadedesktop firepaint gears grid group loginout maximumize mblur notification reflex scalefilter shelf showdesktop showmouse splash trailfocus wallpaper widget
+%global plugins_compiz %(echo %{plugins} | sed -e 's/\\</compiz-/g')
 
 Name: compiz-fusion-extras
-Version: 0.8.6
-Release: 2%{?dist}
-Summary: Additional Compiz Fusion plugins for Compiz      
+Version: 0.9.2.1
+Release: 1%{?dist}
+Summary: Additional plugins for Compiz      
 
 Group: User Interface/Desktops        
 License: GPLv2+       
-URL: http://compiz-fusion.org            
-Source0: http://releases.compiz-fusion.org/%{version}/compiz-plugins-extra-%{version}.tar.bz2   
+URL: http://www.compiz.org            
+Source0: http://releases.compiz.org/%{version}/compiz-plugins-extra-%{version}.tar.bz2   
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Patch0:   libnotify-070-fix.diff 
 # libdrm is not available on these arches
 ExcludeArch: s390 s390x
 
-BuildRequires: compiz-fusion-devel >= %{version}
+BuildRequires: compiz-plugins-main-devel >= %{version}
 BuildRequires: compiz-bcop >= 0.8.4
 BuildRequires: gettext-devel
 BuildRequires: perl(XML::Parser)
@@ -25,8 +26,12 @@ BuildRequires: GConf2
 BuildRequires: libjpeg-devel
 BuildRequires: gawk
 BuildRequires: intltool
+BuildRequires: cmake
+BuildRequires: boost-devel
+BuildRequires: pkgconfig
+BuildRequires: gtk2-devel
 
-Requires: compiz-fusion >= %{version} 
+Requires: compiz-plugins-main >= %{version} 
 
 %description
 The Compiz Fusion Project brings 3D desktop visual effects that improve
@@ -34,28 +39,29 @@ usability of the X Window System and provide increased productivity
 though plugins and themes contributed by the community giving a
 rich desktop experience.
 
-This package contains additional plugins from the Compiz Fusion Project
+This package contains additional plugins from the Compiz Fusion Project.
 
-%package gnome
-Summary: Compiz Fusion Extras gnome configuration
+%package gconf
+Summary: Compiz Fusion Extras GConf configuration
 Group: User Interface/Desktops
 Requires: %{name} = %{version}
 Requires(pre): GConf2
 Requires(post): GConf2
 Requires(preun): GConf2
 
-%description gnome
-This package contains the GNOME configuration for
-Compiz Fusion Extras
+%description gconf
+This package contains the GConf configuration schemas for
+Compiz Fusion Extras.
 
 %package devel
 Group: Development/Libraries
 Summary: Development files for Compiz-Fusion
-Requires: compiz-fusion-devel >= %{version}
+Requires: compiz-plugins-main-devel >= %{version}
 Requires: %{name} = %{version}
 
 %description devel
-This package contain development files required for developing other plugins
+This package contains development files required for developing other
+plugins.
 
 %prep
 %setup -q -n compiz-plugins-extra-%{version}
@@ -63,60 +69,45 @@ This package contain development files required for developing other plugins
 
 
 %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
+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-extra
-
-
-%post gnome
-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-install-rule >& /dev/null || :
-
+%post gconf
+%gconf_schema_upgrade %{plugins_compiz}
 
-%pre gnome
-if [ "$1" -gt 1 ]; then
-  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-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-extra.lang
+%files
 %defattr(-,root,root,-)
 %doc COPYING AUTHORS
 %{_libdir}/compiz/*.so
 %{_datadir}/compiz/*.xml
-%{_datadir}/compiz/*.png
+%{_datadir}/compiz/cubeaddon
+%{_datadir}/compiz/notification
+%{_datadir}/compiz/reflex
+%{_datadir}/compiz/showmouse
+%{_datadir}/compiz/splash
 
-%files gnome
+%files gconf
 %defattr(-,root,root,-)
 %{_sysconfdir}/gconf/schemas/*.schemas
 
@@ -126,6 +117,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/compiz-*
 
 %changelog
+* Thu Jan 20 2011 Adam Williamson <awilliam at redhat.com> - 0.9.2.1-1
+- new release 0.9.2.1
+- adjust build for CMake
+- use gconf macros
+- rediff libnotify-070-fix.diff
+
 * Sun Nov 07 2010 leigh scott <leigh123linux at googlemail.com> - 0.8.6-2
 - rebuilt and patched for new libnotify version
 
diff --git a/libnotify-070-fix.diff b/libnotify-070-fix.diff
index b69284e..f092015 100644
--- a/libnotify-070-fix.diff
+++ b/libnotify-070-fix.diff
@@ -1,15 +1,15 @@
---- compiz-plugins-extra-0.8.6/src/notification/notification.c.orig	2010-03-29 15:09:18.000000000 +0100
-+++ compiz-plugins-extra-0.8.6/src/notification/notification.c	2010-11-07 10:07:51.176178563 +0000
-@@ -103,7 +103,11 @@ notifyLogMessage (const char   *componen
+--- compiz-plugins-extra-0.9.2.1/notification/src/notification.cpp	2010-11-07 04:58:15.000000000 +0000
++++ compiz-plugins-extra-0.9.2.1/notification/src/notification.cpp.new	2011-01-20 11:13:59.149668918 +0000
+@@ -55,7 +55,11 @@
+     logLevel = (char *) logLevelToString (level);
  
-     n = notify_notification_new (logLevel,
-                                  message,
--                                 iconUri, NULL);
-+                                 iconUri
+     n = notify_notification_new (logLevel, message,
+-				 iconUri.c_str (), NULL);
++				 iconUri.c_str ()
 +#if !defined(NOTIFY_VERSION_MINOR) || (NOTIFY_VERSION_MAJOR == 0 && NOTIFY_VERSION_MINOR < 7)
 +                                            , NULL
 +#endif
 +                                            );
  
-     notify_notification_set_timeout (n, nd->timeout);
- 
+     timeout = optionGetTimeout ();
+     if (timeout > 0)
diff --git a/sources b/sources
index 56661f9..d312ea4 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-fdeec3e437e70d7f68900c031f3165d5  compiz-plugins-extra-0.8.6.tar.bz2
+fc285b356c01578cd959914cff302d0c  compiz-plugins-extra-0.9.2.1.tar.bz2
