Mercurial Mercurial > sustaining > oi_151a > spec-files / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
2004-07-22 Vinay M R <[email protected]>
authorvinaymr
Thu, 22 Jul 2004 10:27:02 +0000
changeset 3387 216b24bd5c8c
parent 3386 3e994fea39b1
child 3388 382edeeb989e
2004-07-22 Vinay M R <[email protected]> * gdm.spec: Add patch to remove shutdown and reboot options on a Solaris box * patches/gdm-16-reboot-shutdown-option.diff: Add * sun-gdm-themes.spec: Remove patch as we have integrated in cvs * patches/sun-gdm-themes-01-text-misalignment-in-sun-blueprint.diff: Remove Fixes #5040468
ChangeLog file | annotate | diff | comparison | revisions
gdm.spec file | annotate | diff | comparison | revisions
patches/gdm-16-reboot-shutdown-option.diff file | annotate | diff | comparison | revisions
patches/sun-gdm-themes-01-text-misalignment-in-sun-blueprint.diff file | annotate | diff | comparison | revisions
sun-gdm-themes.spec file | annotate | diff | comparison | revisions 
--- a/ChangeLog	Thu Jul 22 04:50:28 2004 +0000
+++ b/ChangeLog	Thu Jul 22 10:27:02 2004 +0000
@@ -1,3 +1,14 @@
+2004-07-22  Vinay M R  <[email protected]>
+
+	* gdm.spec: Add patch to remove shutdown and reboot
+	options on a Solaris box
+	* patches/gdm-16-reboot-shutdown-option.diff: Add
+	* sun-gdm-themes.spec: Remove patch as we have integrated
+	in cvs
+	* patches/sun-gdm-themes-01-text-misalignment-in-sun-blueprint.diff:
+	  Remove
+	Fixes #5040468
+
 2004-07-22  Leena Gunda  <[email protected]>
 
 	* gdm.spec: Update
--- a/gdm.spec	Thu Jul 22 04:50:28 2004 +0000
+++ b/gdm.spec	Thu Jul 22 10:27:02 2004 +0000
@@ -8,7 +8,7 @@
 License:      GPL
 Group:        System/GUI/GNOME
 Version:      2.6.0.2
-Release:      15
+Release:      16
 Distribution: Cinnabar
 Vendor:       Sun Microsystems Inc.
 Summary:      The GNOME 2.x Display Manager
@@ -30,6 +30,7 @@
 Patch13:      gdm-13-config-options.diff
 Patch14:      gdm-14-jds-registration.diff
 Patch15:      gdm-15-default-path.diff
+Patch16:      gdm-16-reboot-shutdown-option.diff
 
 URL:          www.gnome.org
 BuildRoot:    %{_tmppath}/%{name}-%{version}-build
@@ -106,6 +107,7 @@
 %patch13 -p1
 %patch14 -p1
 %patch15 -p1
+%patch16 -p1
 
 # Temporarily disabling ipv6 since the chooser doesn't yet
 # work with IPv6 turned on.
