diff --git a/compiz-decorator-emerald b/compiz-decorator-emerald deleted file mode 100755 index 129a053..0000000 --- a/compiz-decorator-emerald +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/bash - -compiz=`ps ax | grep 'compiz --replace' | grep -v 'grep' | awk '{print $5}'` - - - -if [ "$compiz" = "compiz" ] ; then - emerald --replace & - echo "$compiz with Emerald windows-decorator" - else - exit 0 -fi - -exit 0 - diff --git a/compiz-lxde-emerald b/compiz-lxde-emerald deleted file mode 100755 index c4f0536..0000000 --- a/compiz-lxde-emerald +++ /dev/null @@ -1,28 +0,0 @@ -#!/bin/bash - -function runCompiz() { - emerald --replace & - exec compiz --replace ccp $@ -} - -ISSW=`glxinfo | grep "Software Rasterizer" -c` - -# Try with direct rendering -HAVETFP=`glxinfo | grep texture_from_pixmap -c` - -if ( [ $ISSW == 0 ] && [ $HAVETFP -gt 2 ] ); then - runCompiz $@ -fi - -# Try again with indirect rendering -export LIBGL_ALWAYS_INDIRECT=1 - -HAVETFP=`glxinfo | grep texture_from_pixmap -c` - -if ( [ $ISSW == 0 ] && [ $HAVETFP -gt 2 ] ); then - runCompiz $@ -fi - -# Fall back to openbox-lxde -exec openbox-lxde $@ - diff --git a/compiz-lxde-emerald.desktop b/compiz-lxde-emerald.desktop deleted file mode 100644 index 138dc5f..0000000 --- a/compiz-lxde-emerald.desktop +++ /dev/null @@ -1,12 +0,0 @@ -[Desktop Entry] -Type=Application -Name=Compiz LXDE Emerald -Comment=start or restart Compiz Fusion with Emerald windows-decorator -TryExec=compiz-lxde-emerald -Exec=compiz-lxde-emerald -Icon=fusion-icon -NoDisplay=false -StartupNotify=true -Categories=Utility; -OnlyShowIn=LXDE; -Name[de_DE]=Compiz LXDE Emerald diff --git a/compiz-mate-emerald b/compiz-mate-emerald deleted file mode 100755 index e5db1a9..0000000 --- a/compiz-mate-emerald +++ /dev/null @@ -1,28 +0,0 @@ -#!/bin/bash - -function runCompiz() { - emerald --replace & - exec compiz --replace ccp $@ -} - -ISSW=`glxinfo | grep "Software Rasterizer" -c` - -# Try with direct rendering -HAVETFP=`glxinfo | grep texture_from_pixmap -c` - -if ( [ $ISSW == 0 ] && [ $HAVETFP -gt 2 ] ); then - runCompiz $@ -fi - -# Try again with indirect rendering -export LIBGL_ALWAYS_INDIRECT=1 - -HAVETFP=`glxinfo | grep texture_from_pixmap -c` - -if ( [ $ISSW == 0 ] && [ $HAVETFP -gt 2 ] ); then - runCompiz $@ -fi - -# Fall back to marco -exec marco $@ - diff --git a/compiz-mate-emerald.desktop b/compiz-mate-emerald.desktop deleted file mode 100644 index c9ac791..0000000 --- a/compiz-mate-emerald.desktop +++ /dev/null @@ -1,12 +0,0 @@ -[Desktop Entry] -Type=Application -Name=Compiz MATE Emerald -Comment=start or restart Compiz Fusion with Emerald windows-decorator -TryExec=compiz-mate-emerald -Exec=compiz-mate-emerald -Icon=fusion-icon -NoDisplay=false -StartupNotify=true -Categories=Utility; -OnlyShowIn=MATE; -Name[de_DE]=Compiz MATE Emerald diff --git a/compiz-xfce-emerald b/compiz-xfce-emerald deleted file mode 100755 index dac9292..0000000 --- a/compiz-xfce-emerald +++ /dev/null @@ -1,28 +0,0 @@ -#!/bin/bash - -function runCompiz() { - emerald --replace & - exec compiz --replace ccp $@ -} - -ISSW=`glxinfo | grep "Software Rasterizer" -c` - -# Try with direct rendering -HAVETFP=`glxinfo | grep texture_from_pixmap -c` - -if ( [ $ISSW == 0 ] && [ $HAVETFP -gt 2 ] ); then - runCompiz $@ -fi - -# Try again with indirect rendering -export LIBGL_ALWAYS_INDIRECT=1 - -HAVETFP=`glxinfo | grep texture_from_pixmap -c` - -if ( [ $ISSW == 0 ] && [ $HAVETFP -gt 2 ] ); then - runCompiz $@ -fi - -# Fall back to xfwm4 -exec xfwm4 $@ - diff --git a/compiz-xfce-emerald.desktop b/compiz-xfce-emerald.desktop deleted file mode 100644 index 07f948e..0000000 --- a/compiz-xfce-emerald.desktop +++ /dev/null @@ -1,12 +0,0 @@ -[Desktop Entry] -Type=Application -Name=Compiz XFCE Emerald -Comment=start or restart Compiz Fusion with Emerald windows-decorator -TryExec=compiz-xfce-emerald -Exec=compiz-xfce-emerald -Icon=fusion-icon -NoDisplay=false -StartupNotify=true -Categories=Utility; -OnlyShowIn=XFCE; -Name[de_DE]=Compiz XFCE Emerald diff --git a/compiz.spec b/compiz.spec index 34ed282..dba0360 100644 --- a/compiz.spec +++ b/compiz.spec @@ -21,18 +21,9 @@ ExcludeArch: s390 s390x Source0: https://raveit65.fedorapeople.org/compiz/SOURCE/%{version}/%{name}-%{version}.tar.xz Source1: compiz-mate-gtk Source2: compiz-mate-gtk.desktop -Source3: compiz-mate-emerald -Source4: compiz-mate-emerald.desktop -Source5: compiz-lxde-emerald -Source6: compiz-lxde-emerald.desktop -Source7: compiz-xfce-emerald -Source8: compiz-xfce-emerald.desktop Source9: compiz-decorator-gtk Source10: gtk-decorator.desktop -Source11: compiz-decorator-emerald -Source12: emerald-decorator.desktop Source13: compiz-plugins-main_plugin-matecompat.svg -Source14: emerald-decorator.svg Source15: gtk-decorator.svg # fedora specific @@ -150,36 +141,18 @@ make %{?_smp_mflags} imagedir=%{_datadir}/pixmaps make DESTDIR=$RPM_BUILD_ROOT install || exit 1 install %SOURCE1 $RPM_BUILD_ROOT%{_bindir} -install %SOURCE3 $RPM_BUILD_ROOT%{_bindir} -install %SOURCE5 $RPM_BUILD_ROOT%{_bindir} -install %SOURCE7 $RPM_BUILD_ROOT%{_bindir} install %SOURCE9 $RPM_BUILD_ROOT%{_bindir} -install %SOURCE11 $RPM_BUILD_ROOT%{_bindir} desktop-file-install --vendor="" \ --dir $RPM_BUILD_ROOT%{_datadir}/applications \ %SOURCE2 -desktop-file-install --vendor="" \ - --dir $RPM_BUILD_ROOT%{_datadir}/applications \ - %SOURCE4 -desktop-file-install --vendor="" \ - --dir $RPM_BUILD_ROOT%{_datadir}/applications \ - %SOURCE6 -desktop-file-install --vendor="" \ - --dir $RPM_BUILD_ROOT%{_datadir}/applications \ - %SOURCE8 desktop-file-install --vendor="" \ --dir $RPM_BUILD_ROOT%{_datadir}/applications \ %SOURCE10 -desktop-file-install --vendor="" \ - --dir $RPM_BUILD_ROOT%{_datadir}/applications \ - %SOURCE12 # matecompat icon mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/scalable/apps cp -f %SOURCE13 $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/scalable/apps/plugin-matecompat.svg -# emerald-decorator icon -cp -f %SOURCE14 $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/scalable/apps/emerald-decorator.svg # gtk-decorator icon cp -f %SOURCE15 $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/scalable/apps/gtk-decorator.svg @@ -265,6 +238,7 @@ fi - update to 0.8.9 - new upstream is at https://github.com/raveit65/compiz - remove upstreamed patches +- move emerald scripts to emerald * Wed Jun 17 2015 Fedora Release Engineering - 1:0.8.8-30 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild diff --git a/emerald-decorator.desktop b/emerald-decorator.desktop deleted file mode 100644 index 917696a..0000000 --- a/emerald-decorator.desktop +++ /dev/null @@ -1,13 +0,0 @@ -[Desktop Entry] -Type=Application -Name=Emerald Decorator -Comment=switch to Emerald windows-decorator if compiz is running -TryExec=compiz-decorator-emerald -Exec=compiz-decorator-emerald -Icon=emerald-decorator -NoDisplay=false -StartupNotify=true -Categories=Utility; -OnlyShowIn=MATE; -Name[de_DE]=Emerald Decorator -X-Desktop-File-Install-Version=0.21 diff --git a/emerald-decorator.svg b/emerald-decorator.svg deleted file mode 100644 index f29c577..0000000 --- a/emerald-decorator.svg +++ /dev/null @@ -1,396 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - -