From 04a21e14f58ebe59175da8d856f17704b7173a72 Mon Sep 17 00:00:00 2001
From: Dan Walsh <dwalsh@redhat.com>
Date: Sun, 26 May 2013 07:01:45 -0400
Subject: [PATCH] Fix the name of the spec file generated in the build script

---
 policycoreutils-rhat.patch | 9 +++++----
 policycoreutils.spec       | 7 +++++--
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/policycoreutils-rhat.patch b/policycoreutils-rhat.patch
index 3f5008d..c174078 100644
--- a/policycoreutils-rhat.patch
+++ b/policycoreutils-rhat.patch
@@ -250741,7 +250741,7 @@ index a179d95..9b9a09a 100755
      tlist = []
      for l in map(lambda y: y[sepolicy.TARGET], filter(lambda x: set(perm).issubset(x[sepolicy.PERMS]), allows)):
 diff --git a/policycoreutils/sepolicy/sepolicy/generate.py b/policycoreutils/sepolicy/sepolicy/generate.py
-index 26f8390..837d3e3 100644
+index 26f8390..ce328e6 100644
 --- a/policycoreutils/sepolicy/sepolicy/generate.py
 +++ b/policycoreutils/sepolicy/sepolicy/generate.py
 @@ -63,20 +63,6 @@ except IOError:
@@ -250908,7 +250908,7 @@ index 26f8390..837d3e3 100644
  			newsh += re.sub("TEMPLATETYPE", self.name, t1)
  
                  newsh += self.generate_user_sh()
-+                newsh += re.sub("TEMPLATETYPE", self.name, script.rpm)
++                newsh += re.sub("TEMPLATEFILE", self.file_name, script.rpm)
  
  		return newsh
  
@@ -251462,7 +251462,7 @@ index 66efe26..a446d68 100755
      tlist = get_types(src, "%s_socket" % protocol, [perm])
      if len(tlist) > 0:
 diff --git a/policycoreutils/sepolicy/sepolicy/templates/script.py b/policycoreutils/sepolicy/sepolicy/templates/script.py
-index c139070..54fd40a 100644
+index c139070..c79738b 100644
 --- a/policycoreutils/sepolicy/sepolicy/templates/script.py
 +++ b/policycoreutils/sepolicy/sepolicy/templates/script.py
 @@ -66,14 +66,17 @@ set -x
@@ -251477,7 +251477,8 @@ index c139070..54fd40a 100644
  # Generate a rpm package for the newly generated policy
  
  pwd=$(pwd)
- rpmbuild --define "_sourcedir ${pwd}" --define "_specdir ${pwd}" --define "_builddir ${pwd}" --define "_srcrpmdir ${pwd}" --define "_rpmdir ${pwd}" --define "_buildrootdir ${pwd}/.build"  -ba TEMPLATETYPE_selinux.spec
+-rpmbuild --define "_sourcedir ${pwd}" --define "_specdir ${pwd}" --define "_builddir ${pwd}" --define "_srcrpmdir ${pwd}" --define "_rpmdir ${pwd}" --define "_buildrootdir ${pwd}/.build"  -ba TEMPLATETYPE_selinux.spec
++rpmbuild --define "_sourcedir ${pwd}" --define "_specdir ${pwd}" --define "_builddir ${pwd}" --define "_srcrpmdir ${pwd}" --define "_rpmdir ${pwd}" --define "_buildrootdir ${pwd}/.build"  -ba TEMPLATEFILE_selinux.spec
 +"""
  
 +manpage="""\
diff --git a/policycoreutils.spec b/policycoreutils.spec
index e83f675..21144e8 100644
--- a/policycoreutils.spec
+++ b/policycoreutils.spec
@@ -1,4 +1,4 @@
-%global	libauditver	2.1.3-4
+o%global	libauditver	2.1.3-4
 %global libsepolver	2.1.9-1
 %global	libsemanagever	2.1.10-1
 %global	libselinuxver	2.1.13-1
@@ -7,7 +7,7 @@
 Summary: SELinux policy core utilities
 Name:	 policycoreutils
 Version: 2.1.14
-Release: 45%{?dist}
+Release: 46%{?dist}
 License: GPLv2
 Group:	 System Environment/Base
 # Based on git repository with tag 20101221
@@ -309,6 +309,9 @@ The policycoreutils-restorecond package contains the restorecond service.
 %systemd_postun_with_restart restorecond.service
 
 %changelog
+* Sun May 26 2013 Dan Walsh <dwalsh@redhat.com> - 2.1.14-46
+- Fix the name of the spec file generated in the build script
+
 * Tue May 21 2013 Dan Walsh <dwalsh@redhat.com> - 2.1.14-45
 - Fix sandbox to always use sandbox_file_t, so generated policy will work.
 - Update Translations