rpms/MAKEDEV/devel MAKEDEV.spec,1.68,1.69

[Christopher Edward Lumens]

Author: clumens

Update of /cvs/pkgs/rpms/MAKEDEV/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv28841

Modified Files:
	MAKEDEV.spec 
Log Message:
* Thu Jul 01 2010 Chris Lumens <clumens at redhat.com> 3.24-6
- Change user/group creation for new shadow-utils behavior
  (#608580).



Index: MAKEDEV.spec
===================================================================
RCS file: /cvs/pkgs/rpms/MAKEDEV/devel/MAKEDEV.spec,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -p -r1.68 -r1.69
--- MAKEDEV.spec	1 Jun 2010 10:07:39 -0000	1.68
+++ MAKEDEV.spec	1 Jul 2010 14:26:36 -0000	1.69
@@ -1,6 +1,6 @@
 Name: MAKEDEV
 Version: 3.24
-Release: 5
+Release: 6%{?dist}
 Group: System Environment/Base
 License: GPLv2
 # This is a Red Hat maintained package which is specific to
@@ -41,11 +41,12 @@ install -m 644 -p %{SOURCE1} $RPM_BUILD_
 rm -fr $RPM_BUILD_ROOT
 
 %pre
-# Add the floppy group and the vcsa user.
-getent group floppy >/dev/null || groupadd -g 19 -r floppy
+# Add the floopy group and the vcsa user.
+getent group floppy >/dev/null || groupadd -g 19 -r -f floppy
+getent group vcsa >/dev/null || groupadd -g 69 -r -f vcsa
 getent passwd vcsa >/dev/null || \
-useradd -r -d /dev -s /sbin/nologin -u 69 \
-    -c "virtual console memory owner" vcsa
+	useradd -r -g vcsa -d /dev -s /sbin/nologin -u 69 \
+	-c "virtual console memory owner" vcsa 2>/dev/null
 exit 0
 
 %files
@@ -58,6 +59,10 @@ exit 0
 %{_mandir}/man5/makedev.d.5*
 
 %changelog
+* Thu Jul 01 2010 Chris Lumens <clumens at redhat.com> 3.24-6
+- Change user/group creation for new shadow-utils behavior
+  (#608580).
+
 * Tue Jun  1 2010 Hans de Goede <hdegoede at redhat.com> 3.24-5
 - Add a manpage documenting /etc/makedev.d files (#436207)