2007-04-24 Laszlo (Laca) Peter <[email protected]>
authorlaca
Tue, 24 Apr 2007 17:27:41 +0000
changeset 9778 f9f8100ab113
parent 9777 3adec7124a45
child 9779 5f0938041f79
2007-04-24 Laszlo (Laca) Peter <[email protected]> * SUNWgnome-sys-suspend.spec: bump to 0.5, remove patch fixshutdown.diff * patches/gnome-sys-suspend-01-fixshutdown.diff: delete.
ChangeLog
SUNWgnome-sys-suspend.spec
patches/gnome-sys-suspend-01-fixshutdown.diff
--- a/ChangeLog	Tue Apr 24 16:31:40 2007 +0000
+++ b/ChangeLog	Tue Apr 24 17:27:41 2007 +0000
@@ -1,3 +1,8 @@
+2007-04-24  Laszlo (Laca) Peter  <[email protected]>
+
+	* SUNWgnome-sys-suspend.spec: bump to 0.5, remove patch fixshutdown.diff
+	* patches/gnome-sys-suspend-01-fixshutdown.diff: delete.
+	
 2007-04-24  Matt Keenan <[email protected]>
 
 	* manpages/Makefile: #6517153, amend Makefile to cater for .ent type
--- a/SUNWgnome-sys-suspend.spec	Tue Apr 24 16:31:40 2007 +0000
+++ b/SUNWgnome-sys-suspend.spec	Tue Apr 24 17:27:41 2007 +0000
@@ -13,16 +13,14 @@
 Name:                    SUNWgnome-sys-suspend
 Summary:                 GNOME system suspend application
 Version:                 %{default_pkg_version}
-%define tarball_version  0.4
-Release:                 2
+%define tarball_version  0.5
+Release:                 1
 Source:                  http://dlc.sun.com/osol/jds/downloads/extras/sys-suspend/gnome-sys-suspend-%{tarball_version}.tar.bz2
 # NOTE: Don't patch this module, update the sources.
 # svn+ssh://[email protected]/svn/jds/sys-suspend/trunk
 # Contact jds-re if you need a new tarball release.
 Source1:                 %{name}-manpages-0.1.tar.gz
 Source2:                 l10n-configure.sh 
-#owner:yippi date:2007-04-13 type:bug bugster:6545464
-Patch1:                  gnome-sys-suspend-01-fixshutdown.diff
 SUNW_BaseDir:            %{_basedir}
 BuildRoot:               %{_tmppath}/%{name}-%{version}-build
 %include default-depend.inc
@@ -122,6 +120,8 @@
 %endif
 
 %changelog
+* Tue Apr 24 2007 - [email protected]
+- bump to 0.5, remove patch fixshutdown.diff
 * Fri Apr 13 2007 - [email protected]
 - Add patch to fix spelling of "default-shutdown" argument.
 * Wed Mar 07 2007 - [email protected]
--- a/patches/gnome-sys-suspend-01-fixshutdown.diff	Tue Apr 24 16:31:40 2007 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,20 +0,0 @@
---- gnome-sys-suspend-0.4/src/gnome-sys-suspend.c-orig	2007-04-13 17:41:02.992035000 +0800
-+++ gnome-sys-suspend-0.4/src/gnome-sys-suspend.c	2007-04-13 17:34:52.927103000 +0800
-@@ -1311,7 +1311,7 @@ is_already_running()
- 		 */
- 		sel_win = XCreateWindow (x_dpy, DefaultRootWindow (x_dpy),
- 								 0,0,1,1,0,0, InputOnly, CopyFromParent,
--								 CWEventMask, &attr);
-+								 NULL, &attr);
- 		XSetSelectionOwner (x_dpy, sel_mgr, sel_win, CurrentTime);
- 
- 		win = XGetSelectionOwner (x_dpy, sel_mgr);
-@@ -1374,7 +1374,7 @@ main(int argc, char **argv)
- 		  N_("Disable the selection popup dialog at invocation time"), NULL },
- 		{ "disable-lockscreen", 'x', POPT_ARG_NONE, &disable_lockscreen, 0,
- 		  N_("Disable the execution of lockscreen at resume time"), NULL },
--		{ "default-sutdown", 'h', POPT_ARG_NONE, &default_shutdown, 0,
-+		{ "default-shutdown", 'h', POPT_ARG_NONE, &default_shutdown, 0,
- 		  N_("Change default operation from suspend to shutdown"), NULL },
- 		{ "display", 'd', POPT_ARG_STRING, &display, 0,
- 		  N_("Connect to the X server specified by display"), NULL },