From 0eccbd957d7388ed46ff95c0e73b76f8c3e403d9 Mon Sep 17 00:00:00 2001
From: Petr Lautrbach <plautrba@redhat.com>
Date: Aug 03 2017 06:01:21 +0000
Subject: Revert "Temporary fix while creating manpages using sepolicy is broken."


This reverts commit fbdb6e98da090086286321d2e5e13201d2f702df.

Since policycoreutils-2.6-7, 'sepolicy manpage' should be again
reasonable fast.

---

diff --git a/manpages.tar.gz b/manpages.tar.gz
deleted file mode 100644
index 8d9fcdd..0000000
Binary files a/manpages.tar.gz and /dev/null differ
diff --git a/manpages_html.tar.gz b/manpages_html.tar.gz
deleted file mode 100644
index 20101e5..0000000
Binary files a/manpages_html.tar.gz and /dev/null differ
diff --git a/selinux-policy.spec b/selinux-policy.spec
index 9382850..8e53048 100644
--- a/selinux-policy.spec
+++ b/selinux-policy.spec
@@ -58,10 +58,6 @@ Source30: booleans.subs_dist
 
 Source35: container-selinux.tgz
 
-#Temporary fix generating manges while is rawhide userspace broken.
-Source36: manpages.tar.gz
-Source37: manpages_html.tar.gz
-
 # Do a factory reset when there's no policy.kern file in a store
 # http://bugzilla.redhat.com/1290659
 #Source100: selinux-factory-reset
@@ -363,7 +359,7 @@ refpolicy_path=`pwd`
 cp $contrib_path/* $refpolicy_path/policy/modules/contrib
 
 mkdir selinux_config
-for i in %{SOURCE1} %{SOURCE2} %{SOURCE3} %{SOURCE4} %{SOURCE5} %{SOURCE6} %{SOURCE8} %{SOURCE14} %{SOURCE15} %{SOURCE17} %{SOURCE18} %{SOURCE19} %{SOURCE20} %{SOURCE21} %{SOURCE22} %{SOURCE23} %{SOURCE25} %{SOURCE26} %{SOURCE31} %{SOURCE32} ;do
+for i in %{SOURCE1} %{SOURCE2} %{SOURCE3} %{SOURCE4} %{SOURCE5} %{SOURCE6} %{SOURCE8} %{SOURCE14} %{SOURCE15} %{SOURCE17} %{SOURCE18} %{SOURCE19} %{SOURCE20} %{SOURCE21} %{SOURCE22} %{SOURCE23} %{SOURCE25} %{SOURCE26} %{SOURCE31} %{SOURCE32};do
  cp $i selinux_config
 done
 tar zxvf selinux_config/config.tgz
@@ -430,8 +426,6 @@ rm -rf %{buildroot}%{_sharedstatedir}/selinux/minimum/active/modules/100/sandbox
 %endif
 
 mkdir -p %{buildroot}%{_mandir}
-mkdir -p %{buildroot}%{_mandir}/man8/
-tar -xf %{SOURCE36} -C %{buildroot}/usr/share/man/man8/
 cp -R  man/* %{buildroot}%{_mandir}
 make UNK_PERMS=allow NAME=targeted TYPE=mcs DISTRO=%{distro} UBAC=n DIRECT_INITRC=n MONOLITHIC=%{monolithic} DESTDIR=%{buildroot} PKGNAME=%{name} MLS_CATS=1024 MCS_CATS=1024 install-docs
 make UNK_PERMS=allow NAME=targeted TYPE=mcs DISTRO=%{distro} UBAC=n DIRECT_INITRC=n MONOLITHIC=%{monolithic} DESTDIR=%{buildroot} PKGNAME=%{name} MLS_CATS=1024 MCS_CATS=1024 install-headers
@@ -442,9 +436,8 @@ install -m 644 doc/example.* %{buildroot}%{_usr}/share/selinux/devel/
 install -m 644 doc/policy.* %{buildroot}%{_usr}/share/selinux/devel/
 echo  "xdg-open file:///usr/share/doc/selinux-policy/html/index.html"> %{buildroot}%{_usr}/share/selinux/devel/policyhelp
 chmod +x %{buildroot}%{_usr}/share/selinux/devel/policyhelp
-#/usr/bin/sepolicy manpage -a -p %{buildroot}/usr/share/man/man8/ -w -r %{buildroot}
+/usr/bin/sepolicy manpage -a -p %{buildroot}/usr/share/man/man8/ -w -r %{buildroot}
 mkdir %{buildroot}%{_usr}/share/selinux/devel/html
-tar -xf %{SOURCE37} -C %{buildroot}/usr/share/man/man8/
 mv %{buildroot}%{_usr}/share/man/man8/*.html %{buildroot}%{_usr}/share/selinux/devel/html
 mv %{buildroot}%{_usr}/share/man/man8/style.css %{buildroot}%{_usr}/share/selinux/devel/html