SHA256
1
0
forked from pool/gdm

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

Update to 3.2.1.1

OBS-URL: https://build.opensuse.org/request/show/100366
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gdm?expand=0&rev=198
This commit is contained in:
2012-01-17 13:47:10 +00:00
committed by Git OBS Bridge
parent a0193796ac
commit b08b3889f4
7 changed files with 50 additions and 106 deletions

View File

@@ -1,7 +1,7 @@
#
# spec file for package gdm
#
# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2012 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
@@ -15,17 +15,18 @@
# 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
Name: gdm
Version: 3.2.0
Version: 3.2.1.1
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.2/%{name}-%{version}.tar.bz2
Source: http://download.gnome.org/sources/gdm/3.2/%{name}-%{version}.tar.xz
Source1: gdm.pamd
Source2: gdm-autologin.pamd
Source3: gdm-welcome.pamd
@@ -68,10 +69,6 @@ Patch35: gdm-xauthlocalhostname.patch
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
# PATCH-FIX-OPENSUSE gdm-unified-auth.patch bgo#658451 vuntz@opensuse.org -- Fix "better unified authentication compatibility"
Patch61: gdm-unified-auth.patch
# PATCH-FIX-OPENSUSE gdm-fix-no-split-again.patch bgo#658451 vuntz@opensuse.org -- Fix in addition to previous patch, to prevent crash in old greeter when trying to login
Patch62: gdm-fix-no-split-again.patch
BuildRequires: check-devel
BuildRequires: dbus-1-glib-devel
# needed for directory ownership
@@ -97,6 +94,8 @@ BuildRequires: translation-update-upstream
BuildRequires: update-desktop-files
BuildRequires: xorg-x11-server
BuildRequires: xorg-x11-server-extra
# Only needed because we don't (and won't) support building xz tarballs by default... See bnc#697467
BuildRequires: xz
BuildRequires: pkgconfig(accountsservice)
BuildRequires: pkgconfig(nss)
Requires: %{name}-branding = %{version}
@@ -114,6 +113,7 @@ Requires: polkit-gnome
Recommends: gnome-shell
## All sessions
Requires: gnome-settings-daemon
Requires(post): dconf
# Those accessibility features rely on deprecated modules that we don't ship :/ See bgo#658429.
#Recommends: gnome-mag
#Recommends: gok
@@ -244,8 +244,6 @@ gnome-patch-translation-prepare
%patch35 -p0
%patch40 -p1
%patch60
%patch61 -p1
%patch62 -p1
gnome-patch-translation-update
%build
@@ -282,6 +280,9 @@ 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
## Install PAM files.
mkdir -p $RPM_BUILD_ROOT/etc/pam.d
# Generic pam config
@@ -350,6 +351,8 @@ fi
%preun -f %{name}.schemas_preun
%posttrans -f %{name}.schemas_posttrans
# Create dconf database for gdm, to lockdown the gdm session
dconf update
%postun
%insserv_cleanup
@@ -397,17 +400,16 @@ fi
%dir %{_localstatedir}/cache/gdm
%config /etc/pam.d/gdm
%config /etc/pam.d/gdm-autologin
%config /etc/pam.d/gdm-password
%config /etc/pam.d/gdm-welcome
%if %{enable_split_authentication}
%config /etc/pam.d/gdm-fingerprint
%config /etc/pam.d/gdm-smartcart
%endif
%config /etc/pam.d/gdm-password
%config /etc/pam.d/gdm-smartcard
%config /etc/pam.d/gdm-welcome
%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
%{_sysconfdir}/dconf/profile/gdm
%{_sysconfdir}/dconf/db/gdm.d/00-upstream-settings
%{_sysconfdir}/dconf/db/gdm.d/locks/00-upstream-settings-locks
%ghost %{_sysconfdir}/dconf/profile/gdm
# /etc/xinit.d/xdm integration
%dir %{_libexecdir}/X11/displaymanagers
%{_libexecdir}/X11/displaymanagers/gdm