- Show the user we're authenticating as in an i18n-safe way. Resolves:

#233210
- Remove BuildRequires: libattr-devel

.cvsignore

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

.gitignore

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

Makefile

@@ -0,0 +1,6 @@
+# Makefile for source rpm: usermode
+# $Id$
+NAME := usermode
+SPECFILE = $(firstword $(wildcard *.spec))
+
+include ../common/Makefile.common

sources

@@ -1 +1 @@
-82a157127cc827c0ad4d33fc52a92cb0  usermode-1.93.tar.bz2
+84abb408057912b710bf51aea5bc59ce  usermode-1.91.2.tar.bz2

usermode.spec

@@ -4,9 +4,9 @@
 
 Summary: Tools for certain user account management tasks
 Name: usermode
-Version: 1.93
-Release: 1%{?dist}
-License: GPLv2+
+Version: 1.91.2
+Release: 1
+License: GPL
 Group: Applications/System
 Source: usermode-%{version}.tar.bz2
 Requires: util-linux, pam >= 0.75-37, /etc/pam.d/system-auth, passwd
@@ -67,15 +67,20 @@ for wrappedapp in halt reboot poweroff ; do
 done
 
 for i in redhat-userinfo.desktop redhat-userpasswd.desktop; do
-  echo 'NoDisplay=true' >>$RPM_BUILD_ROOT%{_datadir}/applications/$i
-done
-
-for i in redhat-userinfo.desktop redhat-userpasswd.desktop \
-	redhat-usermount.desktop; do
-	desktop-file-install --vendor redhat --delete-original \
-		--dir $RPM_BUILD_ROOT%{_datadir}/applications \
-		$RPM_BUILD_ROOT%{_datadir}/applications/$i
+  cat >>$RPM_BUILD_ROOT%{_datadir}/applications/$i <<EOF
+NoDisplay=true
+EOF
+  desktop-file-install --vendor redhat --delete-original    \
+    --dir $RPM_BUILD_ROOT%{_datadir}/applications           \
+    --remove-category Application			    \
+    --add-category X-GNOME-PersonalSettings		    \
+    $RPM_BUILD_ROOT%{_datadir}/applications/$i
 done
+  
+desktop-file-install --vendor redhat --delete-original       \
+  --dir $RPM_BUILD_ROOT%{_datadir}/applications              \
+  --remove-category Application				     \
+  $RPM_BUILD_ROOT%{_datadir}/applications/redhat-usermount.desktop
 
 %find_lang %{name}
 
@@ -116,16 +121,6 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/applications/*
 
 %changelog
-* Wed Sep  5 2007 Miloslav Trmač <mitr@redhat.com> - 1.93-1
-- Fix handling of PAM conversations with no questions
-  Resolves: #267361
-- Update License:
-
-* Mon Jun 11 2007 Miloslav Trmač <mitr@redhat.com> - 1.92-1
-- Fix userhelper hangs in non-UTF8 locales
-  Resolves: #242420
-- Clean up menu categories in desktop files
-
 * Sat Jun  9 2007 Miloslav Trmač <mitr@redhat.com> - 1.91.2-1
 - Show the user we're authenticating as in an i18n-safe way.
   Resolves: #233210