- New release with updated translations Resolves: #332441

- Build with startup notification Resolves: #294591

.cvsignore

@@ -1 +1 @@
-usermode-1.91.tar.bz2
+usermode-1.93.1.tar.bz2

Makefile

@@ -1,6 +1,21 @@
 # Makefile for source rpm: usermode
-# $Id$
+# $Id: Makefile,v 1.1 2004/09/09 13:52:40 cvsdist Exp $
 NAME := usermode
 SPECFILE = $(firstword $(wildcard *.spec))
 
-include ../common/Makefile.common
+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 @@
-3de0199d1393e57ca91e1b965c19908e  usermode-1.91.tar.bz2
+f4abcfccf2af706fa47f56eec42e2f90  usermode-1.93.1.tar.bz2

usermode.spec

@@ -4,16 +4,16 @@
 
 Summary: Tools for certain user account management tasks
 Name: usermode
-Version: 1.91
-Release: 1
-License: GPL
+Version: 1.93.1
+Release: 1%{?dist}
+License: GPLv2+
 Group: Applications/System
 Source: usermode-%{version}.tar.bz2
 Requires: util-linux, pam >= 0.75-37, /etc/pam.d/system-auth, passwd
 Conflicts: SysVinit < 2.74-14
 BuildRequires: desktop-file-utils, e2fsprogs-devel, glib2-devel, gtk2-devel
 BuildRequires: libglade2-devel, libuser-devel, pam-devel, util-linux
-BuildRequires: perl-XML-Parser, libattr-devel, libSM-devel, gettext
+BuildRequires: perl-XML-Parser, libSM-devel, startup-notification-devel, gettext
 %if %{WITH_SELINUX}
 BuildRequires: libselinux-devel >= 1.17.13-2
 %endif
@@ -66,6 +66,17 @@ for wrappedapp in halt reboot poweroff ; do
 	cp shutdown.pamd $RPM_BUILD_ROOT/etc/pam.d/${wrappedapp}
 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
+done
+
 %find_lang %{name}
 
 %clean
@@ -105,6 +116,33 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/applications/*
 
 %changelog
+* Tue Oct 16 2007 Miloslav Trmač <mitr@redhat.com> - 1.93.1-1
+- New release with updated translations
+  Resolves: #332441
+- Build with startup notification
+  Resolves: #294591
+
+* 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
+- Remove BuildRequires: libattr-devel
+
+* Thu Apr 19 2007 Miloslav Trmac <mitr@redhat.com> - 1.91.1-1
+- New release with updated translations
+
+* Tue Mar 27 2007 Matthias Clasen <mclasen@redhat.com> 1.91-2
+- Clean up desktop files
+
 * Mon Mar 19 2007 Miloslav Trmac <mitr@redhat.com> - 1.91-1
 - Preserve environment variables in consolehelper if specified in the service
   config file