SHA256
1
0
forked from pool/gdm

Accepting request 158323 from GNOME:Next

Push GNOME:Next

OBS-URL: https://build.opensuse.org/request/show/158323
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gdm?expand=0&rev=236
This commit is contained in:
2013-03-13 22:59:19 +00:00
committed by Git OBS Bridge
parent 04124e8319
commit 3403901dbb
8 changed files with 110 additions and 153 deletions

View File

@@ -27,13 +27,13 @@
%define enable_split_authentication 0
Name: gdm
Version: 3.6.2
Version: 3.7.91
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.6/%{name}-%{version}.tar.xz
Source: http://download.gnome.org/sources/gdm/3.7/%{name}-%{version}.tar.xz
Source1: gdm.pamd
Source2: gdm-autologin.pamd
Source3: gdm-launch-environment.pamd
@@ -64,10 +64,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-autologin-session-logout.patch bgo#682467 dimstar@opensuse.org -- Fix login after logging out from a auto-login session
Patch41: gdm-autologin-session-logout.patch
# PATCH-FIX-OPENSUSE gdm-move-everything-to-run.patch bgo#692733 rmilasan@suse.com -- Move everything (socket and pid files) to /run
Patch42: gdm-move-everything-to-run.patch
BuildRequires: check-devel
# needed for directory ownership
BuildRequires: dconf
@@ -92,6 +88,7 @@ BuildRequires: xorg-x11-server-extra
BuildRequires: pkgconfig(accountsservice)
%if %{with_systemd}
BuildRequires: pkgconfig(libsystemd-daemon)
BuildRequires: pkgconfig(libsystemd-journal)
BuildRequires: pkgconfig(libsystemd-login) >= 186
%endif
BuildRequires: pkgconfig(nss)
@@ -105,7 +102,6 @@ Requires: ConsoleKit-x11
%endif
Requires: gdmflexiserver
Requires: gnome-session-core
Requires: klogd
Requires: xorg-x11-server-extra
### Packages for the gdm session (see /usr/share/gnome-session/sessions/{gdm,gdm-fallback}.session and /usr/share/gdm/greeter/applications)
## Fallback
@@ -238,8 +234,6 @@ translation-update-upstream
%patch34 -p1
%patch35 -p1
%patch40 -p1
%patch41 -p1
%patch42 -p1
%build
NOCONFIGURE=1 gnome-autogen.sh
@@ -264,7 +258,8 @@ NOCONFIGURE=1 gnome-autogen.sh
--disable-split-authentication \
%endif
--disable-scrollkeeper \
--with-initial-vt=7
--with-initial-vt=7 \
--with-run-dir=/run/gdm
%__make %{?jobs:-j%jobs} V=1
%install
@@ -279,8 +274,6 @@ mkdir -p %{buildroot}%{_libdir}/gdm/simple-greeter/extensions
%if %{with_systemd}
rm %{buildroot}%{systemdsystemunitdir}/gdm.service
%endif
# Remove wrapper, it is not needed.
mv $RPM_BUILD_ROOT%{_sbindir}/gdm-binary $RPM_BUILD_ROOT%{_sbindir}/gdm
# dconf database, rebuilt in scriptlets; touch it for %%ghost
touch %{buildroot}%{_sysconfdir}/dconf/db/gdm
## Install PAM files.