From d0cbd31537f1d534f70b8fc1719983302afd1c9c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miloslav=20Trma=C4=8D?= <mitr@redhat.com>
Date: Tue, 21 Aug 2012 01:54:21 +0200
Subject: [PATCH] Update to usermode-1.110

---
 .gitignore    |  1 +
 sources       |  2 +-
 usermode.spec | 32 ++++++++++----------------------
 3 files changed, 12 insertions(+), 23 deletions(-)

diff --git a/.gitignore b/.gitignore
index 2b1239a..ed4f6a7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@ usermode-1.105.tar.xz
 /usermode-1.107.tar.xz
 /usermode-1.108.tar.xz
 /usermode-1.109.tar.xz
+/usermode-1.110.tar.xz
diff --git a/sources b/sources
index 164309a..403f2ed 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-d7c292b24cd9804887bc856523cffeb2  usermode-1.109.tar.xz
+af38f6dfbae23777be77c081868bcdad  usermode-1.110.tar.xz
diff --git a/usermode.spec b/usermode.spec
index 630b7f8..d3e016a 100644
--- a/usermode.spec
+++ b/usermode.spec
@@ -1,7 +1,7 @@
 Summary: Tools for certain user account management tasks
 Name: usermode
-Version: 1.109
-Release: 2%{?dist}
+Version: 1.110
+Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/System
 URL: https://fedorahosted.org/usermode/
@@ -48,15 +48,7 @@ make install DESTDIR=$RPM_BUILD_ROOT INSTALL='install -p'
 ln -sf usermount $RPM_BUILD_ROOT%{_bindir}/userformat
 ln -s usermount.1 $RPM_BUILD_ROOT%{_mandir}/man1/userformat.1
 
-# We set up the shutdown programs to be wrapped in this package.  Other
-# packages are on their own....
-mkdir -p $RPM_BUILD_ROOT/etc/pam.d $RPM_BUILD_ROOT/etc/security/console.apps
-for wrappedapp in halt reboot poweroff ; do
-	ln -s consolehelper $RPM_BUILD_ROOT%{_bindir}/${wrappedapp}
-	install -p -m644 $wrappedapp \
-		$RPM_BUILD_ROOT/etc/security/console.apps/${wrappedapp}
-	install -p -m644 shutdown.pamd $RPM_BUILD_ROOT/etc/pam.d/${wrappedapp}
-done
+mkdir -p $RPM_BUILD_ROOT/etc/security/console.apps
 install -p -m 644 %{SOURCE1} \
 	$RPM_BUILD_ROOT/etc/security/console.apps/config-util
 
@@ -80,18 +72,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/consolehelper
 %{_mandir}/man8/userhelper.8*
 %{_mandir}/man8/consolehelper.8*
-# PAM console wrappers
-%{_bindir}/halt
-%{_bindir}/reboot
-%{_bindir}/poweroff
-%exclude %{_bindir}/shutdown
-%config(noreplace) /etc/pam.d/halt
-%config(noreplace) /etc/pam.d/reboot
-%config(noreplace) /etc/pam.d/poweroff
 %config(noreplace) /etc/security/console.apps/config-util
-%config(noreplace) /etc/security/console.apps/halt
-%config(noreplace) /etc/security/console.apps/reboot
-%config(noreplace) /etc/security/console.apps/poweroff
 
 %files gtk
 %defattr(-,root,root,-)
@@ -112,6 +93,13 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/applications/*
 
 %changelog
+* Mon Aug 20 2012 Miloslav Trmač <mitr@redhat.com> - 1.101-1
+- Update to usermode-1.110.
+  Note that this drops halt/poweroff/reboot helpers, the respective
+  implementations in systemd now include PolicyKit support.  Spec file change
+  based on a patch by Lennart Poettering <lpoetter@redhat.com>.
+  Resolves: #804088, #849208
+
 * Sun Jul 22 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.109-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild