From af9bf89d49b14f4a968f261568d6fb713c8fec96 Mon Sep 17 00:00:00 2001 From: Vitezslav Crhonek Date: Thu, 30 Oct 2014 15:56:37 +0100 Subject: [PATCH] Filter bogus perl requires/provides, Enable upstream test suite --- filter-provides-texinfo.sh | 4 ++++ filter-requires-texinfo.sh | 4 ++++ texinfo.spec | 22 ++++++++++++++++++++-- 3 files changed, 28 insertions(+), 2 deletions(-) create mode 100755 filter-provides-texinfo.sh create mode 100755 filter-requires-texinfo.sh diff --git a/filter-provides-texinfo.sh b/filter-provides-texinfo.sh new file mode 100755 index 0000000..3fe728b --- /dev/null +++ b/filter-provides-texinfo.sh @@ -0,0 +1,4 @@ +#!/bin/sh + +/usr/lib/rpm/find-provides "$@" | grep -v 'perl(' +exit 0 diff --git a/filter-requires-texinfo.sh b/filter-requires-texinfo.sh new file mode 100755 index 0000000..5750c58 --- /dev/null +++ b/filter-requires-texinfo.sh @@ -0,0 +1,4 @@ +#!/bin/sh + +/usr/lib/rpm/find-provides "$@" | grep 'perl(\(Text::Unidecode\|Unicode::EastAsianWidth\|Data::Dumper\|Locale::Messages\))' +exit 0 diff --git a/texinfo.spec b/texinfo.spec index 16c0b93..6f5e874 100644 --- a/texinfo.spec +++ b/texinfo.spec @@ -1,15 +1,21 @@ +%global _use_internal_dependency_generator 0 + %global tex_texinfo %{_datadir}/texmf/tex/texinfo Summary: Tools needed to create Texinfo format documentation files Name: texinfo Version: 5.2 -Release: 6%{?dist} +Release: 7%{?dist} License: GPLv3+ Group: Applications/Publishing Url: http://www.gnu.org/software/texinfo/ Source0: ftp://ftp.gnu.org/gnu/texinfo/texinfo-%{version}.tar.xz Source1: ftp://ftp.gnu.org/gnu/texinfo/texinfo-%{version}.tar.xz.sig Source2: info-dir +# Source3: script for filtering out false perl requires +Source3: filter-requires-texinfo.sh +# Source4: script for filtering out false perl provides +Source4: filter-provides-texinfo.sh Patch0: texinfo-4.12-zlib.patch Patch1: texinfo-4.13a-powerpc.patch # Patch2: bz#1053129, already upstream @@ -17,8 +23,12 @@ Patch2: texinfo-5.2-non-existing-info-page-segfault.patch Requires(post): /sbin/install-info Requires(preun): /sbin/install-info Requires: perl >= 5.7.3, perl(Text::Unidecode) -Requires: perl(Unicode::EastAsianWidth) +Requires: perl(Unicode::EastAsianWidth), perl(Data::Dumper), perl(Locale::Messages) BuildRequires: zlib-devel, ncurses-devel, help2man, perl(Data::Dumper) +BuildRequires: perl(Locale::Messages), perl(Unicode::EastAsianWidth), perl(Text::Unidecode) + +%global __find_requires %{SOURCE3} +%global __find_provides %{SOURCE4} %description Texinfo is a documentation system that can produce both online @@ -80,6 +90,10 @@ mv $RPM_BUILD_ROOT%{_bindir}/install-info $RPM_BUILD_ROOT/sbin %find_lang %{name} %find_lang %{name}_document +%check +export ALL_TESTS=yes +make %{?_smp_mflags} check + %post if [ -f %{_infodir}/texinfo.gz ]; then # --excludedocs? /sbin/install-info %{_infodir}/texinfo.gz %{_infodir}/dir || : @@ -155,6 +169,10 @@ fi %{_mandir}/man1/pdftexi2dvi.1* %changelog +* Thu Oct 30 2014 Vitezslav Crhonek - 5.2-7 +- Filter bogus perl requires/provides +- Enable upstream test suite + * Tue Oct 14 2014 Vitezslav Crhonek - 5.2-6 - Use perl-Unicode-EastAsianWidth