- New release with updated translations

userhelper. Related: #247967
- Delete the WITH_SELINUX variable.

.cvsignore

@@ -1 +1 @@
-usermode-1.91.2.tar.bz2
+usermode-1.96.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 @@
-84abb408057912b710bf51aea5bc59ce  usermode-1.91.2.tar.bz2
+eb937aceae9ae725dfb77f19df02d928  usermode-1.96.1.tar.bz2

usermode.spec

@@ -1,22 +1,18 @@
-%if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1}
-%define WITH_SELINUX 1
-%endif
-
 Summary: Tools for certain user account management tasks
 Name: usermode
-Version: 1.91.2
+Version: 1.96.1
 Release: 1
-License: GPL
+License: GPLv2+
 Group: Applications/System
+URL: https://fedorahosted.org/usermode/
+# https://fedorahosted.org/usermode/attachment/wiki/UsermodeDownloads/usermode-%{version}.tar.bz2?format=raw
 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, libSM-devel, gettext
-%if %{WITH_SELINUX}
+BuildRequires: perl-XML-Parser, libSM-devel, startup-notification-devel, gettext
 BuildRequires: libselinux-devel >= 1.17.13-2
-%endif
 BuildRoot: %{_tmppath}/%{name}-root
 
 %package gtk
@@ -43,10 +39,7 @@ graphical tools for certain account management tasks.
 %setup -q
 
 %build
-%configure \
-%if %{WITH_SELINUX}
-	--with-selinux
-%endif
+%configure --with-selinux
 
 make
 
@@ -65,22 +58,18 @@ for wrappedapp in halt reboot poweroff ; do
 	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
 
 for i in redhat-userinfo.desktop redhat-userpasswd.desktop; do
-  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
+  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
-  
-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}
 
@@ -89,6 +78,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -f %{name}.lang
 %defattr(-,root,root)
+%doc COPYING ChangeLog NEWS README
 %attr(4711,root,root) /usr/sbin/userhelper
 %{_bindir}/consolehelper
 %{_mandir}/man8/userhelper.8*
@@ -101,6 +91,7 @@ rm -rf $RPM_BUILD_ROOT
 %config(noreplace) /etc/pam.d/halt
 %config(noreplace) /etc/pam.d/reboot
 %config(noreplace) /etc/pam.d/poweroff
+%config(noreplace) /etc/security/console.apps/config-util
 %config /etc/security/console.apps/halt
 %config /etc/security/console.apps/reboot
 %config /etc/security/console.apps/poweroff
@@ -121,6 +112,48 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/applications/*
 
 %changelog
+* Thu Apr 10 2008 Miloslav Trmač <mitr@redhat.com> - 1.96.1-1
+- New release with updated translations
+
+* Fri Feb 29 2008 Miloslav Trmač <mitr@redhat.com> - 1.96-1
+- Remove code that overrides SELinux contexts of processes started by
+  userhelper.
+  Related: #247967
+- Delete the WITH_SELINUX variable.
+
+* Mon Feb 25 2008 Miloslav Trmač <mitr@redhat.com> - 1.95-1
+- New home page at https://fedorahosted.org/usermode/
+- Correctly preserve exit code when SESSION=yes
+- Fix minor errors in the .desktop files
+- Ship documentation
+
+* Tue Feb 19 2008 Fedora Release Engineering <rel-eng@fedoraproject.org> - 1.94-2
+- Autorebuild for GCC 4.3
+
+* Thu Jan 10 2008 Miloslav Trmač <mitr@redhat.com> - 1.94-1
+- Add support for including files from wrapper configuration files.  Original
+  patch by Carlo de Wolf.
+  Resolves: #426095
+- Add /etc/security/console.apps/config-util for use by system-config-*
+- Rename sr@Latn.po to sr@latin.po
+  Resolves: #425842
+
+* 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