rpms/usermode/devel usermode.spec,1.83,1.84

[Miloslav Trmac]

Author: mitr

Update of /cvs/pkgs/rpms/usermode/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14736

Modified Files:
	usermode.spec 
Log Message:
* Wed Jan 14 2009 Miloslav Trmač <mitr at 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



Index: usermode.spec
===================================================================
RCS file: /cvs/pkgs/rpms/usermode/devel/usermode.spec,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -r1.83 -r1.84
--- usermode.spec	11 Nov 2008 11:57:13 -0000	1.83
+++ usermode.spec	14 Jan 2009 11:54:06 -0000	1.84
@@ -1,18 +1,17 @@
 Summary: Tools for certain user account management tasks
 Name: usermode
 Version: 1.99
-Release: 1
+Release: 2
 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
+Requires: pam, passwd, util-linux
 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
+BuildRequires: libselinux-devel
+BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 %package gtk
 Summary: Graphical tools for certain user account management tasks
@@ -89,9 +88,9 @@
 %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)
@@ -109,6 +108,13 @@
 %{_datadir}/applications/*
 
 %changelog
+* Wed Jan 14 2009 Miloslav Trmač <mitr at 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 at redhat.com> - 1.99-1
 - Update to usermode-1.99
   Resolves: #470834