rpms/compiz
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update spec file and bump version

Browse Source
This commit is contained in:
raveit 2013-05-09 01:19:08 +02:00
commit 0ab6cfe880
5 changed files with 25 additions and 138 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
compiz-lxde-gtk
View File

@ -1,34 +0,0 @@
#!/bin/bash
cd $HOME
theme=`cat .config/lxsession/LXDE/desktop.conf | grep sNet/ThemeName | cut -d\= -f2`
echo "$theme"
function runCompiz() {
gtk-window-decorator --replace --marco-theme "$theme" &
exec compiz --replace --sm-disable --ignore-desktop-hints 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 openpox-lxde
exec openbox-lxde $@

12
compiz-lxde-gtk.desktop
View File

@ -1,12 +0,0 @@
[Desktop Entry]
Type=Application
Name=Compiz LXDE GTK
Comment=start or restart Compiz Fusion with GTK windows-decoator
TryExec=compiz-lxde-gtk
Exec=compiz-lxde-gtk
Icon=fusion-icon
NoDisplay=false
StartupNotify=true
Categories=Utility;
OnlyShowIn=LXDE;
Name[de_DE]=Compiz LXDE GTK

28
compiz-xfce-emerald
View File

@ -1,28 +0,0 @@
#!/bin/bash
function runCompiz() {
emerald --replace &
exec compiz --replace --sm-disable --ignore-desktop-hints 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 $@

12
compiz-xfce-emerald.desktop
View File

@ -1,12 +0,0 @@
[Desktop Entry]
Type=Application
Name=Compiz XFCE Emerald
Comment=start or restart Compiz Fusion with Emerald windows-decoator
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

77
compiz.spec
View File

@ -12,7 +12,7 @@ URL: http://www.compiz.org
License: GPLv2+ and LGPLv2+ and MIT
Group: User Interface/Desktops
Version: 0.8.8
Release: 19%{?dist}
Release: 21%{?dist}
Epoch: 1
Summary: OpenGL window and compositing manager
@ -22,7 +22,12 @@ ExcludeArch: s390 s390x
Requires: system-logos
Requires: glx-utils
# this is an inverse require which is needed for build without gtk-windows-decorator
# Requires: emerald
Requires: emerald
Provides: %{name}-xfce%{?_isa} = %{epoch}:%{version}-%{release}
Provides: %{name}-xfce = %{epoch}:%{version}-%{release}
Obsoletes: %{name}-xfce%{?_isa} < %{epoch}:%{version}-%{release}
Obsoletes: %{name}-xfce < %{epoch}:%{version}-%{release}
BuildRequires: libX11-devel
BuildRequires: libdrm-devel
@ -53,13 +58,9 @@ Source1: compiz-mate-gtk
Source2: compiz-mate-gtk.desktop
Source3: compiz-mate-emerald
Source4: compiz-mate-emerald.desktop
Source7: compiz-xfce-emerald
Source8: compiz-xfce-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
@ -128,15 +129,6 @@ The compiz-mate package contains the matecompat plugin
and start scripts to start Compiz with emerald and
gtk-windows-decorator.
%package xfce
Summary: Compiz xfce integration bits
Group: User Interface/Desktops
Requires: %{name}%{?_isa} = %{epoch}:%{version}-%{release}
%description xfce
The compiz-xfce package contains start scripts to start
Compiz with emerald and gtk-windows-decorator.
%package lxde
Summary: Compiz lxde integration bits
Group: User Interface/Desktops
@ -201,9 +193,7 @@ make DESTDIR=$RPM_BUILD_ROOT install || exit 1
install %SOURCE1 $RPM_BUILD_ROOT%{_bindir}
install %SOURCE3 $RPM_BUILD_ROOT%{_bindir}
install %SOURCE7 $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 \
@ -213,17 +203,11 @@ desktop-file-install --vendor="" \
%SOURCE4
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
%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
@ -248,8 +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-xfce-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
@ -282,7 +264,6 @@ fi
%files -f core-files.txt
%doc AUTHORS ChangeLog COPYING.GPL COPYING.LGPL README TODO NEWS
%{_bindir}/compiz
%{_bindir}/gtk-window-decorator
%{_libdir}/libdecoration.so.*
%dir %{_libdir}/compiz
%dir %{_datadir}/compiz
@ -290,21 +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 xfce
%{_bindir}/compiz-xfce-emerald
%{_datadir}/applications/compiz-xfce-emerald.desktop
%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
@ -315,24 +291,21 @@ fi
%{_libdir}/libdecoration.so
%changelog
* Wed May 08 2013 Wolfgang Ulbrich <chat-to-me@raveit.de> - 1:0.8.8-21
- remove compiz-lxde-gtk script and desktop file
* Tue May 07 2013 Wolfgang Ulbrich <chat-to-me@raveit.de> - 1:0.8.8-20
- DISABLE XFCE SUPPORT
- remove xfce subpackage
- move gwd decorator to a subpackage
* Mon Apr 29 2013 Wolfgang Ulbrich <chat-to-me@raveit.de> - 1:0.8.8-19
- remove compiz-xfce-gtk start script
- remove compiz-xfce-gtk.desktop file
- rename compiz_disable_gdk_disable_deprecated.patch
* Wed Apr 24 2013 Wolfgang Ulbrich <chat-to-me@raveit.de> - 1:0.8.8-18
- enable gtk-windows-decorator based on marco (mate-window-manager)
- add compiz_disable_gdk_gtk_disable_deprecated patch
- remove dbus
- remove glib
- remove mateconf
- remove kde
- remove keybindings
- add start scripts for gtk-windows-decorator
- update start scripts for emerald
- add ldconfig scriptlet for mate subpackage
- using libmatewnck instead of libwnck
* Mon Apr 29 2013 Wolfgang Ulbrich <chat-to-me@raveit.de> - 1:0.8.8-18
- rename compiz_disable_gtk_disable_deprecated.patch
* Tue Feb 12 2013 Wolfgang Ulbrich <chat-to-me@raveit.de> - 1:0.8.8-17
- fix wall patch for primary is control