From c70e068c2f10bfec77fe96dca2a8620fdd4007a2acca53cb49f1ca0f2df7fc22 Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Mon, 7 Jan 2019 16:55:49 +0000 Subject: [PATCH] Accepting request 662645 from home:vitezslav_cizek:branches:security - Use the shipped manpages instead of building them with xmlto in order to avoid a build cycle (fipscheck, xmlto, libxslt, libgcrypt) * add fipscheck-dont_generate_manpages.patch - fix build on older distributions OBS-URL: https://build.opensuse.org/request/show/662645 OBS-URL: https://build.opensuse.org/package/show/security/fipscheck?expand=0&rev=19 --- fipscheck-dont_generate_manpages.patch | 13 +++++++++++++ fipscheck.changes | 8 ++++++++ fipscheck.spec | 9 +++++++-- 3 files changed, 28 insertions(+), 2 deletions(-) create mode 100644 fipscheck-dont_generate_manpages.patch diff --git a/fipscheck-dont_generate_manpages.patch b/fipscheck-dont_generate_manpages.patch new file mode 100644 index 0000000..414849b --- /dev/null +++ b/fipscheck-dont_generate_manpages.patch @@ -0,0 +1,13 @@ +Index: fipscheck-1.5.0/man/Makefile.in +=================================================================== +--- fipscheck-1.5.0.orig/man/Makefile.in 2017-02-23 15:49:16.000000000 +0100 ++++ fipscheck-1.5.0/man/Makefile.in 2019-01-03 12:03:26.003429620 +0100 +@@ -567,7 +567,7 @@ uninstall-man: uninstall-man3 uninstall- + + + $(dist_man_MANS): $(manpages_XMLSOURCES) +- for i in $^ ; do xmlto man $$i ; done ++ #for i in $^ ; do xmlto man $$i ; done + + # Tell versions [3.59,3.63) of GNU make to not export all variables. + # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/fipscheck.changes b/fipscheck.changes index 4c2ed5d..a8bc7cd 100644 --- a/fipscheck.changes +++ b/fipscheck.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Thu Jan 3 11:08:27 UTC 2019 - Vítězslav Čížek + +- Use the shipped manpages instead of building them with xmlto + in order to avoid a build cycle (fipscheck, xmlto, libxslt, libgcrypt) + * add fipscheck-dont_generate_manpages.patch +- fix build on older distributions + ------------------------------------------------------------------- Thu Sep 20 17:16:11 UTC 2018 - Jason Sikes diff --git a/fipscheck.spec b/fipscheck.spec index c1d9b6a..4d66cb1 100644 --- a/fipscheck.spec +++ b/fipscheck.spec @@ -1,7 +1,7 @@ # # spec file for package fipscheck # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -31,11 +31,15 @@ URL: https://releases.pagure.org/%{name}/ Source0: https://releases.pagure.org/fipscheck/%{name}-%{version}.tar.bz2 Source1: baselibs.conf Patch0: openssl-1_1-port.patch +Patch1: fipscheck-dont_generate_manpages.patch BuildRequires: autoconf BuildRequires: automake +%if 0%{?suse_version} >= 1500 BuildRequires: libopenssl-1_0_0-devel +%else +BuildRequires: libopenssl-devel +%endif BuildRequires: libtool -BuildRequires: xmlto Requires: %{lname} = %{version} %description @@ -64,6 +68,7 @@ This package contains development files for %{name}. if pkg-config --atleast-version=1.1 openssl; then %patch0 -p1 fi +%patch1 -p1 %build %configure --disable-static --libdir=/%{_lib}