From 31ac6252f3ce7617efc41b54010f6a17558aac5a40f8dc962a517b52c1fcfeb9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Lie?= <zaitor@opensuse.org>
Date: Tue, 10 Feb 2015 16:06:43 +0000
Subject: [PATCH 1/2] Accepting request 285087 from
 home:Zaitor:branches:GNOME:Factory

Alternative route

OBS-URL: https://build.opensuse.org/request/show/285087
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gdm?expand=0&rev=280
---
 gdm.changes | 6 ++++++
 gdm.spec    | 8 ++++++--
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/gdm.changes b/gdm.changes
index 55dc75d..55126df 100644
--- a/gdm.changes
+++ b/gdm.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Feb 10 11:28:29 UTC 2015 - zaitor@opensuse.org
+
+- Only install gdm-fingerprint and gdm-fingerprint pamfiles if
+  enable_split_authentication is enabled (boo#900836).
+
 -------------------------------------------------------------------
 Tue Oct 14 13:04:31 UTC 2014 - dimstar@opensuse.org
 
diff --git a/gdm.spec b/gdm.spec
index 6680833..55adeab 100644
--- a/gdm.spec
+++ b/gdm.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package gdm
 #
-# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -238,10 +238,12 @@ cp %{SOURCE1} $RPM_BUILD_ROOT/etc/pam.d/gdm
 cp %{SOURCE2} $RPM_BUILD_ROOT/etc/pam.d/gdm-autologin
 # Pam config for the greeter session
 cp %{SOURCE3} $RPM_BUILD_ROOT/etc/pam.d/gdm-launch-environment
+%if %{enable_split_authentication}
 # Pam config for fingerprint authentication
 cp %{SOURCE6} $RPM_BUILD_ROOT/etc/pam.d/gdm-fingerprint
 # Pam config for smartcard authentication
 cp %{SOURCE7} $RPM_BUILD_ROOT/etc/pam.d/gdm-smartcard
+%endif
 # The default gdm pam configuration is the one to be used as pam-password too
 %if %{enable_split_authentication}
 rm $RPM_BUILD_ROOT/etc/pam.d/gdm-password
@@ -338,9 +340,11 @@ dconf update
 %ghost %attr(751,gdm,gdm) %dir /run/gdm
 %config /etc/pam.d/gdm
 %config /etc/pam.d/gdm-autologin
+%if %{enable_split_authentication}
 %config /etc/pam.d/gdm-fingerprint
-%config /etc/pam.d/gdm-password
 %config /etc/pam.d/gdm-smartcard
+%endif
+%config /etc/pam.d/gdm-password
 %config /etc/pam.d/gdm-launch-environment
 %config %{_sysconfdir}/dbus-1/system.d/gdm.conf
 # /etc/xinit.d/xdm integration

From 723af63b0ff47bbb6ea21d9a82f90740e5a10f8ced540347e435459182b8d188 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Lie?= <zaitor@opensuse.org>
Date: Tue, 10 Feb 2015 18:36:27 +0000
Subject: [PATCH 2/2] Accepting request 285340 from
 home:Zaitor:branches:GNOME:Factory

Fix cp error in .changes......

OBS-URL: https://build.opensuse.org/request/show/285340
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gdm?expand=0&rev=281
---
 gdm.changes | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gdm.changes b/gdm.changes
index 55126df..97944e1 100644
--- a/gdm.changes
+++ b/gdm.changes
@@ -1,7 +1,7 @@
 -------------------------------------------------------------------
 Tue Feb 10 11:28:29 UTC 2015 - zaitor@opensuse.org
 
-- Only install gdm-fingerprint and gdm-fingerprint pamfiles if
+- Only install gdm-fingerprint and gdm-smartcard pamfiles if
   enable_split_authentication is enabled (boo#900836).
 
 -------------------------------------------------------------------