Add Miroslav Grepl patch to generate html man pages

- Update Translations
- Add option to sandbox to shred files before deleting

policycoreutils-sepolgen.patch

@@ -0,0 +1,14 @@
+diff --git a/sepolgen/src/sepolgen/audit.py b/sepolgen/src/sepolgen/audit.py
+index 73c60f6..d636091 100644
+--- a/sepolgen/src/sepolgen/audit.py
++++ b/sepolgen/src/sepolgen/audit.py
+@@ -38,8 +38,7 @@ def get_audit_boot_msgs():
+     off=float(fd.read().split()[0])
+     fd.close
+     s = time.localtime(time.time() - off)
+-    date = time.strftime("%D/%Y", s).split("/")
+-    bootdate="%s/%s/%s" % (date[0], date[1], date[3])
++    bootdate = time.strftime("%x", s)
+     boottime = time.strftime("%X", s)
+     output = subprocess.Popen(["/sbin/ausearch", "-m", "AVC,USER_AVC,MAC_POLICY_LOAD,DAEMON_START,SELINUX_ERR", "-ts", bootdate, boottime],
+                               stdout=subprocess.PIPE).communicate()[0]

policycoreutils.spec

@@ -7,7 +7,7 @@
 Summary: SELinux policy core utilities
 Name:	 policycoreutils
 Version: 2.1.13
-Release: 3%{?dist}
+Release: 16%{?dist}
 License: GPLv2
 Group:	 System Environment/Base
 # Based on git repository with tag 20101221
@@ -19,11 +19,10 @@ Source3: system-config-selinux.desktop
 Source4: system-config-selinux.pam
 Source5: system-config-selinux.console
 Source6: selinux-polgengui.desktop
-Source7: selinux-polgengui.console
 Source8: policycoreutils_man_ru2.tar.bz2
 Source10: restorecond.service
 Patch:	 policycoreutils-rhat.patch
-#Patch4:	 policycoreutils-sepolgen.patch
+Patch1:	 policycoreutils-sepolgen.patch
 Obsoletes: policycoreutils < 2.0.61-2
 Conflicts: filesystem < 3
 Provides: /sbin/fixfiles
@@ -35,7 +34,7 @@ Provides: /sbin/restorecon
 
 BuildRequires: pam-devel libcgroup-devel libsepol-static >= %{libsepolver} libsemanage-static >= %{libsemanagever} libselinux-devel >= %{libselinuxver}  libcap-devel audit-libs-devel >=  %{libauditver} gettext
 BuildRequires: desktop-file-utils dbus-devel dbus-glib-devel
-BuildRequires: python-devel
+BuildRequires: python-devel setools-devel >= 3.3.7-14
 Requires: /bin/mount /bin/egrep /bin/awk /usr/bin/diff rpm /bin/sed
 BuildRequires:  systemd-units
 Requires: libsepol >= %{libsepolver} coreutils libselinux-utils >=  %{libselinuxver}
@@ -64,7 +63,7 @@ context.
 %prep
 %setup -q -a 1 
 %patch -p2 -b .rhat
-#%patch4 -p2 -b .sepolgen -d sepolgen-%{sepolgenver}
+%patch1 -p2 -b .sepolgen -d sepolgen-%{sepolgenver}
 
 %build
 make LSPP_PRIV=y SBINDIR="%{_sbindir}" LIBDIR="%{_libdir}" CFLAGS="%{optflags} -fPIE" LDFLAGS="-pie -Wl,-z,relro" all 
@@ -98,7 +97,6 @@ install -m 644 %{SOURCE2} %{buildroot}%{_datadir}/pixmaps
 install -m 644 %{SOURCE2} %{buildroot}%{_datadir}/icons/hicolor/24x24/apps
 install -m 644 %{SOURCE2} %{buildroot}%{_datadir}/system-config-selinux
 install -m 644 %{SOURCE4} %{buildroot}%{_sysconfdir}/pam.d/system-config-selinux
-install -m 644 %{SOURCE4} %{buildroot}%{_sysconfdir}/pam.d/selinux-polgengui
 install -m 644 %{SOURCE5} %{buildroot}%{_sysconfdir}/security/console.apps/system-config-selinux
 tar -jxf %{SOURCE8} -C %{buildroot}/
 rm -f %{buildroot}/usr/share/man/ru/man8/genhomedircon.8.gz
@@ -142,11 +140,15 @@ The policycoreutils-python package contains the management tools use to manage a
 %{_bindir}/audit2why
 %{_bindir}/chcat
 %{_bindir}/sandbox
+%{_bindir}/sepolgen
+%{_bindir}/sepolicy
 %{_bindir}/sepolgen-ifgen
 %{_bindir}/sepolgen-ifgen-attr-helper
 %{python_sitelib}/seobject.py*
 %{python_sitelib}/sepolgen
+%{python_sitelib}/sepolicy
 %{python_sitelib}/%{name}*.egg-info
+%{python_sitelib}/sepolicy*.egg-info
 %{pkgpythondir}
 %dir  /var/lib/sepolgen
 %dir  /var/lib/selinux
@@ -158,9 +160,11 @@ The policycoreutils-python package contains the management tools use to manage a
 %{_mandir}/ru/man8/chcat.8*
 %{_mandir}/man8/sandbox.8*
 %{_mandir}/man8/semanage.8*
+%{_mandir}/man8/sepolicy*.8*
 %{_mandir}/ru/man8/semanage.8*
 %dir %{_sysconfdir}/bash_completion.d
 %{_sysconfdir}/bash_completion.d/semanage-bash-completion.sh
