- Add BuildRequires: intltool

- Drop Conflicts: SysVinit < very-old
- Remove very old version requirements from Requires and BuildRequires
- Make /etc/security/console.apps/* %%config(noreplace)
- Update BuildRoot

.cvsignore

@@ -1 +1 @@
-usermode-1.96.1.tar.bz2
+usermode-1.100.tar.bz2

sources

@@ -1 +1 @@
-eb937aceae9ae725dfb77f19df02d928  usermode-1.96.1.tar.bz2
+c7f1c6d353bed3d9c823e3620cab8d40  usermode-1.100.tar.bz2

usermode.spec

@@ -1,19 +1,17 @@
 Summary: Tools for certain user account management tasks
 Name: usermode
-Version: 1.96.1
+Version: 1.100
-Release: 1
+Release: 2
 License: GPLv2+
 Group: Applications/System
 URL: https://fedorahosted.org/usermode/
-# https://fedorahosted.org/usermode/attachment/wiki/UsermodeDownloads/usermode-%{version}.tar.bz2?format=raw
+Source: https://fedorahosted.org/releases/u/s/usermode/usermode-%{version}.tar.bz2
-Source: usermode-%{version}.tar.bz2
+Requires: pam, passwd, util-linux
-Requires: util-linux, pam >= 0.75-37, /etc/pam.d/system-auth, passwd
+BuildRequires: desktop-file-utils, e2fsprogs-devel, gettext, glib2-devel
-Conflicts: SysVinit < 2.74-14
+BuildRequires: gtk2-devel, intltool, libSM-devel, libglade2-devel
-BuildRequires: desktop-file-utils, e2fsprogs-devel, glib2-devel, gtk2-devel
+BuildRequires: libselinux-devel, libuser-devel, pam-devel, perl-XML-Parser
-BuildRequires: libglade2-devel, libuser-devel, pam-devel, util-linux
+BuildRequires: startup-notification-devel, util-linux
-BuildRequires: perl-XML-Parser, libSM-devel, startup-notification-devel, gettext
+BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
-BuildRequires: libselinux-devel >= 1.17.13-2
-BuildRoot: %{_tmppath}/%{name}-root
 
 %package gtk
 Summary: Graphical tools for certain user account management tasks
@@ -45,7 +43,7 @@ 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
@@ -55,17 +53,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}
+	install -p -m644 $wrappedapp \
-	cp shutdown.pamd $RPM_BUILD_ROOT/etc/pam.d/${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; do
-  echo 'NoDisplay=true' >>$RPM_BUILD_ROOT%{_datadir}/applications/$i
-done
-
 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
@@ -92,9 +88,9 @@ rm -rf $RPM_BUILD_ROOT
 %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(noreplace) /etc/security/console.apps/halt
-%config /etc/security/console.apps/reboot
+%config(noreplace) /etc/security/console.apps/reboot
-%config /etc/security/console.apps/poweroff
+%config(noreplace) /etc/security/console.apps/poweroff
 
 %files gtk
 %defattr(-,root,root)
@@ -112,6 +108,47 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/applications/*
 
 %changelog
+* Tue Apr 14 2009 Miloslav Trmač <mitr@redhat.com> - 1.100-2
+- Add BuildRequires: intltool
+
+* Tue Apr 14 2009 Miloslav Trmač <mitr@redhat.com> - 1.100-1
+- Update to usermode-1.100
+
+* Wed Feb 25 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.99-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Wed Jan 14 2009 Miloslav Trmač <mitr@redhat.com> - 1.99-2
+- Fix problems pointed out in merge review:
+  - Drop Conflicts: SysVinit < very-old
+  - Remove very old version requirements from Requires and BuildRequires
+  - Make /etc/security/console.apps/* %%config(noreplace)
+  - Update BuildRoot
+
+* 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