[policycoreutils/f18] Update sepolicy generate with patch to create spec file and man page.

Tue Oct 16 16:04:30 UTC 2012

commit df95ac613dcf24dfa812e3685fad318eafa9f8fa
Author: rhatdan <dwalsh at redhat.com>
Date:   Tue Oct 16 12:03:55 2012 -0400

    Update sepolicy generate with patch to create spec file and man page.
    
    - Patch initiated by Miroslav Grepl

 policycoreutils-rhat.patch        |   73 +------------------------------------
 policycoreutils.spec              |    2 +
 policycoreutils_po_makefile.patch |   73 +++++++++++++++++++++++++++++++++++++
 3 files changed, 76 insertions(+), 72 deletions(-)
---

diff --git a/policycoreutils-rhat.patch b/policycoreutils-rhat.patch
index 47168d5..efda24a 100644
--- a/policycoreutils-rhat.patch
+++ b/policycoreutils-rhat.patch
@@ -9745,78 +9745,7 @@ index 5da2e0d..7c5bab0 100644
  	-rm -f $(TARGETS) *.o 
 diff --git a/policycoreutils/po/Makefile b/policycoreutils/po/Makefile
 index 28761be..9c1486e 100644
---- a/policycoreutils/po/Makefile
-+++ b/policycoreutils/po/Makefile
-@@ -53,32 +53,44 @@ POTFILES = \
- 	../gui/modulesPage.py \
- 	../gui/polgen.glade \
- 	../gui/polgengui.py \
--	../gui/polgen.py \
- 	../gui/portsPage.py \
- 	../gui/semanagePage.py \
- 	../gui/statusPage.py \
- 	../gui/system-config-selinux.glade \
- 	../gui/system-config-selinux.py \
- 	../gui/usersPage.py \
--	../gui/templates/executable.py \
--	../gui/templates/__init__.py \
--	../gui/templates/network.py \
--	../gui/templates/rw.py \
--	../gui/templates/script.py \
--	../gui/templates/semodule.py \
--	../gui/templates/tmp.py \
--	../gui/templates/user.py \
--	../gui/templates/var_lib.py \
--	../gui/templates/var_log.py \
--	../gui/templates/var_run.py \
--	../gui/templates/var_spool.py \
--	../secon/secon.c
-+	../secon/secon.c \
-+	../sepolicy/info.c \
-+	../sepolicy/search.c \
-+	../sepolicy/sepolicy.py \
-+	../sepolicy/sepolicy/communicate.py \
-+	../sepolicy/sepolicy/__init__.py \
-+	../sepolicy/sepolicy/network.py \
-+	../sepolicy/sepolicy/generate.py \
-+	../sepolicy/sepolicy/manpage.py \
-+	../sepolicy/sepolicy/transition.py \
-+	../sepolicy/sepolicy/templates/executable.py \
-+	../sepolicy/sepolicy/templates/__init__.py \
-+	../sepolicy/sepolicy/templates/network.py \
-+	../sepolicy/sepolicy/templates/rw.py \
-+	../sepolicy/sepolicy/templates/script.py \
-+	../sepolicy/sepolicy/templates/semodule.py \
-+	../sepolicy/sepolicy/templates/tmp.py \
-+	../sepolicy/sepolicy/templates/user.py \
-+	../sepolicy/sepolicy/templates/var_lib.py \
-+	../sepolicy/sepolicy/templates/var_log.py \
-+	../sepolicy/sepolicy/templates/var_run.py \
-+	../sepolicy/sepolicy/templates/var_spool.py \
-+	booleans.py
- 
- #default:: clean
- 
--all::  update-po $(MOFILES)
-+all::  $(MOFILES)
- 
--$(POTFILE): $(POTFILES) 
-+booleans.py:
-+	sepolicy booleans -a > booleans.py
-+
-+$(POTFILE): $(POTFILES) booleans.py
- 	$(XGETTEXT) --keyword=_ --keyword=N_ $(POTFILES)
- 	@if cmp -s $(NLSPACKAGE).po $(POTFILE); then \
- 	    rm -f $(NLSPACKAGE).po; \
-@@ -87,6 +99,7 @@ $(POTFILE): $(POTFILES)
- 	fi; \
- 
- update-po: Makefile $(POTFILE) refresh-po
-+	@rm -f booleans.py
- 
- refresh-po: Makefile
- 	for cat in $(POFILES); do \
-diff --git a/policycoreutils/po/POTFILES.in b/policycoreutils/po/POTFILES.in
+--- a/policycoreutils/po/Makefilediff --git a/policycoreutils/po/POTFILES.in b/policycoreutils/po/POTFILES.in
 index aab1a4e..75117f4 100644
 --- a/policycoreutils/po/POTFILES.in
 +++ b/policycoreutils/po/POTFILES.in
