rpms/compiz/devel compiz-gtk, NONE, 1.1 compiz-gtk.desktop, NONE, 1.1 .cvsignore, 1.37, 1.38 compiz.spec, 1.134, 1.135 sources, 1.39, 1.40 desktop-effects-0.7.17-ignore-hints.patch, 1.1, NONE

[William Jon McCann]

Author: mccann

Update of /cvs/pkgs/rpms/compiz/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30871

Modified Files:
	.cvsignore compiz.spec sources 
Added Files:
	compiz-gtk compiz-gtk.desktop 
Removed Files:
	desktop-effects-0.7.17-ignore-hints.patch 
Log Message:
- Add compiz-gtk driver script and desktop file
- New desktop effects release





--- NEW FILE compiz-gtk ---
#!/bin/sh

export LIBGL_ALWAYS_INDIRECT=1
gtk-window-decorator &
exec compiz --ignore-desktop-hints glib gconf $@


--- NEW FILE compiz-gtk.desktop ---
[Desktop Entry]
Type=Application
Encoding=UTF-8
Name=Compiz
TryExec=compiz-gtk
Exec=compiz-gtk
NoDisplay=true


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/compiz/devel/.cvsignore,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- .cvsignore	5 Jun 2008 18:32:19 -0000	1.37
+++ .cvsignore	25 Sep 2008 23:14:01 -0000	1.38
@@ -1,3 +1,3 @@
 compiz-0.7.6.tar.bz2
+desktop-effects-0.7.18.tar.bz2
 kde-desktop-effects-0.0.5.tar.bz2
-desktop-effects-0.7.17.tar.bz2


Index: compiz.spec
===================================================================
RCS file: /cvs/pkgs/rpms/compiz/devel/compiz.spec,v
retrieving revision 1.134
retrieving revision 1.135
diff -u -r1.134 -r1.135
--- compiz.spec	26 Aug 2008 19:12:15 -0000	1.134
+++ compiz.spec	25 Sep 2008 23:14:01 -0000	1.135
@@ -1,4 +1,4 @@
-%define		dialogversion	0.7.17
+%define		dialogversion	0.7.18
 %define 	kde_dialogversion 0.0.5
 
 %define		core_plugins	blur clone cube dbus decoration fade ini inotify minimize move place png regex resize rotate scale screenshot switcher video water wobbly zoom fs
@@ -14,7 +14,7 @@
 License:        GPLv2+ and LGPLv2+ and MIT
 Group:          User Interface/Desktops
 Version:        0.7.6
-Release:        10%{?dist}
+Release:        11%{?dist}
 
 Summary:        OpenGL window and compositing manager
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -46,13 +46,14 @@
 Source0:       http://releases.compiz-fusion.org/compiz/%{version}/%{name}-%{version}.tar.bz2
 Source1:	desktop-effects-%{dialogversion}.tar.bz2
 Source2:	kde-desktop-effects-%{kde_dialogversion}.tar.bz2
+Source3:        compiz-gtk
+Source4:        compiz-gtk.desktop
 
 # Make sure that former beryl users still have bling
 Obsoletes: beryl-core
 
 
 # Patches that are not upstream
-Patch101: desktop-effects-0.7.17-ignore-hints.patch
 Patch102: desktop-effects-0.7.17-wall-plugin.patch
 Patch103: composite-cube-logo.patch
 Patch105: fedora-logo.patch
@@ -119,10 +120,9 @@
 %prep
 %setup -q -T -b1 -n desktop-effects-%{dialogversion}
 %setup -q -T -b2 -n kde-desktop-effects-%{kde_dialogversion}
-%setup -q 
+%setup -q
 
 pushd ../desktop-effects-%{dialogversion}
-%patch101 -p1 -b .ignore-hints
 %patch102 -p1 -b .wall-plugin
 popd
 
@@ -163,7 +163,7 @@
 
 # desktop-effects
 cd ../desktop-effects-%{dialogversion}
-%configure 
+%configure
 make %{?_smp_mflags}
 
 
