From 042c0f3fb6b29232175c478d82d21025f6d78971 Mon Sep 17 00:00:00 2001
From: Miloslav Trmac <mitr@fedoraproject.org>
Date: Sun, 3 Aug 2008 06:52:45 +0000
Subject: [PATCH] - Support dialogs with no text entries - Preserve timestamps
 of some installed files Resolves: #456749 - Remove /usr/X11R6/bin from the
 default path. Resolves: #446849 - Left-justify messages - Preserve file
 timestamps where possible.

---
 .cvsignore    |  2 +-
 sources       |  2 +-
 usermode.spec | 20 +++++++++++++++-----
 3 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index 340063e..a9dd100 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-usermode-1.97.tar.bz2
+usermode-1.98.tar.bz2
diff --git a/sources b/sources
index 9a3f2a6..2abb9bb 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-55b587b75b9ad6d65145222667e986a6  usermode-1.97.tar.bz2
+b1c03b4ecc3eb1287139318f1f71800e  usermode-1.98.tar.bz2
diff --git a/usermode.spec b/usermode.spec
index 42f5117..5c37704 100644
--- a/usermode.spec
+++ b/usermode.spec
@@ -1,7 +1,7 @@
 Summary: Tools for certain user account management tasks
 Name: usermode
-Version: 1.97
-Release: 1
+Version: 1.98
+Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/System
 URL: https://fedorahosted.org/usermode/
@@ -44,7 +44,7 @@ make
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT INSTALL='install -p'
 
 # make userformat symlink to usermount
 ln -sf usermount $RPM_BUILD_ROOT%{_bindir}/userformat
@@ -54,8 +54,9 @@ ln -sf usermount $RPM_BUILD_ROOT%{_bindir}/userformat
 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 -m644 $wrappedapp $RPM_BUILD_ROOT/etc/security/console.apps/${wrappedapp}
-	cp shutdown.pamd $RPM_BUILD_ROOT/etc/pam.d/${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
 echo 'USER=root' > $RPM_BUILD_ROOT/etc/security/console.apps/config-util
 
@@ -111,6 +112,15 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/applications/*
 
 %changelog
+* Sun Aug  3 2008 Miloslav Trmač <mitr@redhat.com> - 1.98-1
+- Support dialogs with no text entries
+- Preserve timestamps of some installed files
+  Resolves: #456749
+- Remove /usr/X11R6/bin from the default path.
+  Resolves: #446849
+- Left-justify messages
+- Preserve file timestamps where possible.
+
 * Thu May  1 2008 Miloslav Trmač <mitr@redhat.com> - 1.97-1
 - Fix display of '_' in prompts
   Resolves: #444545