From b31a08897ad3bc595e4d7f85e8e72af5bec151c9 Mon Sep 17 00:00:00 2001 From: Vitezslav Crhonek Date: Mon, 10 Aug 2015 11:57:38 +0200 Subject: [PATCH] Add BR on perl(Storable), fix perl requires (bug #1251766) --- filter-provides-texinfo.sh | 4 ---- filter-requires-texinfo.sh | 4 ---- texinfo.spec | 17 ++++++++--------- 3 files changed, 8 insertions(+), 17 deletions(-) delete mode 100755 filter-provides-texinfo.sh delete mode 100755 filter-requires-texinfo.sh diff --git a/filter-provides-texinfo.sh b/filter-provides-texinfo.sh deleted file mode 100755 index 3fe728b..0000000 --- a/filter-provides-texinfo.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh - -/usr/lib/rpm/find-provides "$@" | grep -v 'perl(' -exit 0 diff --git a/filter-requires-texinfo.sh b/filter-requires-texinfo.sh deleted file mode 100755 index 5750c58..0000000 --- a/filter-requires-texinfo.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/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 f40d7cd..428cdc2 100644 --- a/texinfo.spec +++ b/texinfo.spec @@ -1,21 +1,15 @@ -%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: 6.0 -Release: 1%{?dist} +Release: 2%{?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 # Source5: macro definitions Source5: macros.info Patch0: texinfo-4.12-zlib.patch @@ -26,9 +20,11 @@ Requires: perl >= 5.7.3, perl(Text::Unidecode) 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) +BuildRequires: perl(Storable) -%global __find_requires %{SOURCE3} -%global __find_provides %{SOURCE4} +# Texinfo perl packages are not installed in default perl library dirs +%global __provides_exclude ^perl\\(.*Texinfo.*\\)$ +%global __requires_exclude ^perl\\(.*Texinfo.*\\)$ %description Texinfo is a documentation system that can produce both online @@ -170,6 +166,9 @@ fi %{_mandir}/man1/pdftexi2dvi.1* %changelog +* Sun Aug 9 2015 Orion Poplawski - 6.0-2 +- Add BR on perl(Storable), fix perl requires (bug #1251766) + * Tue Jul 14 2015 Vitezslav Crhonek - 6.0-1 - Update to texinfo-6.0 Resolves: #1236254