rpms/icecream/devel icecream.spec,1.30,1.31

[Michal Schmidt]

Author: michich

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

Modified Files:
	icecream.spec 
Log Message:
* Thu Jul 08 2010 Michal Schmidt <mschmidt at redhat.com> 0.9.5-6
- Moved away from fedora-usermgmt in favor of plain shadow-utils.



Index: icecream.spec
===================================================================
RCS file: /cvs/pkgs/rpms/icecream/devel/icecream.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- icecream.spec	12 Jun 2010 22:11:30 -0000	1.30
+++ icecream.spec	8 Jul 2010 15:07:12 -0000	1.31
@@ -1,8 +1,6 @@
 %if 0%{?fedora}
-%bcond_without	fedora
 %bcond_without	selinux
 %else
-%bcond_with	fedora
 # I'd need to modify the policy a bit to make it work on RHEL,
 # so default to off when not building for Fedora.
 %bcond_with	selinux
@@ -11,7 +9,7 @@
 
 Name:		icecream
 Version:	0.9.5
-Release:	5%{?dist}
+Release:	6%{?dist}
 Summary:	Distributed compiler
 
 Group:		Development/Tools
@@ -37,11 +35,7 @@ BuildRoot:	%{_tmppath}/%{name}-%{version
 
 BuildRequires:	symlinks
 
-BuildRequires:	fedora-usermgmt-devel
-%{?FE_USERADD_REQ}
-Provides:	group(icecream)	= 44
-Provides:	user(icecream)	= 44
-
+Requires(pre):		shadow-utils
 Requires(post):		chkconfig
 Requires(preun):	chkconfig initscripts
 Requires(postun):	initscripts
@@ -178,10 +172,11 @@ for selinuxvariant in %{selinux_variants
 done
 %endif
 
-# https://fedoraproject.org/wiki/PackageUserRegistry
-%__fe_groupadd 44 -r icecream &>/dev/null || :
-%__fe_useradd  44 -r -s /sbin/nologin -d %{_localstatedir}/cache/icecream -M \
-	-c 'Icecream distributed compiler' -g icecream icecream &>/dev/null ||:
+getent group icecream >/dev/null || groupadd -r icecream
+getent passwd icecream >/dev/null || \
+	useradd -r -g icecream -d %{_localstatedir}/cache/icecream \
+	-s /sbin/nologin -c "Icecream distributed compiler" icecream
+exit 0
 
 %post
 /sbin/ldconfig
@@ -277,6 +272,9 @@ rm -rf %{buildroot}
 %{_libdir}/pkgconfig/icecc.pc
 
 %changelog
+* Thu Jul 08 2010 Michal Schmidt <mschmidt at redhat.com> 0.9.5-6
+- Moved away from fedora-usermgmt in favor of plain shadow-utils.
+
 * Sun Jun 13 2010 Michal Schmidt <mschmidt at redhat.com> 0.9.5-5
 - Mark UDP port 8765 as icecc_scheduler_port_t.