+%{_sysconfdir}/bash_completion.d/sepolicy-bash-completion.sh
 %{_sysconfdir}/bash_completion.d/setsebool-bash-completion.sh
 
 %post python
@@ -214,7 +218,6 @@ Group: System Environment/Base
 Requires: policycoreutils-python = %{version}-%{release} 
 Requires: gnome-python2-gnome, pygtk2, pygtk2-libglade, gnome-python2-canvas
 Requires: usermode-gtk
-Requires: setools-console
 Requires: selinux-policy-doc
 Requires: python >= 2.6
 BuildRequires: desktop-file-utils
@@ -226,20 +229,15 @@ system-config-selinux is a utility for managing the SELinux environment
 %defattr(-,root,root)
 %{_bindir}/system-config-selinux
 %{_bindir}/selinux-polgengui
-%{_bindir}/sepolgen
 %{_datadir}/applications/fedora-system-config-selinux.desktop
 %{_datadir}/applications/fedora-selinux-polgengui.desktop
 %{_datadir}/icons/hicolor/24x24/apps/system-config-selinux.png
 %{_datadir}/pixmaps/system-config-selinux.png
 %dir %{_datadir}/system-config-selinux
-%dir %{_datadir}/system-config-selinux/templates
 %{_datadir}/system-config-selinux/system-config-selinux.png
 %{_datadir}/system-config-selinux/*.py*
-%{_datadir}/system-config-selinux/selinux.tbl
 %{_datadir}/system-config-selinux/*.glade
-%{_datadir}/system-config-selinux/templates/*.py*
 %config(noreplace) %{_sysconfdir}/pam.d/system-config-selinux
-%config(noreplace) %{_sysconfdir}/pam.d/selinux-polgengui
 %config(noreplace) %{_sysconfdir}/security/console.apps/system-config-selinux
 
 %clean
@@ -256,7 +254,6 @@ rm -rf %{buildroot}
 %{_sbindir}/semodule
 %{_sbindir}/sestatus
 %{_sbindir}/run_init
-%{_sbindir}/restorecon
 %{_bindir}/secon
 %{_bindir}/semodule_deps
 %{_bindir}/semodule_expand
@@ -320,7 +317,7 @@ The policycoreutils-restorecond package contains the restorecond service.
 %systemd_post restorecond.service
 
 %preun restorecond
-%systemd_reun restorecond.service
+%systemd_preun restorecond.service
 
 %postun restorecond
 %systemd_postun_with_restart restorecond.service
@@ -332,6 +329,53 @@ The policycoreutils-restorecond package contains the restorecond service.
 %{_bindir}/systemctl try-restart restorecond.service >/dev/null 2>&1 || :
 
 %changelog
+* Thu Oct 25 2012 Dan Walsh <dwalsh@redhat.com> - 2.1.12-16
+- Add Miroslav Grepl patch to generate html man pages
+- Update Translations
+- Add option to sandbox to shred files before deleting
+
+* Mon Oct 22 2012 Dan Walsh <dwalsh@redhat.com> - 2.1.12-15
+- Add Requires(post) PKGNAME to sepolicy generate /usr/bin/pkg
+
+* Fri Oct 19 2012 Dan Walsh <dwalsh@redhat.com> - 2.1.12-14
+- Add role_allow to sepolicy.search python bindings, this allows us to remove last requirement for setools-cmdline in gui tools.
+- Fix man page generator.
+
+* Wed Oct 17 2012 Dan Walsh <dwalsh@redhat.com> - 2.1.12-13
+- Remove dwalsh@redhat.com from man pages
+- Fix spec file for sepolicy generate
+
+* Wed Oct 17 2012 Dan Walsh <dwalsh@redhat.com> - 2.1.12-12
+- Add missing spec.py from templates directory needed for sepolicy generate
+- Add /var/tmp as collection point for sandbox apps.
+
+* Tue Oct 16 2012 Dan Walsh <dwalsh@redhat.com> - 2.1.12-11
+- Handle audit2allow -b in foreign locales
+
+* Tue Oct 16 2012 Dan Walsh <dwalsh@redhat.com> - 2.1.12-10
+- Update sepolicy generate with patch to create spec file and man page.
+- Patch initiated by Miroslav Grepl
+
+* Wed Oct 10 2012 Dan Walsh <dwalsh@redhat.com> - 2.1.12-9
+- Fix semanage to verify that types are appropriate for commands. 
+  * Patch initiated by mgrepl
+  * Fixes problem of specifying non file_types for fcontext, or not port_types for semanage port
+
+* Tue Oct 9 2012 Dan Walsh <dwalsh@redhat.com> - 2.1.12-8
+- Fix typo in preunstall line for restorecond
+- Add mgrepl patch to consolidate file context generated by sepolicy generate
+
+* Mon Oct 8 2012 Dan Walsh <dwalsh@redhat.com> - 2.1.12-7
+- Fix manpage generation, missing import
+- Add equiv_dict to get samba booleans into smbd_selinux
+- Add proper translations for booleans and remove selinux.tbl
+
+* Sat Oct 6 2012 Dan Walsh <dwalsh@redhat.com> - 2.1.12-6
+- Fix system-config-selinux to use sepolicy.generate instead of sepolgen
+
+* Thu Oct 4 2012 Dan Walsh <dwalsh@redhat.com> - 2.1.12-5
+- Add sepolicy commands, and change tools to use them.
+
 * Tue Sep 25 2012 Dan Walsh <dwalsh@redhat.com> - 2.1.12-4
 - Rebuild without bogus prebuild 64 bit seunshare app