[icecream/el5/master: 18/18] Merge branch 'f13' into el5

[Michal Schmidt]

commit a6617ad6ddedfe8abb61300b80b239f59a345573
Merge: 7c2ba16 0c0d6f5
Author: Michal Schmidt <mschmidt at redhat.com>
Date:   Tue Aug 3 16:31:17 2010 +0200

    Merge branch 'f13' into el5
    
    Rebase to 0.9.6. Merging from f13 rather than master, to keep
    using fedora-usermgmt.
    The SELinux changes were not tested on el5, but the package
    never built the policy package in el5 anyway.
    
    Conflicts:
    	icecream.spec
    	icecream.te
    	sources

 .gitignore                      |    2 +-
 icecream-rename-scheduler.patch |   43 +++++++------
 icecream.fc                     |    1 +
 icecream.spec                   |  126 ++++++++++++++++++++++++++++++++-------
 icecream.te                     |   14 ++++-
 initscript-scheduler            |   13 ++--
 sources                         |    2 +-
 7 files changed, 148 insertions(+), 53 deletions(-)
---
diff --cc icecream.spec
index dc673d9,ab1e726..f31de1a
--- a/icecream.spec
+++ b/icecream.spec
@@@ -44,16 -57,7 +57,6 @@@ Requires:	selinux-policy >= %{selinux_p
  %define selinux_variants mls strict targeted 
  %endif
  
- BuildRequires:	fedora-usermgmt-devel
- %{?FE_USERADD_REQ}
- Requires(post):		chkconfig policycoreutils
- Requires(preun):	chkconfig initscripts policycoreutils 
- Requires(postun):	initscripts policycoreutils
--
- Provides:	group(icecream)	= 44
- Provides:	user(icecream)	= 44
- 
- 
  # description copied from Debian icecc package
  %description
  Icecream is a distributed compile system. It allows parallel compiling by
diff --cc icecream.te
index b16b880,137eaa8..a0470d3
--- a/icecream.te
+++ b/icecream.te
@@@ -1,5 -1,5 +1,4 @@@
--
- policy_module(icecream,0.1.3)
+ policy_module(icecream,0.1.5)
  
  ########################################
  #