[policycoreutils] Change polgen to generate dbus apps as optional so they can compile on minimal policy system, patch

[Daniel J Walsh]

commit 92907b214d4d77f2720435c03db7da575b6cd2e3
Author: rhatdan <dwalsh at redhat.com>
Date:   Wed Aug 8 09:25:33 2012 -0400

    Change polgen to generate dbus apps as optional so they can compile on minimal policy system, patch from Miroslav Grepl

 policycoreutils-rhat.patch |   11 ++++++++---
 policycoreutils.spec       |   11 +++++++----
 2 files changed, 15 insertions(+), 7 deletions(-)
---
diff --git a/policycoreutils-rhat.patch b/policycoreutils-rhat.patch
index cb849fb..b475e6f 100644
--- a/policycoreutils-rhat.patch
+++ b/policycoreutils-rhat.patch
@@ -11252,10 +11252,10 @@ index 0000000..dcf445e
 +"""
 diff --git a/policycoreutils/gui/templates/executable.py b/policycoreutils/gui/templates/executable.py
 new file mode 100644
-index 0000000..51444a5
+index 0000000..824fddd
 --- /dev/null
 +++ b/policycoreutils/gui/templates/executable.py
-@@ -0,0 +1,445 @@
+@@ -0,0 +1,450 @@
 +# Copyright (C) 2007-2012 Red Hat
 +# see file 'COPYING' for use and warranty information
 +#
@@ -11308,7 +11308,9 @@ index 0000000..51444a5
 +
 +type TEMPLATETYPE_t;
 +type TEMPLATETYPE_exec_t;
-+dbus_system_domain(TEMPLATETYPE_t, TEMPLATETYPE_exec_t)
++domain_type(TEMPLATETYPE_t)
++domain_entry_file(TEMPLATETYPE_t, TEMPLATETYPE_exec_t)
++role system_r types TEMPLATETYPE_t;
 +
 +permissive TEMPLATETYPE_t;
 +"""
@@ -11381,6 +11383,9 @@ index 0000000..51444a5
 +"""
 +
 +te_dbusd_rules="""
++optional_policy(`
++	dbus_system_domain(TEMPLATETYPE_t, TEMPLATETYPE_exec_t)
++')
 +"""
 +
 +te_userapp_rules="""
diff --git a/policycoreutils.spec b/policycoreutils.spec
index 3d3d16c..fe240c3 100644
--- a/policycoreutils.spec
+++ b/policycoreutils.spec
@@ -1,13 +1,13 @@
 %define	libauditver	2.1.3-4
-%define libsepolver 	2.1.5-3
-%define	libsemanagever	2.1.7-1
-%define	libselinuxver	2.1.10-1
+%define libsepolver 	2.1.7-4
+%define	libsemanagever	2.1.8-4
+%define	libselinuxver	2.1.11-4
 %define	sepolgenver	1.1.7
 
 Summary: SELinux policy core utilities
 Name:	 policycoreutils
 Version: 2.1.12
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: GPLv2
 Group:	 System Environment/Base
 # Based on git repository with tag 20101221
@@ -340,6 +340,9 @@ fi
 %{_bindir}/systemctl try-restart restorecond.service >/dev/null 2>&1 || :
 
 %changelog
+* Wed Aug 8 2012 Dan Walsh <dwalsh at redhat.com> - 2.1.11-6
+- Change polgen to generate dbus apps as optional so they can compile on minimal policy system, patch from Miroslav Grepl
+
 * Fri Jul 27 2012 Dan Walsh <dwalsh at redhat.com> - 2.1.11-5
 - Fix sepolgen/audit2allow to handle multiple role/types in avc messages properly