From 575176a72859a4fb95edc904279a6ed9fc7f0636 Mon Sep 17 00:00:00 2001
From: Helio Chissini de Castro <helio.castro@bmw-carit.de>
Date: Mar 16 2016 10:33:41 +0000
Subject: - Update to proper user


---

diff --git a/icecc-scheduler.service b/icecc-scheduler.service
index 702f80e..a2d12f8 100644
--- a/icecc-scheduler.service
+++ b/icecc-scheduler.service
@@ -3,8 +3,8 @@ Description=Icecream distributed compiler scheduler
 
 [Service]
 Type=simple
-User=icecream
-Group=icecream
+User=icecc
+Group=icecc
 SyslogIdentifier=icecc-scheduler
 ExecStart=/usr/libexec/icecc/icecc-scheduler-wrapper
 
diff --git a/iceccd.service b/iceccd.service
index bf5730b..ae37f32 100644
--- a/iceccd.service
+++ b/iceccd.service
@@ -8,7 +8,7 @@ Type=simple
 # value by reading /etc/passwd. The SELinux policy does not need to allow it.
 Environment=SHELL=/bin/bash
 SyslogIdentifier=iceccd
-ExecStart=/usr/libexec/icecc/iceccd-wrapper -u icecream -b /var/cache/icecream -v
+ExecStart=/usr/libexec/icecc/iceccd-wrapper -u icecc -b /var/cache/icecream -v
 Nice=5
 
 [Install]
diff --git a/icecream-tmpfiles.conf b/icecream-tmpfiles.conf
index 5367dac..7f7ef39 100644
--- a/icecream-tmpfiles.conf
+++ b/icecream-tmpfiles.conf
@@ -1 +1 @@
-d /run/icecc 0775 root icecream -
+d /run/icecc 0775 root icecc -
diff --git a/icecream.spec b/icecream.spec
index 3785bfd..668c35b 100644
--- a/icecream.spec
+++ b/icecream.spec
@@ -4,7 +4,7 @@
 
 Name:		icecream
 Version:	1.0.98
-Release:	3%{?dist}
+Release:	4%{?dist}
 Summary:	Distributed compiler
 
 Group:		Development/Tools
@@ -174,10 +174,10 @@ for selinuxvariant in %{selinux_variants}; do
 done
 %endif
 
-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
+getent group icecc >/dev/null || groupadd -r icecc
+getent passwd icecc >/dev/null || \
+	useradd -r -g icecc -d %{_localstatedir}/cache/icecream \
+	-s /sbin/nologin -c "Icecream distributed compiler" icecc
 exit 0
 
 %post
@@ -250,9 +250,9 @@ exit 0
 %{_sysconfdir}/modulefiles/icecream/
 %config(noreplace) %{_sysconfdir}/sysconfig/icecream
 %{_unitdir}/icecc*.service
-%attr(0775, root, icecream) %dir %{_var}/log/%{name}
-%attr(0775, root, icecream) %{_localstatedir}/cache/icecream
-%attr(0775, root, icecream) /run/icecc
+%attr(0775, root, icecc) %dir %{_var}/log/%{name}
+%attr(0775, root, icecc) %{_localstatedir}/cache/icecream
+%attr(0775, root, icecc) /run/icecc
 %{_mandir}/man*/*
 %{_tmpfilesdir}/icecream.conf
 %{?with_selinux:%{_datadir}/selinux/*/icecream.pp}
@@ -266,6 +266,9 @@ exit 0
 %{_libdir}/pkgconfig/icecc.pc
 
 %changelog
+* Wed Mar 16 2016 Helio Chissini de Castro <helio@kde.org> - 1.0.98-4
+- Default user is icecc, not icecream
+
 * Tue Mar 08 2016 Helio Chissini de Castro <helio@kde.org> - 1.0.98-3
 - Re-apply config cleanup patch
 - Remove libexec from configure since is already on macro