From d293e36de1b13b273ad4ccdc5e9dfda835421ac6 Mon Sep 17 00:00:00 2001 From: Štěpán Kasal Date: Mar 02 2010 11:51:59 +0000 Subject: - use perl filtering macros --- diff --git a/autoconf.spec b/autoconf.spec index 13a1db2..854e800 100644 --- a/autoconf.spec +++ b/autoconf.spec @@ -1,20 +1,24 @@ Summary: A GNU tool for automatically configuring source code Name: autoconf Version: 2.65 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ and GFDL Group: Development/Tools Source: http://ftp.gnu.org/gnu/autoconf/autoconf-%{version}.tar.xz -Source1: filter-provides-automake.sh -Source2: filter-requires-automake.sh URL: http://www.gnu.org/software/autoconf/ BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +# Make AC_FUNC_MMAP work with C++ again. +# Committed to Autoconf git soon after 2.65. +Patch1: autoconf_ac_func_mmap.patch + # m4 >= 1.4.6 is required, >= 1.4.13 is recommended: BuildRequires: m4 >= 1.4.13 Requires: m4 >= 1.4.13 BuildRequires: emacs +# the filtering macros are currently in /etc/rpm/macros.perl: +BuildRequires: perl-devel Requires(post): /sbin/install-info Requires(preun): /sbin/install-info @@ -24,14 +28,13 @@ BuildRequires: automake libtool gcc-gfortran BuildRequires: erlang %endif -# Make AC_FUNC_MMAP work with C++ again. -# Committed to Autoconf git soon after 2.65. -Patch1: autoconf_ac_func_mmap.patch - # filter out bogus perl(Autom4te*) dependencies %define _use_internal_dependency_generator 0 -%define __find_provides %{SOURCE1} -%define __find_requires %{SOURCE2} +%{?perl_default_filter: +%filter_from_provides /^perl(Autom4te::/d +%filter_from_requires /^perl(Autom4te::/d +%perl_default_filter +} %description GNU's Autoconf is a tool for configuring source code and Makefiles. @@ -95,6 +98,9 @@ fi %doc AUTHORS COPYING ChangeLog NEWS README THANKS TODO %changelog +* Tue Mar 2 2010 Stepan Kasal - 2.65-2 +- use perl filtering macros + * Wed Nov 25 2009 Stepan Kasal - 2.65-1 - new upstream version - backported patch: make AC_FUNC_MMAP work with C++ again diff --git a/filter-provides-automake.sh b/filter-provides-automake.sh deleted file mode 100755 index 20bf706..0000000 --- a/filter-provides-automake.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh - -/usr/lib/rpm/find-provides $* | egrep -v 'perl\(Autom4te' | sort -u diff --git a/filter-requires-automake.sh b/filter-requires-automake.sh deleted file mode 100755 index 596c465..0000000 --- a/filter-requires-automake.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh - -/usr/lib/rpm/find-requires $* | egrep -v 'perl\(Autom4te' | sort -u