- Update to usermode-1.102

- 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.98.1.tar.bz2
+usermode-1.102.tar.bz2

branch

@@ -0,0 +1 @@
+F-12

sources

@@ -1 +1 @@
-82fe0d58b5af5f9ba043a6ae58a7ca91  usermode-1.98.1.tar.bz2
+0a8437ef146b8eabbd733959c5cac851  usermode-1.102.tar.bz2

usermode.spec

@@ -1,18 +1,17 @@
 Summary: Tools for certain user account management tasks
 Name: usermode
-Version: 1.98.1
-Release: 2
+Version: 1.102
+Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/System
 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
-BuildRequires: libselinux-devel >= 1.17.13-2
-BuildRoot: %{_tmppath}/%{name}-root
+Requires: pam, passwd, util-linux
+BuildRequires: desktop-file-utils, gettext, glib2-devel, gtk2-devel, intltool
+BuildRequires: libblkid-devel, libSM-devel, libselinux-devel, libuser-devel
+BuildRequires: pam-devel, perl-XML-Parser, startup-notification-devel
+BuildRequires: util-linux
+BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 %package gtk
 Summary: Graphical tools for certain user account management tasks
@@ -48,6 +47,7 @@ make install DESTDIR=$RPM_BUILD_ROOT INSTALL='install -p'
 
 # make userformat symlink to usermount
 ln -sf usermount $RPM_BUILD_ROOT%{_bindir}/userformat
+ln -s usermount.1 $RPM_BUILD_ROOT%{_mandir}/man1/userformat.1
 
 # We set up the shutdown programs to be wrapped in this package.  Other
 # packages are on their own....
@@ -89,26 +89,61 @@ 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 /etc/security/console.apps/reboot
-%config /etc/security/console.apps/poweroff
+%config(noreplace) /etc/security/console.apps/halt
+%config(noreplace) /etc/security/console.apps/reboot
+%config(noreplace) /etc/security/console.apps/poweroff
 
 %files gtk
 %defattr(-,root,root)
 %{_bindir}/usermount
-%{_bindir}/userformat
 %{_mandir}/man1/usermount.1*
+%{_bindir}/userformat
+%{_mandir}/man1/userformat.1*
 %{_bindir}/userinfo
 %{_mandir}/man1/userinfo.1*
 %{_bindir}/userpasswd
 %{_mandir}/man1/userpasswd.1*
 %{_bindir}/consolehelper-gtk
+%{_mandir}/man8/consolehelper-gtk.8*
 %{_bindir}/pam-panel-icon
+%{_mandir}/man1/pam-panel-icon.1*
 %{_datadir}/%{name}
 %{_datadir}/pixmaps/*
 %{_datadir}/applications/*
 
 %changelog
+* Mon Oct  5 2009 Miloslav Trmač <mitr@redhat.com> - 1.102-1
+- Update to usermode-1.102
+
+* Tue Sep 15 2009 Miloslav Trmač <mitr@redhat.com> - 1.101-1
+- Update to usermode-1.101
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.100-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Mon Jun 29 2009 Miloslav Trmač <mitr@redhat.com> - 1.100-3
+- Require libblkid-devel instead of e2fsprogs-devel
+
+* 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