SHA256
1
0
forked from pool/gdm

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

Ouch, very bad bug with the dconf thing: this breaks gdm :/

OBS-URL: https://build.opensuse.org/request/show/103832
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gdm?expand=0&rev=200
This commit is contained in:
Vincent Untz
2012-02-12 20:16:58 +00:00
committed by Git OBS Bridge
parent b08b3889f4
commit 5d9154826b
3 changed files with 14 additions and 21 deletions

View File

@@ -15,7 +15,6 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
# FIXME: need to check what should be done to enable this (at least adapt the pam files). See bnc#699999
%define enable_split_authentication 0
@@ -36,8 +35,6 @@ Source4: gdmflexiserver-wrapper
Source5: X11-displaymanager-gdm
# PATCH-FEATURE-UPSTREAM gdm-plymouth.patch vuntz@opensuse.org -- Get a nice transition from plymouth; taken from Fedora
Patch0: gdm-plymouth.patch
# PATCH-FIX-UPSTREAM gdm-plymouth-X-nr.patch vuntz@opensuse.org -- Patch on top of the previous patch (we keep it separate so it's easy to sync with Fedora) to use -nr when starting X
Patch1: gdm-plymouth-X-nr.patch
# PATCH-FIX-UPSTREAM gdm-helper-directory.patch bgo582320 vuntz@novell.com -- Add --with-consolekit-directory, --with-check-accelerated-directory
Patch2: gdm-helper-directory.patch
# 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
@@ -227,7 +224,6 @@ translation-update-upstream
#disabled, needed for patch10
gnome-patch-translation-prepare
%patch0 -p1
%patch1 -p1
%patch2 -p1
%patch3 -p1
%patch4 -p1
@@ -280,9 +276,8 @@ mkdir -p %{buildroot}%{_libdir}/gdm/simple-greeter/extensions
%endif
# Remove wrapper, it is not needed.
mv $RPM_BUILD_ROOT%{_sbindir}/gdm-binary $RPM_BUILD_ROOT%{_sbindir}/gdm
# Remove dconf database, rebuilt in scriptlets; touch it for %%ghost
rm %{buildroot}%{_sysconfdir}/dconf/profile/gdm
touch %{buildroot}%{_sysconfdir}/dconf/profile/gdm
# 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
@@ -409,7 +404,8 @@ dconf update
%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/profile/gdm
%ghost %{_sysconfdir}/dconf/db/gdm
%{_sysconfdir}/dconf/profile/gdm
# /etc/xinit.d/xdm integration
%dir %{_libexecdir}/X11/displaymanagers
%{_libexecdir}/X11/displaymanagers/gdm