SHA256
1
0
forked from pool/gdm

Accepting request 635607 from GNOME:Next

OBS-URL: https://build.opensuse.org/request/show/635607
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gdm?expand=0&rev=412
This commit is contained in:
2018-09-23 01:30:29 +00:00
committed by Git OBS Bridge
parent 36f7ff3648
commit eeabd7a7c4
11 changed files with 215 additions and 80 deletions

View File

@@ -19,14 +19,15 @@
%define systemdsystemunitdir %(pkg-config --variable=systemdsystemunitdir systemd)
# 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
Name: gdm
Version: 3.28.4
Version: 3.30.0
Release: 0
Summary: The GNOME Display Manager
License: GPL-2.0-or-later
Group: System/GUI/GNOME
URL: https://wiki.gnome.org/Projects/GDM
Source: http://download.gnome.org/sources/gdm/3.28/%{name}-%{version}.tar.xz
Source0: https://download.gnome.org/sources/gdm/3.30/%{name}-%{version}.tar.xz
Source1: gdm.pamd
Source2: gdm-autologin.pamd
Source3: gdm-launch-environment.pamd
@@ -38,6 +39,7 @@ Source6: gdmflexiserver-wrapper
Source7: X11-displaymanager-gdm
# GDM does not boostrap using gnome-autogen.sh, but has it's own bootstrap script
Source8: autogen.sh
# WARNING: do not remove/significantly change patch0 without updating the relevant patch in accountsservice too
# PATCH-FIX-OPENSUSE gdm-sysconfig-settings.patch bnc432360 bsc#919723 hpj@novell.com -- Read autologin options from /etc/sysconfig/displaymanager; note that accountsservice has a similar patch (accountsservice-sysconfig.patch)
Patch0: gdm-sysconfig-settings.patch
@@ -53,15 +55,18 @@ Patch5: gdm-ignore-duplicate-session.patch
Patch6: gdm-plymouth-vt1.patch
# PATCH-FIX-UPSTREAM gdm-fails-to-restart-gnome-shell.patch bsc#981976 bgo#769969 tyang@suse.com -- Gdm should stop after a few times fails
Patch7: gdm-fails-to-restart-gnome-shell.patch
# PATCH-FIX-UPSTREAM gdm-add-runtime-option-to-disable-starting-X-server-as-u.patch bnc#1075805 bgo#793255 msrb@suse.com -- Add runtime option to start X under root instead of regular user. Necessary if no DRI drivers are present.
# PATCH-NEEDS-REBASE gdm-add-runtime-option-to-disable-starting-X-server-as-u.patch bnc#1075805 bgo#793255 msrb@suse.com -- Add runtime option to start X under root instead of regular user. Necessary if no DRI drivers are present. WAS: PATCH-FIX-UPSTREAM, rejected upstream
Patch8: gdm-add-runtime-option-to-disable-starting-X-server-as-u.patch
# PATCH-FIX-UPSTREAM gdm-make-udev-rules-dir-configurable.patch glgo#GNOME/gdm!44 luc14n0@linuxmail.org Make the udev rules dir configurable.
Patch9: gdm-make-udev-dir-configurable.patch
### NOTE: Keep please SLE-only patches at bottom (starting on 1000).
# PATCH-FIX-SLE gdm-disable-gnome-initial-setup.patch bnc#1067976 qzhao@suse.com -- Disable gnome-initial-setup runs before gdm, g-i-s will only serve for CJK people to choose the input-method after login.
Patch1000: gdm-disable-gnome-initial-setup.patch
BuildRequires: check-devel
# needed for directory ownership
# dconf and gnome-session-core are needed for directory ownership
BuildRequires: dconf
# needed for directory ownership
BuildRequires: fdupes
BuildRequires: gnome-common
BuildRequires: gnome-session-core
@@ -196,12 +201,17 @@ cp %{SOURCE8} .
%patch5 -p1
%patch6 -p1
%patch7 -p1
%patch8 -p1
#patch8 -p1
%patch9 -p1
# SLE-only patches start at 1000
%if !0%{?is_opensuse}
%patch1000 -p1
%endif
# Force 61-gdm.rules to be override and make it use of libexecdir variable instead of hardcoding
rm data/61-gdm.rules
%build
NOCONFIGURE=1 sh autogen.sh
autoreconf -fiv
@@ -228,7 +238,8 @@ autoreconf -fiv
--disable-split-authentication \
%endif
--with-initial-vt=7 \
--with-run-dir=/run/gdm
--with-run-dir=/run/gdm \
--with-udevdir=/usr/lib/udev
%make_build V=1
%install
@@ -268,7 +279,6 @@ install -D -m 644 %{SOURCE7} %{buildroot}%{_libexecdir}/X11/displaymanagers/gdm
mkdir -p %{buildroot}%{_sysconfdir}/alternatives
touch %{buildroot}%{_sysconfdir}/alternatives/default-displaymanager
ln -s %{_sysconfdir}/alternatives/default-displaymanager %{buildroot}%{_libexecdir}/X11/displaymanagers/default-displaymanager
# Install other files
mkdir -p %{buildroot}%{_localstatedir}/log/gdm
mkdir -p %{buildroot}/run/gdm
@@ -322,7 +332,7 @@ dconf update
%files
%license COPYING
%doc AUTHORS ChangeLog NEWS README
%doc AUTHORS NEWS README.md
%doc %{_datadir}/help/C/%{name}/
%dir %config %{_sysconfdir}/gdm
%config %{_sysconfdir}/gdm/[IPXl]*