Hello community,
here is the log from the commit of package gdm
checked in at Wed Apr 16 18:33:03 CEST 2008.
--------
--- GNOME/gdm/gdm.changes 2008-04-14 15:32:23.000000000 +0200
+++ /mounts/work_src_done/STABLE/gdm/gdm.changes 2008-04-16 13:48:12.000000000 +0200
@@ -1,0 +2,6 @@
+Wed Apr 16 13:21:17 CEST 2008 - sbrabec@suse.cz
+
+- Split package according to branding conventions (fate#301792).
+- Removed branding related changes from gdm-conf.patch.
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ gdm.spec ++++++
--- /var/tmp/diff_new_pack.W25623/_old 2008-04-16 18:32:25.000000000 +0200
+++ /var/tmp/diff_new_pack.W25623/_new 2008-04-16 18:32:25.000000000 +0200
@@ -23,7 +23,7 @@
License: GPL v2 or later
Group: System/GUI/GNOME
Version: 2.20.4
-Release: 6
+Release: 9
Summary: The GNOME 2.x Display Manager
Source: %{name}-%{version}.tar.bz2
Source1: gdm.pamd
@@ -32,6 +32,8 @@
Source3: SuSEconfig.gdm
Source5: sysconfig.displaymanager-gdm
Source6: dbus-gdm.conf
+# Only system integration patches are allowed in gdm.conf.
+# Any Look and Feel changes should be done in gdm-branding packages.
Patch0: gdm-conf.patch
Patch3: gdm-language-dialog-size.patch
Patch5: gdm-xdm-sessions.patch
@@ -70,7 +72,8 @@
%if %suse_version <= 1020
PreReq: xorg-x11
%endif
-Requires: gnome2-SuSE gnome-themes klogd xorg-x11-server-extra
+Requires: gnome-themes klogd xorg-x11-server-extra
+Requires: %{name}-branding
Requires: %{name}-lang = %{version}
%description
@@ -87,11 +90,36 @@
Martin K. Petersen
Alex Larsson
+%package branding-upstream
+License: GPL v2 or later
+Summary: The GNOME 2.x Display Manager
+Group: System/GUI/GNOME
+Provides: %{name}-branding = %{version}
+Supplements: packageand(branding-upstream:%{name})
+#BRAND: Provide two equal files - /usr/share/gdm/defaults.conf and
+#BRAND: factory-defaults.conf with default configuration of gdm.
+#BRAND: Branding package requires the package with the default theme.
+#NOTE: We may want to create gdm-themes with upstream themes.
+
+%description branding-upstream
+This version of GDM, the GNOME display manager, is based on GTK2 and is
+suited for the GNOME 2.x Desktop. GDM is a flexible X Window System
+display manager that has many options, is usable for remote login, and
+provides a good looking graphical interface.
+
+
+
+Authors:
+--------
+ George (Jiri) Lebl
+ Martin K. Petersen
+ Alex Larsson
+
%lang_package
%prep
%setup -q
gnome-patch-translation-prepare
-%patch0 -p1
+%patch0
%patch3 -p1
%patch5 -p1
%patch9 -p1
@@ -226,10 +254,7 @@
%dir %config %{_sysconfdir}/gdm
%dir %{_datadir}/omf/gdm
%config %{_sysconfdir}/gdm/[IPXl]*
-#%config(noreplace) %{_sysconfdir}/gdm/gdm.conf
%config(noreplace) %{_sysconfdir}/gdm/custom.conf
-#%{_sysconfdir}/gdm/factory-gdm.conf
-#%{_sysconfdir}/gdm/custom.conf
%{_sysconfdir}/gdm/Xsession
%ghost %{_sysconfdir}/gdm/gdm_sysconfig.conf
%dir %config %{_sysconfdir}/gdm/modules
@@ -239,6 +264,7 @@
%{_sbindir}/*
%{_bindir}/*
%{_datadir}/gdm
+%exclude %{_datadir}/gdm/*.conf
#%{_datadir}/applications/*.desktop
%{_datadir}/pixmaps/*.png
%{_datadir}/pixmaps/faces
@@ -262,7 +288,14 @@
%files lang -f %{name}.lang
+%files branding-upstream
+%defattr(-,root,root)
+%{_datadir}/gdm/*.conf
+
%changelog
+* Wed Apr 16 2008 sbrabec@suse.cz
+- Split package according to branding conventions (fate#301792).
+- Removed branding related changes from gdm-conf.patch.
* Fri Apr 04 2008 dreveman@suse.de
- Add gdm-XKeepsCrashing-desktop-effects.patch. (bnc #359460).
* Wed Mar 19 2008 vuntz@suse.de
++++++ gdm-conf.patch ++++++
--- /var/tmp/diff_new_pack.W25623/_old 2008-04-16 18:32:25.000000000 +0200
+++ /var/tmp/diff_new_pack.W25623/_new 2008-04-16 18:32:25.000000000 +0200
@@ -1,21 +1,6 @@
-diff -upr gdm-2.19.5-pre/config/gdm.conf.in gdm-2.19.5-post/config/gdm.conf.in
---- gdm-2.19.5-pre/config/gdm.conf.in 2007-07-30 13:51:14.000000000 -0500
-+++ gdm-2.19.5-post/config/gdm.conf.in 2007-08-03 17:35:14.000000000 -0500
-@@ -68,11 +68,11 @@ TimedLoginDelay=30
-
- # The greeter for attached (non-xdmcp) logins. Change gdmlogin to gdmgreeter
- # to get the new graphical greeter.
--#Greeter=@libexecdir@/gdmlogin
-+Greeter=@libexecdir@/gdmgreeter
-
- # The greeter for xdmcp logins, usually you want a less graphically intensive
- # greeter here so it's better to leave this with gdmlogin
--#RemoteGreeter=@libexecdir@/gdmlogin
-+RemoteGreeter=@libexecdir@/gdmgreeter
-
- # Launch the greeter with an additional list of colon separated GTK+ modules.
- # This is useful for enabling additional feature support e.g. GNOME
-@@ -86,10 +86,12 @@ TimedLoginDelay=30
+--- config/gdm.conf.in
++++ config/gdm.conf.in
+@@ -86,10 +86,12 @@
# This value will be overridden with the value from /etc/default/login if it
# contains "ROOT=<pathvalue>".
#DefaultPath=@GDM_USER_PATH@
@@ -28,7 +13,7 @@
# If you are having trouble with using a single server for a long time and want
# GDM to kill/restart the server, turn this on. On Solaris, this value is
-@@ -126,9 +128,14 @@ XKeepsCrashing=@gdmconfdir@/XKeepsCrashi
+@@ -126,9 +128,14 @@
#
# Reboot, Halt and suspend commands, you can add different commands separated
# by a semicolon. GDM will use the first one it can find.
@@ -46,7 +31,7 @@
# The following options specify how GDM system commands are supported.
#
-@@ -163,7 +170,7 @@ BaseXsession=@gdmconfdir@/Xsession
+@@ -163,7 +170,7 @@
# really a PATH style variable since 2.4.4.2 to allow actual interoperability
# with KDM. Note that <dmconfdir>/Sessions is there for backwards
# compatibility reasons with 2.4.4.x.
@@ -55,16 +40,7 @@
# This is the default .desktop session. One of the ones in SessionDesktopDir
#DefaultSession=gnome.desktop
# Better leave this blank and HOME will be used. You can use syntax ~/ below
-@@ -259,7 +266,7 @@ CheckDirOwner=true
- # If your HOME is managed by automounter, set to true
- SupportAutomount=false
- # Number of seconds to wait after a failed login
--#RetryDelay=1
-+RetryDelay=1
- # Maximum size of a file we wish to read. This makes it hard for a user to DoS
- # us by using a large file.
- #UserMaxFile=65536
-@@ -339,17 +346,18 @@ Enable=false
+@@ -339,11 +346,12 @@
#PingIntervalSeconds=15
# The port. 177 is the standard port so better keep it that way.
#Port=177
@@ -82,23 +58,7 @@
[gui]
# The specific gtkrc file we use. It should be the full path to the gtkrc that
- # we need. Unless you need a specific gtkrc that doesn't correspond to a
- # specific theme, then just use the GtkTheme key.
--#GtkRC=@datadir@/themes/Default/gtk-2.0/gtkrc
-+GtkRC=@datadir@/themes/Industrial/gtk-2.0/gtkrc
-
- # The GTK+ theme to use for the GUI.
- #GtkTheme=Default
-@@ -376,7 +384,7 @@ Enable=false
- #TitleBar=true
- # Don't allow user to move the standard login window. Only makes sense if
- # TitleBar is on.
--#LockPosition=false
-+LockPosition=true
- # Set a position for the standard login window rather then just centering the
- # window. If you enter negative values for the position it is taken as an
- # offset from the right or bottom edge.
-@@ -397,7 +405,7 @@ Browser=false
+@@ -397,7 +405,7 @@
# User ID's less than the MinimalUID value will not be included in the face
# browser or in the gdmselection list for Automatic/Timed login. They will not
# be displayed regardless of the settings for Include and Exclude.
@@ -107,48 +67,7 @@
# Users listed in Include will be included in the face browser and in the
# gdmsetup selection list for Automatic/Timed login. Users should be separated
# by commas.
-@@ -428,7 +436,7 @@ Browser=false
- #ChooserButtonLogo=@pixmapdir@/gdm-foot-logo.png
- # The standard greeter should shake if a user entered the wrong username or
- # password. Kind of cool looking
--#Quiver=true
-+Quiver=false
-
- # The Actions menu (formerly system menu) is shown in the greeter, this is the
- # menu that contains reboot, shutdown, suspend, config and chooser. None of
-@@ -465,12 +473,12 @@ DefaultRemoteWelcome=true
- # Background settings for the standard greeter:
- # Type can be 0=None, 1=Image & Color, 2=Color, 3=Image
- #BackgroundType=2
--#BackgroundImage=
-+BackgroundImage=0
- #BackgroundScaleToFit=true
- # The Standard greeter (gdmlogin) uses BackgroundColor as the background
- # color, while the themed greeter (gdmgreeter) uses GraphicalThemedColor
- # as the background color.
--BackgroundColor=#76848F
-+BackgroundColor=#000000
- GraphicalThemedColor=#76848F
- # XDMCP session should only get a color, this is the sanest setting since you
- # don't want to take up too much bandwidth
-@@ -512,7 +520,7 @@ GraphicalThemedColor=#76848F
- # list then provide a list that is delimited by /: to the GraphicalThemes
- # key and set GraphicalThemeRand to true. Otherwise use GraphicalTheme
- # and specify just one theme.
--#GraphicalTheme=circles
-+GraphicalTheme=GDM-SuSE
- #GraphicalThemes=circles/:happygnome
- GraphicalThemeDir=@datadir@/gdm/themes/
- GraphicalThemeRand=false
-@@ -529,6 +537,7 @@ GraphicalThemeRand=false
- # executable (see daemon/SoundProgram) it will play that file instead of just
- # beeping.
- #SoundOnLogin=true
-+SoundOnLogin=false
- #SoundOnLoginFile=
- # If SoundOnLoginSuccess, then the greeter will play a sound (as above) when a
- # user successfully logs in.
-@@ -629,7 +638,7 @@ Gestures=false
+@@ -626,7 +634,7 @@
[server-Standard]
name=Standard server
@@ -157,5 +76,3 @@
flexible=true
# Indicates that the X server should be started at a different process
# priority. Values can be any integer value accepted by the setpriority C
-Only in gdm-2.19.5-post/config: gdm.conf.in.orig
-Only in gdm-2.19.5-post: error.14848
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org