From 0d2e77344d78b5b2ed6bac57fc4db667157e7570 Mon Sep 17 00:00:00 2001 From: Petr Lautrbach Date: Fri, 8 Apr 2016 21:47:44 +0200 Subject: [PATCH] Revert "Temporary disable -doc package until pandoc is fixed in Rawhide" This reverts commit 202052e18404d84f24a9b6088d7670bd2d2d7b81. --- secilc.spec | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/secilc.spec b/secilc.spec index 0871a23..ecbdb13 100644 --- a/secilc.spec +++ b/secilc.spec @@ -1,7 +1,3 @@ -# temporary disable -doc package until pandoc is fixed in Rawhide: -# Error: nothing provides libHShaddock-library-1.1.1-ghc7.8.4.so()(64bit) needed by pandoc-1.13.2-5.fc24.x86_64 -%global with_doc 0 - Name: secilc Version: 2.5 Release: 1%{?dist} @@ -11,10 +7,7 @@ License: BSD URL: https://github.com/SELinuxProject/selinux/wiki Source0: https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/20160223/secilc-2.5.tar.gz -BuildRequires: libsepol-static >= 2.5, xmlto -%if 0%{?with_doc} -BuildRequires: dblatex, flex, pandoc -%endif +BuildRequires: libsepol-static >= 2.5, dblatex, flex, xmlto, pandoc %description The SELinux CIL Compiler is a compiler that converts the CIL language as @@ -23,7 +16,6 @@ Please see the CIL Design Wiki at: http://github.com/SELinuxProject/cil/wiki/ for more information about the goals and features on the CIL language. -%if 0%{?with_doc} %package doc Summary: Documentation for the SELinux CIL Compiler BuildArch: noarch @@ -34,7 +26,6 @@ described on the CIL design wiki into a kernel binary policy file. Please see the CIL Design Wiki at: http://github.com/SELinuxProject/cil/wiki/ for more information about the goals and features on the CIL language. -%endif %prep %setup -q -n secilc-2.5 @@ -42,11 +33,9 @@ for more information about the goals and features on the CIL language. %build make %{?_smp_mflags} CFLAGS="%{optflags}" LIBSEPOL_STATIC=%{_libdir}/libsepol.a -%if 0%{?with_doc} pushd docs make %{?_smp_mflags} popd -%endif %install @@ -59,12 +48,10 @@ make %{?_smp_mflags} DESTDIR="%{buildroot}" SBINDIR="%{buildroot}%{_sbindir}" LI %{_mandir}/man8/secilc.8.gz %license COPYING -%if 0%{?with_doc} %files doc %doc docs/html %doc docs/pdf %license COPYING -%endif %changelog * Tue Feb 23 2016 Petr Lautrbach 2.5-1