checked in

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

gdm.spec

@@ -91,15 +91,13 @@ Patch37:        gdm-autologin-once.patch
 Patch38:        gdm-devkit-power.patch
 # PATCH-FIX-UPSTREAM gdm-polkit-gnome-path.patch bgo597050 vuntz@opensuse.org -- Use the right patch for the polkit agent. The current patch is a quick workaround for now, until we know how upstream wants to fix this.
 Patch39:        gdm-polkit-gnome-path.patch
-# PATCH-FIX-UPSTREAM gdm-look-at-runlevel.patch bnc540482 bgo599180 vuntz@opensuse.org -- Look at the current runlevel before managing the display again, so we don't do this when shutting down or rebooting
-Patch40:        gdm-look-at-runlevel.patch
 # PATCH-FIX-OPENSUSE gdm-selinux.patch -- Small changes to make it compile fine with SELinux
 Patch60:        gdm-selinux.patch
 Url:            http://www.gnome.org/
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 DocDir:         %{_defaultdocdir}
-Provides:       gdm2 = %{version}
-Obsoletes:      gdm2 < %{version}
+Provides:       gdm2
+Obsoletes:      gdm2
 Obsoletes:      fast-user-switch-applet <= 2.22.0
 Requires:       %{name}-branding
 Requires:       %{name}-lang = %{version}
@@ -126,7 +124,7 @@ Summary:        The GNOME 2.x Display Manager
 Group:          System/GUI/GNOME
 Provides:       %{name}-branding = %{version}
 Conflicts:      otherproviders(%{name}-branding)
-Supplements:    packageand(%{name}:branding-upstream)
+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.
@@ -167,7 +165,6 @@ gnome-patch-translation-prepare
 %patch37 -p1
 %patch38 -p1
 %patch39 -p1
-%patch40 -p1
 %patch60
 # gnome-patch-translation-update