[mate-screensaver/epel7: 23/23] use gdm as last condition for user switching

[Wolfgang Ulbrich]

commit 76a507397c5985587836a197addc6384304ef54f
Merge: aeac1ee a36ec42
Author: raveit65 <chat-to-me at raveit.de>
Date:   Fri Feb 20 16:14:17 2015 +0100

    use gdm as last condition for user switching

 .gitignore                                         | 11 +++++
 mate-screensaver.spec                              |  8 +++-
 ...use-gdm-as-last-condition-for-user-switch.patch | 55 ++++++++++++++++++++++
 3 files changed, 73 insertions(+), 1 deletion(-)
---
diff --cc .gitignore
index fdb8430,d204eb4..ffd2c82
--- a/.gitignore
+++ b/.gitignore
@@@ -4,6 -4,10 +4,13 @@@
  /mate-screensaver-1.5.2.tar.xz
  /mate-screensaver-1.6.0.tar.xz
  /mate-screensaver-1.6.1.tar.xz
+ <<<<<<< HEAD
++=======
++<<<<<<< HEAD
+ /mate-screensaver-1.6.2.tar.xz
+ /mate-screensaver-1.8.0.tar.xz
+ =======
++>>>>>>> f20
  /mate-screensaver-1.7.0.git0460034.tar.xz
  /mate-screensaver-1.7.0.tar.xz
  /mate-screensaver-1.7.1-git20140125-d5b3508.tar.xz
@@@ -11,3 -15,4 +18,7 @@@
  /mate-screensaver-1.7.90.tar.xz
  /mate-screensaver-1.8.0.tar.xz
  /mate-screensaver-1.8.1.tar.xz
++<<<<<<< HEAD
++=======
+ >>>>>>> f21
++>>>>>>> f20
diff --cc mate-screensaver.spec
index 4ec6051,8ab9c21..bfe695c
--- a/mate-screensaver.spec
+++ b/mate-screensaver.spec
@@@ -26,9 -26,17 +26,11 @@@ URL:            http://pub.mate-desktop
  # Source for snapshot-builds.
  %{!?rel_build:Source0:    http://git.mate-desktop.org/%{name}/snapshot/%{name}-%{commit}.tar.xz#/%{git_tar}}
  
+ Patch0:         mate-screensaver_use-gdm-as-last-condition-for-user-switch.patch
+ 
  Requires:       redhat-menus
  Requires:       system-logos
 -
 -# switch to gnome-keyring > f19
 -%if 0%{?fedora} > 19
  Requires:       gnome-keyring-pam
 -%else
 -Requires:       mate-keyring-pam
 -%endif
  
  BuildRequires:  dbus-glib-devel
  BuildRequires:  desktop-file-utils
@@@ -143,40 -151,30 +146,43 @@@ f
  
  
  %changelog
+ * Fri Feb 20 2015 Wolfgang Ulbrich <chat-to-me at raveit.de> - 1.8.1-2
+ - use gdm as last condition for user switching
+ 
  * Thu Oct 02 2014 Wolfgang Ulbrich <chat-to-me at raveit.de> - 1.8.1-1
  - update to 1.8.1 release
 -- removed upstreamed patch
  
 -* Sat Jul 26 2014 Wolfgang Ulbrich <chat-to-me at raveit.de> - 1.8.0-2
 -- update to 1.8.0 release
 -- update build requires
 -- update configure flags
 -- use modern 'make install' macro
 -- fix versioned doc dir
 -- add --with-gnome --all-name for find language
 -- update file section
 +* Thu Apr 10 2014 Dan Mashal <dan.mashal at fedoraproject.org> - 1.8.0-2
 +- Fix dependencies.
 +
 +* Wed Mar 05 2014 Dan Mashal <dan.mashal at fedoraproject.org> - 1.8.0-1
 +- Update to 1.8.0
  
 -* Sat Feb 01 2014 Wolfgang Ulbrich <chat-to-me at raveit.de> - 1.6.2-1
 -- update to 1.6.2 release
 -- removed upstreamed systemd patch
 -- use a condition for the sed command
 +* Wed Feb 19 2014 Wolfgang Ulbrich <chat-to-me at raveit.de> - 1.7.90-1
 +- update to 1.7.90
  
 -* Sun Jan 26 2014 Wolfgang Ulbrich <chat-to-me at raveit.de> - 1.6.1-5
 -- fix pam file, rhbz (#1056591) and (#1056591)
 -- re-work configure flags
 +* Tue Feb 11 2014 Wolfgang Ulbrich <chat-to-me at raveit.de> - 1.7.1-1
 +- update to 1.7.1 release
 +
 +* Sun Jan 26 2014 Wolfgang Ulbrich <chat-to-me at raveit.de> - 1.7.1-0.1.git20140125.d5b3508
 +- update to git snapshot from 2014.01.25
 +- fix rhbz (#1057402) and (#1056591)
 +- make Maintainers life easier and use better git snapshot usage
 +
 +* Tue Jan 14 2014 Wolfgang Ulbrich <chat-to-me at raveit.de> - 1.7.0-1
 +- update to 1.7.0 release
 +- add --with-gnome --all-name for find language
 +- removed upstreamed systemd-login patch
 +- removed --with-console-kit configure flag
 +- use modern 'make install' macro
 +- add BR xmlto
 +- reworked configure flags, use --with-gtk=2.0, --disable-schemas-compile
 +- --enable-docbook-docs
 +- fixed versioned doc dir
 +- use one style for ownning directories
 +
 +* Fri Dec 06 2013 Dan Mashal <dan.mashal at fedoraproject.org> 1.7.0-1.1.git0460034
 +- Update to 1.7.0
  
  * Sat Oct 19 2013 Wolfgang Ulbrich <chat-to-me at raveit.de> - 1.6.1-4
  - switch to gnome-keyring for > f19