From fc8da3172050e5b46c1dd79b3b514255b7ecc9e4 Mon Sep 17 00:00:00 2001 From: Bruno E. O. Meneguele Date: Nov 20 2017 20:45:06 +0000 Subject: - Adjusted docbook xsl path to match the correct stylesheet (BZ#1514985) - Remove only *.la files, considering there aren't any *.a files --- diff --git a/docbook-xsl-path.patch b/docbook-xsl-path.patch new file mode 100644 index 0000000..03e5664 --- /dev/null +++ b/docbook-xsl-path.patch @@ -0,0 +1,12 @@ +diff -urNp ima-evm-utils-1.0-orig/Makefile.am ima-evm-utils-1.0/Makefile.am +--- ima-evm-utils-1.0-orig/Makefile.am 2015-07-30 15:28:53.000000000 -0300 ++++ ima-evm-utils-1.0/Makefile.am 2017-11-20 16:20:04.245591165 -0200 +@@ -24,7 +24,7 @@ rpm: $(tarname) + rpmbuild -ba --nodeps $(SPEC) + + # requires asciidoc, xslproc, docbook-xsl +-MANPAGE_DOCBOOK_XSL = /usr/share/xml/docbook/stylesheet/docbook-xsl/manpages/docbook.xsl ++MANPAGE_DOCBOOK_XSL = http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl + + evmctl.1.html: README + @asciidoc -o $@ $< diff --git a/ima-evm-utils.spec b/ima-evm-utils.spec index 0294835..2a8936c 100644 --- a/ima-evm-utils.spec +++ b/ima-evm-utils.spec @@ -1,13 +1,13 @@ Summary: IMA/EVM support utilities Name: ima-evm-utils Version: 1.0 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2 Url: http://linux-ima.sourceforge.net/ Source: http://sourceforge.net/projects/linux-ima/files/ima-evm-utils/%{name}-%{version}.tar.gz BuildRequires: autoconf automake libtool m4 asciidoc libxslt BuildRequires: openssl-devel libattr-devel keyutils-libs-devel -Patch1: manpage.patch +Patch1: docbook-xsl-path.patch %description The Trusted Computing Group(TCG) run-time Integrity Measurement Architecture @@ -35,7 +35,6 @@ make %{?_smp_mflags} %install make DESTDIR=%{buildroot} install -find %{buildroot}%{_libdir} -type f -name "*.a" -print -delete find %{buildroot}%{_libdir} -type f -name "*.la" -print -delete %post -p /sbin/ldconfig @@ -55,6 +54,10 @@ find %{buildroot}%{_libdir} -type f -name "*.la" -print -delete %{_mandir}/man1/* %changelog +* Mon Nov 20 2017 Bruno E. O. Meneguele - 1.0-2 +- Adjusted docbook xsl path to match the correct stylesheet +- Remove only *.la files, considering there aren't any *.a files + * Tue Sep 05 2017 Bruno E. O. Meneguele - 1.0-1 - New upstream release - Remove libtool files diff --git a/manpage.patch b/manpage.patch deleted file mode 100644 index a4bfe0c..0000000 --- a/manpage.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -urNp ima-evm-utils-0.9/Makefile.am ima-evm-utils-0.9-patch/Makefile.am ---- ima-evm-utils-0.9/Makefile.am 2014-09-23 08:09:05.000000000 -0400 -+++ ima-evm-utils-0.9-patch/Makefile.am 2014-10-31 13:00:03.492295123 -0400 -@@ -24,7 +24,7 @@ rpm: $(tarname) - rpmbuild -ba --nodeps $(SPEC) - - # requires asciidoc, xslproc, docbook-xsl --MANPAGE_DOCBOOK_XSL = /usr/share/xml/docbook/stylesheet/docbook-xsl/manpages/docbook.xsl -+MANPAGE_DOCBOOK_XSL = http://docbook.sourceforge.net/release/xsl/current/xhtml-1_1/docbook.xsl - - evmctl.1.html: README - @asciidoc -o $@ $<