diff --git a/compiz.spec b/compiz.spec index a01a17f..e4e690b 100644 --- a/compiz.spec +++ b/compiz.spec @@ -12,7 +12,7 @@ URL: http://www.compiz.org License: GPLv2+ and LGPLv2+ and MIT Group: User Interface/Desktops Version: 0.8.8 -Release: 20%{?dist} +Release: 21%{?dist} Epoch: 1 Summary: OpenGL window and compositing manager @@ -58,11 +58,9 @@ Source1: compiz-mate-gtk Source2: compiz-mate-gtk.desktop Source3: compiz-mate-emerald Source4: compiz-mate-emerald.desktop -Source9: compiz-lxde-gtk -Source10: compiz-lxde-gtk.desktop -Source11: compiz-lxde-emerald -Source12: compiz-lxde-emerald.desktop -Source13: compiz-plugins-main_plugin-matecompat.svg +Source5: compiz-lxde-emerald +Source6: compiz-lxde-emerald.desktop +Source7: compiz-plugins-main_plugin-matecompat.svg # fork gnome to mate Patch0: compiz_new_mate.patch @@ -131,14 +129,6 @@ The compiz-mate package contains the matecompat plugin and start scripts to start Compiz with emerald and gtk-windows-decorator. -%package gtk-windows-decorator -Summary: Compiz xfce integration bits -Group: User Interface/Desktops -Requires: %{name}%{?_isa} = %{epoch}:%{version}-%{release} - -%description gtk-windows-decorator -The compiz-gtk-windows-decorator package contains the GTK -decorator for compiz. %package lxde Summary: Compiz lxde integration bits Group: User Interface/Desktops @@ -203,8 +193,7 @@ make DESTDIR=$RPM_BUILD_ROOT install || exit 1 install %SOURCE1 $RPM_BUILD_ROOT%{_bindir} install %SOURCE3 $RPM_BUILD_ROOT%{_bindir} -install %SOURCE9 $RPM_BUILD_ROOT%{_bindir} -install %SOURCE11 $RPM_BUILD_ROOT%{_bindir} +install %SOURCE5 $RPM_BUILD_ROOT%{_bindir} desktop-file-install --vendor="" \ --dir $RPM_BUILD_ROOT%{_datadir}/applications \ @@ -214,14 +203,11 @@ desktop-file-install --vendor="" \ %SOURCE4 desktop-file-install --vendor="" \ --dir $RPM_BUILD_ROOT%{_datadir}/applications \ - %SOURCE10 -desktop-file-install --vendor="" \ - --dir $RPM_BUILD_ROOT%{_datadir}/applications \ - %SOURCE12 + %SOURCE6 # matecompat icon mkdir -p $RPM_BUILD_ROOT%{_datadir}/ccsm/icons/hicolor/scalable/apps -cp -f %SOURCE13 $RPM_BUILD_ROOT%{_datadir}/ccsm/icons/hicolor/scalable/apps/plugin-matecompat.svg +cp -f %SOURCE7 $RPM_BUILD_ROOT%{_datadir}/ccsm/icons/hicolor/scalable/apps/plugin-matecompat.svg rm $RPM_BUILD_ROOT%{_datadir}/applications/compiz.desktop @@ -246,7 +232,6 @@ done >> mate-files.txt %check desktop-file-validate $RPM_BUILD_ROOT/%{_datadir}/applications/compiz-mate-gtk.desktop desktop-file-validate $RPM_BUILD_ROOT/%{_datadir}/applications/compiz-mate-emerald.desktop -desktop-file-validate $RPM_BUILD_ROOT/%{_datadir}/applications/compiz-lxde-gtk.desktop desktop-file-validate $RPM_BUILD_ROOT/%{_datadir}/applications/compiz-lxde-emerald.desktop @@ -286,20 +271,16 @@ fi %{_datadir}/compiz/core.xml %files mate -f mate-files.txt +%{_bindir}/gtk-window-decorator %{_bindir}/compiz-mate-emerald %{_bindir}/compiz-mate-gtk %{_datadir}/applications/compiz-mate-emerald.desktop %{_datadir}/applications/compiz-mate-gtk.desktop %{_datadir}/ccsm/icons/hicolor/scalable/apps/plugin-matecompat.svg -%files gtk-windows-decorator -%{_bindir}/gtk-window-decorator - %files lxde %{_bindir}/compiz-lxde-emerald -%{_bindir}/compiz-lxde-gtk %{_datadir}/applications/compiz-lxde-emerald.desktop -%{_datadir}/applications/compiz-lxde-gtk.desktop %files devel %{_libdir}/pkgconfig/compiz.pc @@ -311,6 +292,9 @@ fi %changelog +* Wed May 08 2013 Wolfgang Ulbrich - 1:0.8.8-21 +- remove compiz-lxde-gtk script and desktop file + * Tue May 07 2013 Wolfgang Ulbrich - 1:0.8.8-20 - DISABLE XFCE SUPPORT - remove xfce subpackage