- Fix userhelper hangs in non-UTF8 locales Resolves: #242420

- Clean up menu categories in desktop files

.cvsignore

@@ -1,2 +1 @@
-usermode-1.84.tar.bz2
-usermode-1.85.tar.bz2
+usermode-1.92.tar.bz2

sources

@@ -1 +1 @@
-63570836f5e3bcb9c7f746048887a589  usermode-1.85.tar.bz2
+6b962175592a2b4668b7251fa18d97f4  usermode-1.92.tar.bz2

usermode.spec

@@ -2,30 +2,25 @@
 %define WITH_SELINUX 1
 %endif
 
-%define build6x 0
-Summary: Tools for certain user account management tasks.
+Summary: Tools for certain user account management tasks
 Name: usermode
-Version: 1.85
-Release: 2.2
+Version: 1.92
+Release: 1
 License: GPL
 Group: Applications/System
 Source: usermode-%{version}.tar.bz2
-%if %{build6x}
-Requires: util-linux, pam >= 0.66-5
-%else
 Requires: util-linux, pam >= 0.75-37, /etc/pam.d/system-auth, passwd
-%endif
 Conflicts: SysVinit < 2.74-14
-BuildPrereq: desktop-file-utils, glib2-devel, gtk2-devel
-BuildPrereq: libglade2-devel, libuser-devel, pam-devel, util-linux
-BuildPrereq: perl-XML-Parser, libattr-devel, libSM-devel, gettext
+BuildRequires: desktop-file-utils, e2fsprogs-devel, glib2-devel, gtk2-devel
+BuildRequires: libglade2-devel, libuser-devel, pam-devel, util-linux
+BuildRequires: perl-XML-Parser, libSM-devel, gettext
 %if %{WITH_SELINUX}
-BuildPrereq: libselinux-devel >= 1.17.13-2
+BuildRequires: libselinux-devel >= 1.17.13-2
 %endif
 BuildRoot: %{_tmppath}/%{name}-root
 
 %package gtk
-Summary: Graphical tools for certain user account management tasks.
+Summary: Graphical tools for certain user account management tasks
 Group: Applications/System
 Requires: %{name} = %{version}-%{release}
 
@@ -48,10 +43,9 @@ graphical tools for certain account management tasks.
 %setup -q
 
 %build
-export CFLAGS="$RPM_OPT_FLAGS"
 %configure \
 %if %{WITH_SELINUX}
-	--with-selinux 
+	--with-selinux
 %endif
 
 make
@@ -69,15 +63,19 @@ 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}
-%if %{build6x}
-	cp shutdown.pamd.6x $RPM_BUILD_ROOT/etc/pam.d/${wrappedapp}
-%else
 	cp shutdown.pamd $RPM_BUILD_ROOT/etc/pam.d/${wrappedapp}
-%endif
 done
-%if ! %{build6x}
-rm -f $RPM_BUILD_ROOT/%{_bindir}/shutdown
-%endif
+
+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}
 
@@ -94,9 +92,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/halt
 %{_bindir}/reboot
 %{_bindir}/poweroff
-%if %{build6x}
-%{_bindir}/shutdown
-%endif
+%exclude %{_bindir}/shutdown
 %config(noreplace) /etc/pam.d/halt
 %config(noreplace) /etc/pam.d/reboot
 %config(noreplace) /etc/pam.d/poweroff
@@ -120,6 +116,74 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/applications/*
 
 %changelog
+* 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
+  Related: #213402
+
+* Wed Mar 14 2007 Miloslav Trmac <mitr@redhat.com> - 1.90-1
+- Fix GUI=no handling
+  Resolves: #110701
+- Add a dialog caption when changing user password
+  Resolves: #154861
+- Fix an use of PAM data after free
+  Resolves: #176992
+- Support "user", "users", LABEL= and UUID= in usermount and userformat
+  Resolves: #189907
+- Use less memory in pam-panel-icon until the icon is actually displayed
+- Don't use deprecated GTK+ widgets
+
+* Fri Mar  9 2007 Miloslav Trmac <mitr@redhat.com> - 1.89-1
+- Preserve application exit code in consolehelper
+  Resolves: #178991, #210893
+- Drop the historical build6x spec file variable
+- Fix some rpmlint warnings
+
+* Mon Dec 11 2006 Martin Bacovsky <mbacovsk@redhat.com> - 1.88-3.el5
+- Updated translations
+- Resolves: #216622
+
+* Fri Dec  1 2006 Martin Bacovsky <mbacovsk@redhat.com> - 1.88-2.el5
+- Updated translations
+- Resolves: #216622
+
+* Thu Nov 30 2006 Martin Bacovsky <mbacovsk@redhat.com> - 1.88-1.el5
+- Updated translations
+- Resolves: #216622
+
+* Tue Oct  3 2006 Martin Bacovsky <mbacovsky@redhat.com> 1.87-3
+- Repackaging with new translations
+
+* Sun Oct 01 2006 Jesse Keating <jkeating@redhat.com> - 1.87-2
+- rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
+* Wed Sep 20 2006 Martin Bacovsky <mbacovsky@redhat.com> 1.87-1
+- pam-panel-icon is now transparent on GTK+ >2.10 (#207181),
+  thanks to Bill Nottingham
+
+* Wed Aug 30 2006 Martin Bacovsky <mbacovsky@redhat.com> 1.86-1
+- fix userpasswd - Query window pops up three times if cancelling passwd (#202924)
+- Serbian latin script translation added (#203003)
+
+* Wed Jul 12 2006 Jesse Keating <jkeating@redhat.com> - 1.85-2.2.1
+- rebuild
+
 * Fri Feb 10 2006 Jesse Keating <jkeating@redhat.com> - 1.85-2.2
 - bump again for double-long bug on ppc(64)
 
@@ -500,7 +564,7 @@ rm -rf $RPM_BUILD_ROOT
 - only try to call gtk_main_quit() if we've got a loop to get out of (#54109)
 - obey RPM_OPT_FLAGS, obey
 
-* Tue Aug 28 2001 Trond Eivind Glomsrød <teg@redhat.com> 1.43-1
+* Tue Aug 28 2001 Trond Eivind Glomsrød <teg@redhat.com> 1.43-1
 - Update translations
 
 * Mon Aug  6 2001 Nalin Dahyabhai <nalin@redhat.com>