avatar
mikhailnov has added 8ba0e8375b
Fix for rpm4's AutoReq
view file @ 8ba0e8375b
... ... --- a/autoconf2.1.spec
... ... +++ b/autoconf2.1.spec
... ... @@ -10,7 +10,7 @@ BuildRequires: gcc-gfortran
10 10
Name:		%{pkgname}2.1
11 11
Summary:	A GNU tool for automatically configuring source code
12 12
Version:	2.13
13
Release:	39
13
Release:	42
14 14
Epoch:		1
15 15
License:	GPL
16 16
Group:		Development/Other
... ... @@ -25,6 +25,7 @@ Patch3: autoconf-fix-for-gcc2.96-patch
25 25
Patch4:		autoconf-2.13-versioned-info.patch
26 26
Patch5:		autoconf-2.13-automake14.patch
27 27
Patch6:		autoconf-2.13-gfortran.patch
28
Patch7:		find.pl-to-File::Find.patch
28 29
29 30
Requires:	gawk, m4, mktemp
30 31
BuildRequires:	texinfo m4
... ... @@ -65,6 +66,7 @@ case %{fortran_compiler} in
66 66
%patch6 -p1 -b .gfortran
67 67
;;
68 68
esac
69
%patch7 -p1
69 70
70 71
%build
71 72
export F77=%{fortran_compiler}
view file @ 8ba0e8375b
... ... --- /dev/null
... ... +++ b/find.pl-to-File::Find.patch
... ... @@ -0,0 +1,42 @@
1
Fix dep on old find.pl (mageia)
2
https://github.com/OpenMandrivaAssociation/autoconf2.1/commit/9fa9e246475723e42d54a0c3dc16dd87534db84f
3
4
diff --git a/autoscan.pl b/autoscan.pl
5
index 3285236..afbd66a 100644
6
--- a/autoscan.pl
7
+++ b/autoscan.pl
8
@@ -19,7 +19,7 @@
9
 
10
 # Written by David MacKenzie <djm@gnu.ai.mit.edu>.
11
 
12
-require "find.pl";
13
+use File::Find qw(find);
14
 
15
 $datadir = $ENV{"AC_MACRODIR"} || "@datadir@";
16
 $verbose = 0;
17
@@ -30,7 +30,7 @@ undef %programs_macros;
18
 
19
 &parse_args;
20
 &init_tables;
21
-&find('.');
22
+find(\&wanted, '.');
23
 &scan_files;
24
 &output;
25
 
26
@@ -124,13 +124,13 @@ sub init_tables
27
 sub wanted
28
 {
29
     if (/^.*\.[chlymC]$/ || /^.*\.cc$/) {
30
-	$name =~ s?^\./??; push(@cfiles, $name);
31
+	$File::Find::name =~ s?^\./??; push(@cfiles, $File::Find::name);
32
     }
33
     elsif (/^[Mm]akefile$/ || /^[Mm]akefile\.in$/ || /^GNUmakefile$/) {
34
-	$name =~ s?^\./??; push(@makefiles, $name);
35
+	$File::Find::name =~ s?^\./??; push(@makefiles, $File::Find::name);
36
     }
37
     elsif (/^.*\.sh$/) {
38
-	$name =~ s?^\./??; push(@shfiles, $name);
39
+	$File::Find::name =~ s?^\./??; push(@shfiles, $File::Find::name);
40
     }
41
 }
42
 

Comments