- Fix display of '_' in prompts Resolves: #444545

.cvsignore

@@ -0,0 +1 @@
+usermode-1.97.tar.bz2

.gitignore

@@ -1 +0,0 @@
-usermode-1.98.tar.bz2

Makefile

@@ -0,0 +1,21 @@
+# Makefile for source rpm: usermode
+# $Id: Makefile,v 1.1 2004/09/09 13:52:40 cvsdist Exp $
+NAME := usermode
+SPECFILE = $(firstword $(wildcard *.spec))
+
+define find-makefile-common
+for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
+endef
+
+MAKEFILE_COMMON := $(shell $(find-makefile-common))
+
+ifeq ($(MAKEFILE_COMMON),)
+# attempt a checkout
+define checkout-makefile-common
+test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
+endef
+
+MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
+endif
+
+include $(MAKEFILE_COMMON)

sources

@@ -1 +1 @@
-b1c03b4ecc3eb1287139318f1f71800e  usermode-1.98.tar.bz2
+55b587b75b9ad6d65145222667e986a6  usermode-1.97.tar.bz2

usermode.spec

@@ -1,7 +1,7 @@
 Summary: Tools for certain user account management tasks
 Name: usermode
-Version: 1.98
-Release: 1%{?dist}
+Version: 1.97
+Release: 1
 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 INSTALL='install -p'
+make install DESTDIR=$RPM_BUILD_ROOT
 
 # make userformat symlink to usermount
 ln -sf usermount $RPM_BUILD_ROOT%{_bindir}/userformat
@@ -54,9 +54,8 @@ 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 -p -m644 $wrappedapp \
-		$RPM_BUILD_ROOT/etc/security/console.apps/${wrappedapp}
-	install -p -m644 shutdown.pamd $RPM_BUILD_ROOT/etc/pam.d/${wrappedapp}
+	install -m644 $wrappedapp $RPM_BUILD_ROOT/etc/security/console.apps/${wrappedapp}
+	cp shutdown.pamd $RPM_BUILD_ROOT/etc/pam.d/${wrappedapp}
 done
 echo 'USER=root' > $RPM_BUILD_ROOT/etc/security/console.apps/config-util
 
@@ -112,15 +111,6 @@ 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