From d395cb970d04751445e424bfe47c56630c1e9400 Mon Sep 17 00:00:00 2001 From: Lukas Vrabec Date: May 10 2016 10:57:45 +0000 Subject: Revert "Replace generating man/html pages with pages from actual build. This is due to broken userspace with python3 in F23/Rawhide. Please Revert when userspace will be fixed." This reverts commit ae80a5c1a510de55e873c4b07952792d53974b52. --- diff --git a/manpages_html.tgz b/manpages_html.tgz deleted file mode 100644 index eaf26f8..0000000 Binary files a/manpages_html.tgz and /dev/null differ diff --git a/manpages_man.tgz b/manpages_man.tgz deleted file mode 100644 index 09be913..0000000 Binary files a/manpages_man.tgz and /dev/null differ diff --git a/selinux-policy.spec b/selinux-policy.spec index 42230ed..cff6039 100644 --- a/selinux-policy.spec +++ b/selinux-policy.spec @@ -54,8 +54,7 @@ Source27: selinux-policy.conf Source28: permissivedomains.cil Source29: serefpolicy-contrib-%{version}.tgz Source30: booleans.subs_dist -Source33: manpages_html.tgz -Source34: manpages_man.tgz + Source35: docker-selinux.tgz Url: http://github.com/TresysTechnology/refpolicy/wiki BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -392,8 +391,6 @@ rm -rf %{buildroot}%{_sharedstatedir}/selinux/minimum/active/modules/100/sandbox %endif mkdir -p %{buildroot}%{_mandir} -mkdir %{buildroot}/usr/share/man/man8/ -tar -xf ../manpages_man.tgz -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 @@ -404,8 +401,7 @@ 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} -tar -xf ../manpages_html.tgz -C %{buildroot}/usr/share/man/man8/ +/usr/bin/sepolicy manpage -a -p %{buildroot}/usr/share/man/man8/ -w -r %{buildroot} mkdir %{buildroot}%{_usr}/share/selinux/devel/html 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