OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gdm?expand=0&rev=47

gdm.spec

@@ -23,7 +23,7 @@ PreReq:         %insserv_prereq
 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 @@ Source2:        gdm-autologin.pamd
 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 @@ Obsoletes:      gdm2
 %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
@@ -81,6 +84,31 @@ provides a good looking graphical interface.
 
 
 
+Authors:
+--------
+    George (Jiri) Lebl <jirka@5z.com>
+    Martin K. Petersen <mkp@mkp.net>
+    Alex Larsson <alexl@redhat.com>
+
+%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 <jirka@5z.com>
@@ -91,7 +119,7 @@ Authors:
 %prep
 %setup -q
 gnome-patch-translation-prepare
-%patch0 -p1
+%patch0
 %patch3 -p1
 %patch5 -p1
 %patch9 -p1
@@ -226,10 +254,7 @@ sed -i s:DISPLAYMANAGER=/opt/gnome/sbin/gdm:DISPLAYMANAGER=/usr/sbin/gdm:g etc/i
 %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 @@ sed -i s:DISPLAYMANAGER=/opt/gnome/sbin/gdm:DISPLAYMANAGER=/usr/sbin/gdm:g etc/i
 %{_sbindir}/*
 %{_bindir}/*
 %{_datadir}/gdm
+%exclude %{_datadir}/gdm/*.conf
 #%{_datadir}/applications/*.desktop
 %{_datadir}/pixmaps/*.png
 %{_datadir}/pixmaps/faces
@@ -262,7 +288,14 @@ sed -i s:DISPLAYMANAGER=/opt/gnome/sbin/gdm:DISPLAYMANAGER=/usr/sbin/gdm:g etc/i
 
 %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