From b8a704d66482b1ad7ae13ba43e9e051e6de39b70 Mon Sep 17 00:00:00 2001
From: cvsdist <cvsdist@fedoraproject.org>
Date: Thu, 9 Sep 2004 13:58:03 +0000
Subject: [PATCH] auto-import usermode-1.67-2 from usermode-1.67-2.src.rpm

---
 .cvsignore    |  2 +-
 sources       |  2 +-
 usermode.spec | 38 +++++++++++++++++++++++++++++++-------
 3 files changed, 33 insertions(+), 9 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index 4eb7415..d36e844 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-usermode-1.63.tar.gz
+usermode-1.67.tar.gz
diff --git a/sources b/sources
index 8ffefc3..9a5d39d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-7029be0523133853c37e75a1149150cf  usermode-1.63.tar.gz
+36763e2fcac643af9a7f61cedc3e9e75  usermode-1.67.tar.gz
diff --git a/usermode.spec b/usermode.spec
index 0fa6b55..fd61fa4 100644
--- a/usermode.spec
+++ b/usermode.spec
@@ -1,8 +1,8 @@
 %define build6x 0
 Summary: Tools for certain user account management tasks.
 Name: usermode
-Version: 1.63
-Release: 1
+Version: 1.67
+Release: 2
 License: GPL
 Group: Applications/System
 Source: usermode-%{version}.tar.gz
@@ -59,10 +59,9 @@ for wrappedapp in halt reboot poweroff ; do
 	cp shutdown.pamd $RPM_BUILD_ROOT/etc/pam.d/${wrappedapp}
 %endif
 done
+
 %if ! %{build6x}
-install -m644 pam_timestamp_init.console $RPM_BUILD_ROOT/etc/security/console.apps/pam_timestamp_init
-install -m644 pam_timestamp_init.pamd    $RPM_BUILD_ROOT/etc/pam.d/pam_timestamp_init
-ln -sf consolehelper $RPM_BUILD_ROOT/%{_bindir}/pam_timestamp_init
+rm -f $RPM_BUILD_ROOT/%{_bindir}/shutdown
 %endif
 
 %find_lang %{name}
@@ -104,9 +103,34 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/pixmaps/*
 %{_datadir}/applications/*
 
-# If you're updating translations, do me a favor and bump the RELEASE number,
-# and not the VERSION number.  Version numbers indicate CODE changes.
 %changelog
+* Mon Feb 24 2003 Elliot Lee <sopwith@redhat.com>
+- rebuilt
+
+* Thu Feb 20 2003 Nalin Dahyabhai <nalin@redhat.com> 1.67-1
+- work around GTK+ clearing DESKTOP_STARTUP_ID at gtk_init() time, so that
+  startup notification actually works (#84684)
+
+* Wed Feb 19 2003 Nalin Dahyabhai <nalin@redhat.com> 1.66-1
+- consolehelper-gtk: complete startup notification at startup
+- userhelper: pass startup notification data to consolehelper-gtk
+- consolehelper-gtk: setup startup notification for children if userhelper
+  requests it
+
+* Mon Jan 27 2003 Nalin Dahyabhai <nalin@redhat.com> 1.65-2
+- rebuild
+
+* Mon Jan 20 2003 Nalin Dahyabhai <nalin@redhat.com> 1.65-1
+- pass-through DESKTOP_STARTUP_ID
+
+* Mon Jan  6 2003 Nalin Dahyabhai <nalin@redhat.com> 1.64-1
+- set the requesting user PAM item to the invoking user's name (#81255)
+
+* Mon Nov 11 2002 Nalin Dahyabhai <nalin@redhat.com> 1.63-2
+- remove directory names from PAM config files, allowing the same config
+  files to work for both arches on multilib boxes
+- translation updates
+
 * Wed Sep  4 2002 Nalin Dahyabhai <nalin@redhat.com> 1.63-1
 - userhelper: swallow the exec'd program's exit stauts, which would be
   misinterpreted by consolehelper anyway