Accepting request 75547 from home:vuntz:branches:GNOME:Factory

Some branding cleanups

OBS-URL: https://build.opensuse.org/request/show/75547
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gdm?expand=0&rev=165

gdm.changes

@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Wed Jul  6 16:34:12 CEST 2011 - vuntz@opensuse.org
+
+- Change branding-upstream subpackage:
+  + Add Requires for gdm since the branding package is useless
+    without it.
+  + Update summary and description.
+  + Make noarch.
+- Change branding Requires in main subpackage to be "= %{version}"
+  since it has to be versioned.
+- Update Url tag.
+
 -------------------------------------------------------------------
 Sat Jul  2 09:53:09 CEST 2011 - vuntz@opensuse.org
 

gdm.spec

@@ -24,7 +24,7 @@ Group:          System/GUI/GNOME
 Version:        3.1.2
 Release:        1
 Summary:        The GNOME Display Manager
-Url:            http://www.gnome.org/
+Url:            http://projects.gnome.org/gdm/
 Source:         %{name}-%{version}.tar.bz2
 Source1:        gdm.pamd
 Source2:        gdm-autologin.pamd
@@ -87,7 +87,7 @@ BuildRequires:  xorg-x11-server
 BuildRequires:  xorg-x11-server-extra
 BuildRequires:  pkgconfig(accountsservice)
 BuildRequires:  pkgconfig(nss)
-Requires:       %{name}-branding
+Requires:       %{name}-branding = %{version}
 Requires:       ConsoleKit-x11
 Requires:       gnome-session-core
 Requires:       klogd
@@ -136,11 +136,13 @@ providing graphical log-ins and managing local and remote displays.
 
 %package branding-upstream
 License:        GPLv2+
-Summary:        The GNOME Display Manager
+Summary:        The GNOME Display Manager -- Upstream default configuration
 Group:          System/GUI/GNOME
+Requires:       %{name} = %{version}
 Provides:       %{name}-branding = %{version}
 Conflicts:      otherproviders(%{name}-branding)
 Supplements:    packageand(%{name}:branding-upstream)
+BuildArch:      noarch
 #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.
@@ -150,6 +152,8 @@ Supplements:    packageand(%{name}:branding-upstream)
 The GNOME Display Manager is a system service that is responsible for
 providing graphical log-ins and managing local and remote displays.
 
+This package provides the upstream default configuration for gdm.
+
 %lang_package
 %prep
 %setup -q