rpms/compiz/devel more-sm-junk.patch, NONE, 1.1 .cvsignore, 1.25, 1.26 compiz.spec, 1.95, 1.96 sources, 1.27, 1.28

[Kristian Høgsberg (krh)]

Author: krh

Update of /cvs/pkgs/rpms/compiz/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2098

Modified Files:
	.cvsignore compiz.spec sources 
Added Files:
	more-sm-junk.patch 
Log Message:
* Tue Aug 21 2007 Kristian Høgsberg <krh at redhat.com> - 0.5.2-7.0ec3ec
- Add more-sm-junk.patch so we set SM restart style to
  SmRestartIfRunning on exit (#247163, #245971).
- Add Requires to compiz-devel (#253407).
- Update to desktop-effects 0.7.6, which terminates decorator when
  switching to metacity or on compiz failure (#215247, #215032).


more-sm-junk.patch:

--- NEW FILE more-sm-junk.patch ---
commit fe5ef3cb092a35aef03303d5895e6db3afca240a
Author: Kristian Høgsberg <krh at redhat.com>
Date:   Tue Aug 21 10:56:19 2007 -0400

    Set SM restart style to SmRestartIfRunning on exit.

diff --git a/src/session.c b/src/session.c
index 9c6cc07..a354c3b 100644
--- a/src/session.c
+++ b/src/session.c
@@ -89,11 +89,10 @@ setCloneRestartCommands (SmcConn connection)
 }
 
 static void
-setRestartStyle (SmcConn connection)
+setRestartStyle (SmcConn connection, char hint)
 {
     SmProp	prop, *pProp;
     SmPropValue propVal;
-    char        hint = SmRestartImmediately;
 
     prop.name = SmRestartStyleHint;
     prop.type = SmCARD8;
@@ -139,7 +138,7 @@ saveYourselfGotProps (SmcConn   connection,
     }
 
 out:
-    setRestartStyle (connection);
+    setRestartStyle (connection, SmRestartImmediately);
     setCloneRestartCommands (connection);
 
     SmcSaveYourselfDone (connection, 1);
@@ -227,6 +226,8 @@ closeSession (void)
 {
     if (connected)
     {
+	setRestartStyle (smcConnection, SmRestartIfRunning);
+
 	if (SmcCloseConnection (smcConnection, 0, NULL) != SmcConnectionInUse)
 	    connected = FALSE;
 	if (smClientId) {


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/compiz/devel/.cvsignore,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- .cvsignore	14 Aug 2007 18:51:36 -0000	1.25
+++ .cvsignore	21 Aug 2007 17:53:02 -0000	1.26
@@ -1,2 +1,2 @@
-desktop-effects-0.7.5.tar.bz2
+desktop-effects-0.7.6.tar.bz2
 compiz-0ec3ec.tar.gz


Index: compiz.spec
===================================================================
RCS file: /cvs/pkgs/rpms/compiz/devel/compiz.spec,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -r1.95 -r1.96
--- compiz.spec	17 Aug 2007 21:02:35 -0000	1.95
+++ compiz.spec	21 Aug 2007 17:53:02 -0000	1.96
@@ -1,5 +1,5 @@
 %define		snapshot	0ec3ec
-%define		dialogversion	0.7.5
+%define		dialogversion	0.7.6
 %define		plugins		glib,gconf,dbus,png,svg,video,screenshot,decoration,clone,place,fade,minimize,move,resize,switcher,scale,plane
 
 Name:           compiz
@@ -7,7 +7,7 @@
 License:        X11/MIT/GPL
 Group:          User Interface/Desktops
 Version:        0.5.2
-Release:        6.%{snapshot}%{?dist}
+Release:        7.%{snapshot}%{?dist}
 
 Summary:        OpenGL window and compositing manager
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -17,7 +17,7 @@
 
 Requires:	xorg-x11-server-Xorg >= 1.3.0.0-19.fc8
 Requires:	mesa-libGL >= 7.0.1-2.fc8
-Requires:      system-logos
+Requires:       system-logos
 
 
 Requires(post): desktop-file-utils
@@ -44,6 +44,7 @@
 Patch103: composite-cube-logo.patch
 Patch105: fedora-logo.patch
 Patch110: run-command-key.patch
+Patch111: more-sm-junk.patch
 
 %description
 Compiz is one of the first OpenGL-accelerated compositing window
@@ -59,6 +60,9 @@
 Group: Development/Libraries
 Requires: compiz = %{version}-%{release}
 Requires: pkgconfig
+Requires: libXcomposite-devel libXfixes-devel libXdamage-devel libXrandr-devel
+Requires: libXinerama-devel libICE-devel libSM-devel libxml2-devel
+Requires: libxslt-devel startup-notification-devel
 
 %description devel
 The compiz-devel package includes the header files,
@@ -99,6 +103,7 @@
 %patch103 -p1 -b .composite-cube-logo
 %patch105 -p1 -b .fedora-logo
 %patch110 -p1 -b .run-command-key
+%patch111 -p1 -b .more-sm-junk
 
 %build
 rm -rf $RPM_BUILD_ROOT
@@ -290,6 +295,13 @@
 %{_libdir}/libdecoration.so
 
 %changelog
+* Tue Aug 21 2007 Kristian Høgsberg <krh at redhat.com> - 0.5.2-7.0ec3ec
+- Add more-sm-junk.patch so we set SM restart style to
+  SmRestartIfRunning on exit (#247163, #245971).
+- Add Requires to compiz-devel (#253407).
+- Update to desktop-effects 0.7.6, which terminates decorator when
+  switching to metacity or on compiz failure (#215247, #215032).
+
 * Fri Aug 17 2007 Adel Gadllah <adel.gadllah at gmail.com> 0.5.2-6.0ec3ec
 - Split into gnome and kde subpackages
 - Minor cleanups


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/compiz/devel/sources,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- sources	14 Aug 2007 18:51:36 -0000	1.27
+++ sources	21 Aug 2007 17:53:02 -0000	1.28
@@ -1,2 +1,2 @@
-31ff18d63a0047b588affb2b8225a328  desktop-effects-0.7.5.tar.bz2
+3874d1c085e9d9b2e62bedaf6cbc95c8  desktop-effects-0.7.6.tar.bz2
 cfcf5f3d4a3f8dc4363f570ea326a7e3  compiz-0ec3ec.tar.gz