@@ -181,6 +181,12 @@
   $RPM_BUILD_ROOT%{_datadir}/applications/desktop-effects.desktop
 popd
 
+install %SOURCE3 $RPM_BUILD_ROOT%{_bindir}
+
+desktop-file-install --vendor="" \
+  --dir $RPM_BUILD_ROOT%{_datadir}/applications \
+  %SOURCE4
+
 # kde-desktop-effects
 echo INSTALLING KDE DESKTOP EFFECTS
 pushd ../kde-desktop-effects-%{kde_dialogversion}
@@ -230,9 +236,9 @@
 
 export GCONF_CONFIG_SOURCE=`/usr/bin/gconftool-2 --get-default-source`
 
-for p in %{core_plugins} %{gnome_plugins} core; 
+for p in %{core_plugins} %{gnome_plugins} core;
 	do echo %{_sysconfdir}/gconf/schemas/compiz-${p}.schemas ; done \
-	| xargs %{_bindir}/gconftool-2 --makefile-install-rule >& /dev/null || : 
+	| xargs %{_bindir}/gconftool-2 --makefile-install-rule >& /dev/null || :
 
 gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/gwd.schemas >& /dev/null || :
 
@@ -246,7 +252,7 @@
 if [ "$1" -gt 1 ]; then
   export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
 
-  for p in %{core_plugins} %{gnome_plugins} core; 
+  for p in %{core_plugins} %{gnome_plugins} core;
 	do echo %{_sysconfdir}/gconf/schemas/compiz-${p}.schemas ; done \
 	| xargs %{_bindir}/gconftool-2 --makefile-uninstall-rule >& /dev/null || :
 
@@ -258,7 +264,7 @@
 if [ "$1" -eq 0 ]; then
   export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
 
-  for p in %{core_plugins} %{gnome_plugins} core; 
+  for p in %{core_plugins} %{gnome_plugins} core;
 	do echo %{_sysconfdir}/gconf/schemas/compiz-${p}.schemas ; done \
 	| xargs %{_bindir}/gconftool-2 --makefile-uninstall-rule >& /dev/null || :
 
@@ -298,6 +304,7 @@
 
 %files gnome -f gnome-files.txt
 %defattr(-, root, root)
+%{_bindir}/compiz-gtk
 %{_bindir}/gtk-window-decorator
 %{_bindir}/desktop-effects
 %{_libdir}/window-manager-settings/libcompiz.so
@@ -305,6 +312,7 @@
 %{_datadir}/gnome-control-center/keybindings/50-compiz-desktop-key.xml
 %{_datadir}/gnome-control-center/keybindings/50-compiz-key.xml
 %{_datadir}/compiz/desktop-effects.glade
+%{_datadir}/applications/compiz-gtk.desktop
 %{_datadir}/applications/redhat-desktop-effects.desktop
 %{_datadir}/icons/hicolor/16x16/apps/desktop-effects.png
 %{_datadir}/icons/hicolor/24x24/apps/desktop-effects.png
@@ -337,6 +345,10 @@
 
 
 %changelog
+* Thu Sep 25 2008 Jon McCann <jmccann at redhat.com> - 0.7.6-11
+- Add compiz-gtk driver script and desktop file
+- New desktop effects release
+
 * Tue Aug 26 2008 Adam Jackson <ajax at redhat.com> 0.7.6-10
 - Fixed Requires: Xorg >= foo to Conflicts: Xorg < foo.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/compiz/devel/sources,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- sources	5 Jun 2008 18:32:19 -0000	1.39
+++ sources	25 Sep 2008 23:14:02 -0000	1.40
@@ -1,3 +1,3 @@
 75fe52ce6374174df6dccd4b6c13ee55  compiz-0.7.6.tar.bz2
+d56f2f6456fc89b06e1e0d21cab74f55  desktop-effects-0.7.18.tar.bz2
 7a7766f43797239ca0a4a0881d91f646  kde-desktop-effects-0.0.5.tar.bz2
-de07dcb5bfc47a0634acc1701f3b5831  desktop-effects-0.7.17.tar.bz2


--- desktop-effects-0.7.17-ignore-hints.patch DELETED ---