[policycoreutils/f17] Fix unit file handling in sepolgen

[Daniel J Walsh]

commit 0e3efcdc53bc47fc43ce49fe88fc04c822a9b867
Author: Dan Walsh <dwalsh at redhat.com>
Date:   Thu Mar 8 15:03:30 2012 -0500

    Fix unit file handling in sepolgen

 policycoreutils-gui.patch |   12 ++++++------
 policycoreutils.spec      |    5 ++++-
 2 files changed, 10 insertions(+), 7 deletions(-)
---
diff --git a/policycoreutils-gui.patch b/policycoreutils-gui.patch
index 089062d..ce83c3b 100644
--- a/policycoreutils-gui.patch
+++ b/policycoreutils-gui.patch
@@ -6657,7 +6657,7 @@ diff -up policycoreutils-2.1.10/gui/polgengui.py.gui policycoreutils-2.1.10/gui/
 +    app.stand_alone()
 diff -up policycoreutils-2.1.10/gui/polgen.py.gui policycoreutils-2.1.10/gui/polgen.py
 --- policycoreutils-2.1.10/gui/polgen.py.gui	2012-02-01 08:39:50.000000000 -0500
-+++ policycoreutils-2.1.10/gui/polgen.py	2012-02-01 08:39:50.000000000 -0500
++++ policycoreutils-2.1.10/gui/polgen.py	2012-03-08 10:19:33.433837435 -0500
 @@ -0,0 +1,1353 @@
 +#!/usr/bin/python -Es
 +#
@@ -6957,7 +6957,7 @@ diff -up policycoreutils-2.1.10/gui/polgen.py.gui policycoreutils-2.1.10/gui/pol
 +		self.DEFAULT_DIRS["/etc"] = ["etc_rw", [], etc_rw];
 +		self.DEFAULT_DIRS["/tmp"] = ["tmp", [], tmp];
 +		self.DEFAULT_DIRS["rw"] = ["rw", [], rw];
-+		self.DEFAULT_DIRS["/lib/systemd/system"] = ["unit_file", [], unit_file];
++		self.DEFAULT_DIRS["/usr/lib/systemd/system"] = ["unit_file", [], unit_file];
 +		self.DEFAULT_DIRS["/etc/systemd/system"] = ["unit_file", [], unit_file];
 +		self.DEFAULT_DIRS["/var/cache"] = ["var_cache", [], var_cache];
 +		self.DEFAULT_DIRS["/var/lib"] = ["var_lib", [], var_lib];
@@ -6965,7 +6965,7 @@ diff -up policycoreutils-2.1.10/gui/polgen.py.gui policycoreutils-2.1.10/gui/pol
 +		self.DEFAULT_DIRS["/var/run"] = ["var_run", [], var_run];
 +		self.DEFAULT_DIRS["/var/spool"] = ["var_spool", [], var_spool];
 +
-+                self.DEFAULT_KEYS=["/etc", "/var/cache", "/var/log", "/tmp", "rw", "/var/lib", "/var/run", "/var/spool", "/etc/systemd/system", "/lib/systemd/system" ]
++                self.DEFAULT_KEYS=["/etc", "/var/cache", "/var/log", "/tmp", "rw", "/var/lib", "/var/run", "/var/spool", "/etc/systemd/system", "/usr/lib/systemd/system" ]
 +
 +		self.DEFAULT_TYPES = (\
 +( self.generate_daemon_types, self.generate_daemon_rules), \
@@ -12271,7 +12271,7 @@ diff -up policycoreutils-2.1.10/gui/templates/etc_rw.py.gui policycoreutils-2.1.
 +"""
 diff -up policycoreutils-2.1.10/gui/templates/executable.py.gui policycoreutils-2.1.10/gui/templates/executable.py
 --- policycoreutils-2.1.10/gui/templates/executable.py.gui	2012-02-01 08:39:50.000000000 -0500
-+++ policycoreutils-2.1.10/gui/templates/executable.py	2012-02-15 10:39:16.032408393 -0500
++++ policycoreutils-2.1.10/gui/templates/executable.py	2012-02-15 13:50:39.736034774 -0500
 @@ -0,0 +1,445 @@
 +# Copyright (C) 2007-2012 Red Hat
 +# see file 'COPYING' for use and warranty information
@@ -13262,7 +13262,7 @@ diff -up policycoreutils-2.1.10/gui/templates/tmp.py.gui policycoreutils-2.1.10/
 +"""
 diff -up policycoreutils-2.1.10/gui/templates/unit_file.py.gui policycoreutils-2.1.10/gui/templates/unit_file.py
 --- policycoreutils-2.1.10/gui/templates/unit_file.py.gui	2012-02-01 08:40:34.000000000 -0500
-+++ policycoreutils-2.1.10/gui/templates/unit_file.py	2012-02-15 10:36:27.888046687 -0500
++++ policycoreutils-2.1.10/gui/templates/unit_file.py	2012-03-08 10:20:11.249956943 -0500
 @@ -0,0 +1,70 @@
 +# Copyright (C) 2012 Red Hat
 +# see file 'COPYING' for use and warranty information
@@ -13290,7 +13290,7 @@ diff -up policycoreutils-2.1.10/gui/templates/unit_file.py.gui policycoreutils-2
 +########################### Type Enforcement File #############################
 +te_types="""
 +type TEMPLATETYPE_unit_file_t;
-+files_type(TEMPLATETYPE_unit_file_t)
++systemd_unit_file(TEMPLATETYPE_unit_file_t)
 +"""
 +
 +te_rules=""
diff --git a/policycoreutils.spec b/policycoreutils.spec
index f79adb1..3fa28cf 100644
--- a/policycoreutils.spec
+++ b/policycoreutils.spec
@@ -7,7 +7,7 @@
 Summary: SELinux policy core utilities
 Name:	 policycoreutils
 Version: 2.1.10
-Release: 26%{?dist}
+Release: 27%{?dist}
 License: GPLv2
 Group:	 System Environment/Base
 # Based on git repository with tag 20101221
@@ -343,6 +343,9 @@ fi
 %{_bindir}/systemctl try-restart restorecond.service >/dev/null 2>&1 || :
 
 %changelog
+* Thu Mar 8 2012 Dan Walsh <dwalsh at redhat.com> - 2.1.10-27
+- Fix unit file handling in sepolgen
+
 * Wed Feb 29 2012 Dan Walsh <dwalsh at redhat.com> - 2.1.10-26
 - Add bash_command completion for setsebool/getsebool