Accepting request 228609 from GNOME:Next

Push GNOME:Next - GNOME 3.12.0

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

gdm.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package gdm
 #
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -27,13 +27,13 @@
 %define enable_split_authentication 0
 
 Name:           gdm
-Version:        3.10.0.1
+Version:        3.12.0
 Release:        0
 Summary:        The GNOME Display Manager
 License:        GPL-2.0+
 Group:          System/GUI/GNOME
 Url:            http://projects.gnome.org/gdm/
-Source:         http://download.gnome.org/sources/gdm/3.10/%{name}-%{version}.tar.xz
+Source:         http://download.gnome.org/sources/gdm/3.12/%{name}-%{version}.tar.xz
 Source1:        gdm.pamd
 Source2:        gdm-autologin.pamd
 Source3:        gdm-launch-environment.pamd
@@ -45,8 +45,6 @@ Source4:        gdmflexiserver-wrapper
 Source5:        X11-displaymanager-gdm
 # GDM does not boostrap using gnome-autogen.sh, but has it's own bootstrap script
 Source8:        autogen.sh
-# PATCH-FIX-OPENSUSE gdm-is-not-unstable-unless.patch vuntz@opensuse.org -- Make gdm think it's never running a development version unless SUSE_ENABLE_UNSTABLE_CHECK is set. This disables fatal warnings as well as abusive log
-Patch3:         gdm-is-not-unstable-unless.patch
 # PATCH-NEEDS-REBASE PATCH-FIX-OPENSUSE gdm-desktop-session-env-pam.patch bnc427744 vuntz@novell.com -- Sets a PAM environment variable to let the pam gnome-keyring module know which session is started
 Patch6:         gdm-desktop-session-env-pam.patch
 # PATCH-FIX-OPENSUSE gdm-suse-xsession.patch vuntz@novell.com -- Use the /etc/X11/xdm/* scripts
@@ -62,8 +60,6 @@ Patch34:        gdm-default-wm.patch
 Patch35:        gdm-xauthlocalhostname.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-UPSTREAM gdm-XDMCP-fixes.patch bnc#851160 bgo#690926 dimstar@opensuse.org -- Backported fixes from git for XDMCP remote login
-Patch41:        gdm-XDMCP-fixes.patch
 BuildRequires:  check-devel
 # needed for directory ownership
 BuildRequires:  dconf
@@ -188,19 +184,18 @@ running display manager.
 %lang_package
 %prep
 %setup -q
+cp %{S:8} .
 translation-update-upstream
-%patch3 -p1
 %patch6 -p1
 %patch7 -p1
 %patch8 -p1
 %patch9 -p1
 %patch34 -p1
-%patch35 -p1
+#patch35 -p1
 %patch40 -p1
-%patch41 -p1
 
 %build
-NOCONFIGURE=1 sh %{S:8}
+NOCONFIGURE=1 sh autogen.sh
 %configure\
         --disable-static \
         --libexecdir=%{_prefix}/lib/gdm \
@@ -208,6 +203,7 @@ NOCONFIGURE=1 sh %{S:8}
         --with-at-spi-registryd-directory=%{_libexecdir}/at-spi \
         --with-consolekit-directory=%{_libexecdir}/ConsoleKit \
         --with-check-accelerated-directory=%{_libexecdir} \
+        --with-gnome-settings-daemon-directory=%{_libexecdir}/gnome-settings-daemon-3.0 \
         --enable-ipv6 \
         --with-plymouth \
 %if %{with_systemd}
@@ -233,8 +229,6 @@ find %{buildroot}%{_libdir} -name '*.la' -type f -delete -print
 %if %{with_systemd}
 rm %{buildroot}%{systemdsystemunitdir}/gdm.service
 %endif
-# dconf database, rebuilt in scriptlets; touch it for %%ghost
-touch %{buildroot}%{_sysconfdir}/dconf/db/gdm
 ## Install PAM files.
 mkdir -p $RPM_BUILD_ROOT/etc/pam.d
 # Generic pam config
@@ -326,6 +320,9 @@ dconf update
 %{_sbindir}/gdm
 %{_bindir}/gdm
 %{_bindir}/gdm-screenshot
+%dir %{_datadir}/dconf
+%dir %{_datadir}/dconf/profile
+%{_datadir}/dconf/profile/gdm
 %{_datadir}/gdm/
 %{_datadir}/glib-2.0/schemas/org.gnome.login-screen.gschema.xml
 %{_datadir}/gnome-session/sessions/gdm-shell.session
@@ -345,12 +342,6 @@ dconf update
 %config /etc/pam.d/gdm-smartcard
 %config /etc/pam.d/gdm-launch-environment
 %config %{_sysconfdir}/dbus-1/system.d/gdm.conf
-%dir %config %{_sysconfdir}/dconf/db/gdm.d
-%dir %config %{_sysconfdir}/dconf/db/gdm.d/locks
-%{_sysconfdir}/dconf/db/gdm.d/00-upstream-settings
-%{_sysconfdir}/dconf/db/gdm.d/locks/00-upstream-settings-locks
-%ghost %{_sysconfdir}/dconf/db/gdm
-%{_sysconfdir}/dconf/profile/gdm
 # /etc/xinit.d/xdm integration
 %dir %{_libexecdir}/X11/displaymanagers
 %{_libexecdir}/X11/displaymanagers/gdm