- Update to usermode-1.99 Resolves: #470834

- Only hide userinfo and userpasswd in GNOME and KDE

.cvsignore

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

sources

@@ -1 +1 @@
-f4abcfccf2af706fa47f56eec42e2f90  usermode-1.93.1.tar.bz2
+c02557e127ebf469e481e61b2be5fc7d  usermode-1.99.tar.bz2

usermode.spec

@@ -1,22 +1,17 @@
-%if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1}
-%define WITH_SELINUX 1
-%endif
-
 Summary: Tools for certain user account management tasks
 Name: usermode
-Version: 1.93.1
-Release: 1%{?dist}
+Version: 1.99
+Release: 1
 License: GPLv2+
 Group: Applications/System
-Source: usermode-%{version}.tar.bz2
+URL: https://fedorahosted.org/usermode/
+Source: https://fedorahosted.org/releases/u/s/usermode/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, startup-notification-devel, gettext
-%if %{WITH_SELINUX}
 BuildRequires: libselinux-devel >= 1.17.13-2
-%endif
 BuildRoot: %{_tmppath}/%{name}-root
 
 %package gtk
@@ -43,16 +38,13 @@ graphical tools for certain account management tasks.
 %setup -q
 
 %build
-%configure \
-%if %{WITH_SELINUX}
-	--with-selinux
-%endif
+%configure --with-selinux
 
 make
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT INSTALL='install -p'
 
 # make userformat symlink to usermount
 ln -sf usermount $RPM_BUILD_ROOT%{_bindir}/userformat
@@ -62,16 +54,15 @@ 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 -m644 $wrappedapp $RPM_BUILD_ROOT/etc/security/console.apps/${wrappedapp}
-	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
+	install -p -m644 $wrappedapp \
+		$RPM_BUILD_ROOT/etc/security/console.apps/${wrappedapp}
+	install -p -m644 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 \
 	redhat-usermount.desktop; do
+	echo 'NotShowIn=GNOME;KDE;' >>$RPM_BUILD_ROOT%{_datadir}/applications/$i
 	desktop-file-install --vendor redhat --delete-original \
 		--dir $RPM_BUILD_ROOT%{_datadir}/applications \
 		$RPM_BUILD_ROOT%{_datadir}/applications/$i
@@ -84,6 +75,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*
@@ -96,6 +88,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
@@ -116,6 +109,57 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/applications/*
 
 %changelog
+* Tue Nov 11 2008 Miloslav Trmač <mitr@redhat.com> - 1.99-1
+- Update to usermode-1.99
+  Resolves: #470834
+
+* Thu Nov  6 2008 Miloslav Trmač <mitr@redhat.com> - 1.98.1-2
+- Hide usermount from GNOME and KDE menus
+  Resolves: #440029
+- Only hide userinfo and userpasswd in GNOME and KDE
+
+* Tue Oct 28 2008 Miloslav Trmač <mitr@redhat.com> - 1.98.1-1
+- Update to usermode-1.98.1-1
+
+* 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
+
+* 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