diff --git a/policycoreutils.spec b/policycoreutils.spec
index 9044b2a..20c386d 100644
--- a/policycoreutils.spec
+++ b/policycoreutils.spec
@@ -22,6 +22,7 @@ Source6: selinux-polgengui.desktop
 Source8: policycoreutils_man_ru2.tar.bz2
 Source10: restorecond.service
 Patch:	 policycoreutils-rhat.patch
+Patch1:	 policycoreutils_po_makefile.patch
 #Patch4:	 policycoreutils-sepolgen.patch
 Obsoletes: policycoreutils < 2.0.61-2
 Conflicts: filesystem < 3
@@ -63,6 +64,7 @@ context.
 %prep
 %setup -q -a 1 
 %patch -p2 -b .rhat
+%patch1 -p1 -b .po
 #%patch4 -p2 -b .sepolgen -d sepolgen-%{sepolgenver}
 
 %build
diff --git a/policycoreutils_po_makefile.patch b/policycoreutils_po_makefile.patch
new file mode 100644
index 0000000..d43ad35
--- /dev/null
+++ b/policycoreutils_po_makefile.patch
@@ -0,0 +1,73 @@
+diff -up policycoreutils-2.1.13/po/Makefile~ policycoreutils-2.1.13/po/Makefile
+--- policycoreutils-2.1.13/po/Makefile~	2012-10-16 11:59:08.989472832 -0400
++++ policycoreutils-2.1.13/po/Makefile	2012-10-16 11:59:18.868476822 -0400
+@@ -53,33 +53,44 @@ POTFILES = \
+ 	../gui/modulesPage.py \
+ 	../gui/polgen.glade \
+ 	../gui/polgengui.py \
+-	../gui/polgen.py \
+ 	../gui/portsPage.py \
+-	../gui/selinux.tbl \
+ 	../gui/semanagePage.py \
+ 	../gui/statusPage.py \
+ 	../gui/system-config-selinux.glade \
+ 	../gui/system-config-selinux.py \
+ 	../gui/usersPage.py \
+-	../gui/templates/executable.py \
+-	../gui/templates/__init__.py \
+-	../gui/templates/network.py \
+-	../gui/templates/rw.py \
+-	../gui/templates/script.py \
+-	../gui/templates/semodule.py \
+-	../gui/templates/tmp.py \
+-	../gui/templates/user.py \
+-	../gui/templates/var_lib.py \
+-	../gui/templates/var_log.py \
+-	../gui/templates/var_run.py \
+-	../gui/templates/var_spool.py \
+-	../secon/secon.c
++	../secon/secon.c \
++	../sepolicy/info.c \
++	../sepolicy/search.c \
++	../sepolicy/sepolicy.py \
++	../sepolicy/sepolicy/communicate.py \
++	../sepolicy/sepolicy/__init__.py \
++	../sepolicy/sepolicy/network.py \
++	../sepolicy/sepolicy/generate.py \
++	../sepolicy/sepolicy/manpage.py \
++	../sepolicy/sepolicy/transition.py \
++	../sepolicy/sepolicy/templates/executable.py \
++	../sepolicy/sepolicy/templates/__init__.py \
++	../sepolicy/sepolicy/templates/network.py \
++	../sepolicy/sepolicy/templates/rw.py \
++	../sepolicy/sepolicy/templates/script.py \
++	../sepolicy/sepolicy/templates/semodule.py \
++	../sepolicy/sepolicy/templates/tmp.py \
++	../sepolicy/sepolicy/templates/user.py \
++	../sepolicy/sepolicy/templates/var_lib.py \
++	../sepolicy/sepolicy/templates/var_log.py \
++	../sepolicy/sepolicy/templates/var_run.py \
++	../sepolicy/sepolicy/templates/var_spool.py \
++	booleans.py
+ 
+ #default:: clean
+ 
+-all::  update-po $(MOFILES)
++all::  $(MOFILES)
+ 
+-$(POTFILE): $(POTFILES) 
++booleans.py:
++	sepolicy booleans -a > booleans.py
++
++$(POTFILE): $(POTFILES) booleans.py
+ 	$(XGETTEXT) --keyword=_ --keyword=N_ $(POTFILES)
+ 	@if cmp -s $(NLSPACKAGE).po $(POTFILE); then \
+ 	    rm -f $(NLSPACKAGE).po; \
+@@ -88,6 +99,7 @@ $(POTFILE): $(POTFILES)
+ 	fi; \
+ 
+ update-po: Makefile $(POTFILE) refresh-po
++	@rm -f booleans.py
+ 
+ refresh-po: Makefile
+ 	for cat in $(POFILES); do \
