From ceff8ba54e2043516db31e363b2cf3c2ac7422b5 Mon Sep 17 00:00:00 2001 From: Lukas Vrabec Date: Aug 03 2015 22:25:37 +0000 Subject: Fix for 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. --- diff --git a/manpages_html.tgz b/manpages_html.tgz index eaf26f8..e9c9147 100644 Binary files a/manpages_html.tgz and b/manpages_html.tgz differ diff --git a/manpages_man.tgz b/manpages_man.tgz index 09be913..421fc82 100644 Binary files a/manpages_man.tgz and b/manpages_man.tgz differ diff --git a/selinux-policy.spec b/selinux-policy.spec index a94997c..03d28fe 100644 --- a/selinux-policy.spec +++ b/selinux-policy.spec @@ -314,10 +314,12 @@ 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} %{SOURCE33} %{SOURCE34} ;do cp $i selinux_config done tar zxvf selinux_config/config.tgz +tar -xf selinux_config/manpages_man.tgz +tar -xf selinux_config/manpages_html.tgz %install # Build targeted policy @@ -376,8 +378,8 @@ 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/ +mkdir -p %{buildroot}/usr/share/man/man8/ +install -m 644 man8/* %{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 @@ -389,10 +391,10 @@ 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/ -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 +mkdir -p %{buildroot}/usr/share/selinux/devel/html/ +install -m 644 html/* %{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 mkdir -p %{buildroot}%{_rpmconfigdir}/macros.d echo '%%_selinux_policy_version %{version}-%{release}' > %{buildroot}%{_rpmconfigdir}/macros.d/macros.selinux-policy