diff --git a/compiz-plugins-main.spec b/compiz-plugins-main.spec index 91028ff..e56711d 100644 --- a/compiz-plugins-main.spec +++ b/compiz-plugins-main.spec @@ -1,19 +1,16 @@ %global plugins animation colorfilter expo ezoom imgjpeg mag mousepoll neg opacify put resizeinfo ring scaleaddon session shift snap staticswitcher text thumbnail titleinfo vpswitch winrules workarounds -%global schemas compiz-animation compiz-colorfilter compiz-expo compiz-ezoom compiz-imgjpeg compiz-mag compiz-mousepoll compiz-neg compiz-opacify compiz-put compiz-resizeinfo compiz-ring compiz-scaleaddon compiz-session compiz-shift compiz-snap compiz-staticswitcher compiz-text compiz-thumbnail compiz-titleinfo compiz-vpswitch compiz-winrules compiz-workarounds - %global basever 0.8.8 Name: compiz-plugins-main Version: 0.8.8 -Release: 4%{?dist} +Release: 5%{?dist} Epoch: 1 Summary: Collection of Compiz Fusion plugins for Compiz Group: User Interface/Desktops License: GPLv2+ URL: http://www.compiz.org Source0: http://releases.compiz.org/%{version}/%{name}-%{version}.tar.bz2 -Source1: compiz-plugins-main_plugin-matecompat.svg Patch0: compiz-plugins-main_mate.patch # new from debian @@ -35,31 +32,20 @@ BuildRequires: pango-devel BuildRequires: perl(XML::Parser) BuildRequires: mesa-libGLU-devel BuildRequires: libXrender-devel -BuildRequires: mate-conf BuildRequires: libjpeg-devel BuildRequires: intltool Requires: compiz%{?_isa} >= %{basever} +Provides: compiz-plugins-main-mate = %{epoch}:%{version}-%{release} +Obsoletes: compiz-plugins-main-mate < %{epoch}:%{version}-%{release} + %description The Compiz Fusion Project brings 3D desktop visual effects that improve usability of the X Window System and provide increased productivity though plugins and themes contributed by the community giving a rich desktop experience - -%package mate -Summary: Compiz Fusion mate configuration -Group: User Interface/Desktops -Requires: %{name}%{?_isa} = %{epoch}:%{version}-%{release} -Requires(pre): mate-conf -Requires(post): mate-conf -Requires(preun): mate-conf - -%description mate -This package contains the MATE configuration for Compiz -Fusion - %package devel Group: Development/Libraries Summary: Development files for Compiz-Fusion @@ -83,7 +69,7 @@ rm -rf images/Gnome %build -%configure --enable-schemas +%configure --disable-schemas make %{?_smp_mflags} @@ -95,42 +81,15 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/compiz/*.a # remove wall plugin rm -f $RPM_BUILD_ROOT%{_datadir}/compiz/wall.xml rm -f $RPM_BUILD_ROOT%{_libdir}/compiz/libwall.so -rm -f $RPM_BUILD_ROOT%{_sysconfdir}/mateconf/schemas/compiz-wall.schemas # remove kdecompat plugin -rm -f $RPM_BUILD_ROOT%{_sysconfdir}/mateconf/schemas/compiz-kdecompat.schemas rm -f $RPM_BUILD_ROOT%{_libdir}/compiz/libkdecompat.so rm -f $RPM_BUILD_ROOT%{_datadir}/compiz/kdecompat.xml -# matecompat icon -mkdir -p $RPM_BUILD_ROOT%{_datadir}/ccsm/icons/hicolor/scalable/apps -cp -f %SOURCE1 $RPM_BUILD_ROOT%{_datadir}/ccsm/icons/hicolor/scalable/apps/plugin-matecompat.svg - # remove oxygen images rm -rf $RPM_BUILD_ROOT%{_datadir}/compiz/Oxygen -%find_lang compiz-plugins-main - +%find_lang %{name} -%post mate -%mateconf_schema_upgrade %{schemas} - -%pre mate -%mateconf_schema_prepare %{schemas} - -%preun mate -%mateconf_schema_remove %{schemas} - -%post -/bin/touch --no-create %{_datadir}/ccsm/icons/hicolor/scalable/apps &>/dev/null || : - -%postun -if [ $1 -eq 0 ] ; then - /bin/touch --no-create %{_datadir}/ccsm/icons/hicolor/scalable/apps &>/dev/null - /usr/bin/gtk-update-icon-cache %{_datadir}/ccsm/icons/hicolor/scalable/apps &>/dev/null || : -fi - -%posttrans -/usr/bin/gtk-update-icon-cache %{_datadir}/ccsm/icons/hicolor/scalable/apps &>/dev/null || : %files -f %{name}.lang @@ -139,10 +98,6 @@ fi %{_datadir}/compiz/*.xml %{_datadir}/compiz/filters/ %{_datadir}/compiz/Mate/ -%{_datadir}/ccsm/icons/hicolor/scalable/apps/plugin-matecompat.svg - -%files mate -%config %{_sysconfdir}/mateconf/schemas/*.schemas %files devel %{_includedir}/compiz/ @@ -150,6 +105,12 @@ fi %changelog +* Sat Dec 22 2012 Wolfgang Ulbrich - 1:0.8.8-5 +- disable mateconf schemas and clean spec file +- remove mate subpackage +- remove matecompat icon +- remove icon cache scriptlet + * Mon Oct 15 2012 Wolfgang Ulbrich - 1:0.8.8-4 - own include dir - move icons from gnome to mate folder in source @@ -160,7 +121,6 @@ fi - add compiz-plugins-main_incorrect-fsf-address_fix.patch - add epoch - add basever -- initial build for fedora * Sat Sep 29 2012 Wolfgang Ulbrich - 0.8.8-3 - remove kdecompat @@ -176,3 +136,6 @@ fi * Tue May 15 2012 Wolfgang Ulbrich - 0.8.8-1 - build for mate +* Sun May 06 2012 Andrew Wyatt - 0.8.8-1 +- Update to latest stable release + diff --git a/compiz-plugins-main_plugin-matecompat.svg b/compiz-plugins-main_plugin-matecompat.svg deleted file mode 100644 index c5d3bf1..0000000 --- a/compiz-plugins-main_plugin-matecompat.svg +++ /dev/null @@ -1,134 +0,0 @@ - - - - - - - - image/svg+xml - - - - - - - - -