@@ -176,6 +178,9 @@
 %config /etc/security/*
 
 %changelog
+* Thu Jul 22 2004 - [email protected]
+- add patch to remove reboot/shutdown option on Solaris box
+
 * Thu Jul 22 2004 - [email protected]
 - add patch gdm-15-default-path.diff to add /usr/dt/bin and /usr/sfw/bin
   to PATH for Solaris. 
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/gdm-16-reboot-shutdown-option.diff	Thu Jul 22 10:27:02 2004 +0000
@@ -0,0 +1,66 @@
+--- gdm-2.6.0.2/configure.in	2004-07-22 12:13:37.000000000 +0530
++++ gdm-2.6.0.2-new/configure.in	2004-07-22 12:14:55.000000000 +0530
+@@ -36,6 +36,15 @@ fi
+ old_exec_prefix=$exec_prefix
+ exec_prefix=$REAL_EXEC_PREFIX
+ 
++dnl ===========
++dnl host checks
++dnl ===========
++AC_CANONICAL_HOST
++case "$host" in
++*solaris*)
++        AC_DEFINE(SOLARIS, 1, Define to 1 for Solaris)
++        ;;
++esac
+ 
+ dnl
+ dnl Configure arguments
+--- gdm-2.6.0.2/daemon/gdm.h	2004-07-22 11:53:54.000000000 +0530
++++ gdm-2.6.0.2-new/daemon/gdm.h	2004-07-22 12:17:57.000000000 +0530
+@@ -133,7 +133,6 @@ enum {
+ #define GDM_KEY_ADD_GTK_MODULES "daemon/AddGtkModules=false"
+ #define GDM_KEY_GTK_MODULES_LIST "daemon/GtkModulesList="
+ #define GDM_KEY_GROUP "daemon/Group=gdm"
+-#define GDM_KEY_HALT "daemon/HaltCommand=/usr/bin/poweroff;/sbin/poweroff;/sbin/shutdown -h now;/usr/sbin/shutdown -h now"
+ #define GDM_KEY_INITDIR "daemon/DisplayInitDir=" EXPANDED_SYSCONFDIR "/gdm/Init"
+ #define GDM_KEY_KILLIC "daemon/KillInitClients=true"
+ #define GDM_KEY_LOGDIR "daemon/LogDir=" EXPANDED_LOGDIR
+@@ -144,7 +143,15 @@ enum {
+ #define GDM_KEY_POSTLOGIN "daemon/PostLoginScriptDir=" EXPANDED_SYSCONFDIR "/gdm/PreSession/"
+ #define GDM_KEY_FAILSAFE_XSERVER "daemon/FailsafeXServer="
+ #define GDM_KEY_XKEEPSCRASHING "daemon/XKeepsCrashing=" EXPANDED_SYSCONFDIR "/gdm/XKeepsCrashing"
+-#define GDM_KEY_REBOOT "daemon/RebootCommand=/usr/bin/reboot;/sbin/reboot;/sbin/shutdown -r now;/usr/sbin/shutdown -r now"
++
++#ifdef SOLARIS
++#define GDM_KEY_HALT "daemon/HaltCommand="
++#define GDM_KEY_REBOOT "daemon/rebootCommand="
++#else
++#define GDM_KEY_HALT "daemon/HaltCommand=/usr/bin/poweroff;/sbin/poweroff;/sbin/shutdown -h now;/usr/sbin/shutdown -h now"
++#define GDM_KEY_REBOOT "daemon/rebootCommand=/usr/bin/reboot;/sbin/reboot;/sbin/shutdown -r now;/usr/sbin/shutdown -r now"
++#endif
++
+ #define GDM_KEY_ROOTPATH "daemon/RootPath=/sbin:/usr/sbin:/bin:/usr/bin:" X_CONF_PATH ":" EXPANDED_BINDIR ":" MISC_BINDIR
+ #define GDM_KEY_SERVAUTH "daemon/ServAuthDir=" EXPANDED_AUTHDIR
+ #define GDM_KEY_SESSDIR "daemon/SessionDesktopDir=/etc/X11/sessions/:" EXPANDED_SYSCONFDIR "/dm/Sessions/:" EXPANDED_DATADIR "/gdm/BuiltInSessions/:" EXPANDED_DATADIR "/xsessions/"
+--- gdm-2.6.0.2/gui/greeter/greeter_item.c	2004-02-08 23:40:34.000000000 +0530
++++ gdm-2.6.0.2-new/gui/greeter/greeter_item.c	2004-07-22 12:20:16.000000000 +0530
+@@ -310,15 +310,15 @@ greeter_item_is_visible (GreeterItemInfo
+       strcmp (info->show_type, "system") == 0)
+ 	  return FALSE;
+ 
+-  if (( ! GdmSystemMenu || GdmHalt == NULL) &&
++  if (( ! GdmSystemMenu || strcmp (GdmHalt, "") == 0) &&
+       info->show_type != NULL &&
+       strcmp (info->show_type, "halt") == 0)
+ 	  return FALSE;
+-  if (( ! GdmSystemMenu || GdmReboot == NULL) &&
++  if (( ! GdmSystemMenu || strcmp (GdmReboot, "") == 0) &&
+       info->show_type != NULL &&
+       strcmp (info->show_type, "reboot") == 0)
+ 	  return FALSE;
+-  if (( ! GdmSystemMenu || GdmSuspend == NULL) &&
++  if (( ! GdmSystemMenu || strcmp (GdmSuspend, "") == 0) &&
+       info->show_type != NULL &&
+       strcmp (info->show_type, "suspend") == 0)
+ 	  return FALSE;
--- a/patches/sun-gdm-themes-01-text-misalignment-in-sun-blueprint.diff	Thu Jul 22 04:50:28 2004 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,79 +0,0 @@
---- sun-gdm-themes-0.14/themes/Sun-blueprint/sun-mercury.xml.in	2004-04-06 01:46:47.000000000 +0530
-+++ sun-gdm-themes-0.14-new/themes/Sun-blueprint/sun-mercury.xml.in	2004-07-08 08:53:39.000000000 +0530
-@@ -17,7 +17,7 @@
-   <!-- Login Panel Image -->
-   <item type="pixmap">
-       <normal file="Login-Panel.png" alpha="1"/>
--      <pos anchor="c" x="55%" y="55%" width="386" height="270"/>
-+      <pos anchor="c" x="55%" y="55%" width="450" height="270"/>
-   </item>
- 
-   <!-- BEGIN Login Panel Content -->
-@@ -127,14 +127,14 @@
- 		<pos anchor="nw" width="box" height="76"/>
- 		<box orientation="vertical" spacing="12" ypadding="0" xpadding="6">
- 		  <item type="label">
--		    <pos anchor="n" x="50%" height="16"/>
-+		    <pos anchor="n" x="30%" height="16"/>
- 		    <normal color="#ffffff" font="Sans Bold 12" alpha=".58"/>
- 		    <prelight color="#ffffff" font="Sans Bold 12"/>
- 		    <active color="#ffffff" font="Sans Bold 12"/>
- 		    <stock type="session"/>
- 		  </item>
- 		  <item type="pixmap">
--		    <pos anchor="n" x="50%" y="0"/>
-+		    <pos anchor="n" x="30%" y="0"/>
- 		    <normal file="session.png" alpha=".58"/>
- 		    <prelight file="sessionPrelight.png"/>
- 		    <active file="sessionPrelight.png"/>
-@@ -149,14 +149,14 @@
- 		<pos anchor="nw" width="box" height="box"/>
- 		<box orientation="vertical" spacing="12" ypadding="0" xpadding="6">
- 		  <item type="label">
--		    <pos anchor="n" x="50%" height="16"/>
-+		    <pos anchor="n" x="30%" height="16"/>
- 		    <normal color="#ffffff" font="Sans Bold 12" alpha=".58"/>
- 		    <prelight color="#ffffff" font="Sans Bold 12"/>
- 		    <active color="#ffffff" font="Sans Bold 12"/>
- 		    <stock type="language"/>
- 		  </item>
- 		  <item type="pixmap">
--		    <pos anchor="n" x="50%" y="0"/>
-+		    <pos anchor="n" x="30%" y="0"/>
- 		    <normal file="language.png" alpha=".58"/>
- 		    <prelight file="languagePrelight.png"/>
- 		    <active file="languagePrelight.png"/>
-@@ -182,14 +182,14 @@
- 		<pos anchor="nw" width="box" height="box"/>
- 		<box orientation="vertical" spacing="12" ypadding="0" xpadding="6">
- 		  <item type="label">
--		    <pos anchor="n" x="50%" height="16"/>
-+		    <pos anchor="n" x="80%" height="16"/>
- 		    <normal color="#ffffff" font="Sans Bold 12" alpha=".58"/>
- 		    <prelight color="#ffffff" font="Sans Bold 12"/>
- 		    <active color="#ffffff" font="Sans Bold 12"/>
- 		    <stock type="system"/>
- 		  </item>
- 		  <item type="pixmap">
--		    <pos anchor="n" x="50%" y="0"/>
-+		    <pos anchor="n" x="80%" y="0"/>
- 		    <normal file="actions.png" alpha=".58"/>
- 		    <prelight file="actionsPrelight.png"/>
- 		    <active file="actionsPrelight.png"/>
-@@ -205,14 +205,14 @@
- 		<pos anchor="nw" width="box" height="box"/>
- 		<box orientation="vertical" spacing="12" ypadding="0" xpadding="6">
- 		  <item type="label">
--		    <pos anchor="n" x="50%" height="16"/>
-+		    <pos anchor="n" x="70%" height="16"/>
- 		    <normal color="#ffffff" font="Sans Bold 12" alpha="0.58"/>
- 		    <prelight color="#ffffff" font="Sans Bold 12"/>
- 		    <active color="#ffffff" font="Sans Bold 12"/>
- 		    <stock type="halt"/>
- 		  </item>
- 		  <item type="pixmap">
--		    <pos anchor="n" x="50%" y="0"/>
-+		    <pos anchor="n" x="70%" y="0"/>
- 		    <normal file="disconnect.png" alpha=".58"/>
- 		    <prelight file="disconnectPrelight.png"/>
- 		    <active file="disconnectPrelight.png"/>
--- a/sun-gdm-themes.spec	Thu Jul 22 04:50:28 2004 +0000
+++ b/sun-gdm-themes.spec	Thu Jul 22 10:27:02 2004 +0000
@@ -13,13 +13,12 @@
 Group:			System/GUI/GNOME
 BuildArchitectures:	noarch
 Version:		0.14
-Release:		237
+Release:		238
 Distribution:		Cinnabar
 Vendor:			Sun Microsystems Inc.
 Summary:		Sun branded GNOME login manager theme
 Source:			%{name}-%{version}.tar.gz
 Source1: sun-gdm-themes-l10n-po-1.2.tar.bz2
-Patch1:  sun-gdm-themes-01-text-misalignment-in-sun-blueprint.diff
 URL:			http://sun.com
 BuildRoot:		%{_tmppath}/%{name}-%{version}-build
 Docdir:			%{_defaultdocdir}/%{name}
@@ -35,7 +34,6 @@
 %prep
 %setup -q
 /usr/bin/bzcat -dc %SOURCE1|tar xf -
-%patch1 -p1
 
 %build
 %ifos linux
@@ -69,8 +67,9 @@
 %{_datadir}/gdm/themes/*
 
 %changelog
-* Fri Jul 9 2004 - [email protected]
-- Add patch from Vinay M R  to fix text misalignment in gdm login screen. 
+* Thu Jul 22 2004 - [email protected]
+- Remove the patches as they are now integrated in to
+  the cvs.
 
 * Thu Jul 08 2004 - [email protected]
 - Updated l10n content to sun-gdm-themes-l10n-po-1.2.tar.bz2
sustaining/oi_151a/spec-files