autoscan-2.13: remove

Resolves: rhbz#1194568
Version: 2.13-33
This commit is contained in:
Pavel Raiskup 2015-02-20 10:02:22 +01:00
parent 4f07356d47
commit e84ac0bd88
2 changed files with 6 additions and 56 deletions

View File

@ -1,53 +0,0 @@
--- autoconf-2.13/autoscan.pl~ Tue Jul 10 19:00:10 2001
+++ autoconf-2.13/autoscan.pl Tue Jul 10 19:00:10 2001
@@ -123,14 +123,33 @@
# Called by &find on each file.
sub wanted
{
- if (/^.*\.[chlymC]$/ || /^.*\.cc$/) {
- $name =~ s?^\./??; push(@cfiles, $name);
- }
- elsif (/^[Mm]akefile$/ || /^[Mm]akefile\.in$/ || /^GNUmakefile$/) {
- $name =~ s?^\./??; push(@makefiles, $name);
- }
- elsif (/^.*\.sh$/) {
- $name =~ s?^\./??; push(@shfiles, $name);
+ # Wanted only if there is no corresponding FILE.in.
+ return
+ if -f "$_.in";
+
+ # Strip a useless leading `./'.
+ $name =~ s,^\./,,;
+
+ if (/^.*\.[chlymC](\.in)?$/)
+ {
+ push (@cfiles, $name);
+ $programs{cc}++;
+ }
+ elsif (/^.*\.(cc|cpp|cxx|CC|C|hh|hpp|hxx|HH|H|yy|ypp|ll|lpp)(\.in)?$/)
+ {
+ push (@cfiles, $name);
+ $programs{CC}++;
+ }
+ elsif (/^[Mm]akefile(\.in)?$/ || /^GNUmakefile$/)
+ {
+ # Wanted only if there is no corresponding Makefile.in.
+ # Using Find, $_ contains the current filename with the current
+ # directory of the walk through.
+ push (@makefiles, $name);
+ }
+ elsif (/^.*\.sh(\.in)?$/)
+ {
+ push (@shfiles, $name);
}
}
@@ -244,7 +263,7 @@
$libraries{$1}++;
}
# Tokens in the code.
- while (s/\W([a-zA-Z_]\w*)\W/ /) {
+ while (s/\W([a-zA-Z_][\w\+\.-]*)\W/ /) {
$programs{$1}++;
}
}

View File

@ -1,7 +1,7 @@
Summary: A GNU tool for automatically configuring source code Summary: A GNU tool for automatically configuring source code
Name: autoconf213 Name: autoconf213
Version: 2.13 Version: 2.13
Release: 32%{?dist} Release: 33%{?dist}
License: GPLv2+ License: GPLv2+
Group: Development/Tools Group: Development/Tools
URL: http://www.gnu.org/software/autoconf/ URL: http://www.gnu.org/software/autoconf/
@ -11,7 +11,6 @@ Patch1: autoconf-2.13-mawk.patch
Patch2: autoconf-2.13-notmp.patch Patch2: autoconf-2.13-notmp.patch
Patch3: autoconf-2.13-c++exit.patch Patch3: autoconf-2.13-c++exit.patch
Patch4: autoconf-2.13-headers.patch Patch4: autoconf-2.13-headers.patch
Patch5: autoconf-2.13-autoscan.patch
Patch6: autoconf-2.13-exit.patch Patch6: autoconf-2.13-exit.patch
Patch7: autoconf-2.13-wait3test.patch Patch7: autoconf-2.13-wait3test.patch
Patch8: autoconf-2.13-make-defs-62361.patch Patch8: autoconf-2.13-make-defs-62361.patch
@ -49,7 +48,6 @@ use.
%patch2 -p1 %patch2 -p1
%patch3 -p1 %patch3 -p1
%patch4 -p1 %patch4 -p1
%patch5 -p1
%patch6 -p1 %patch6 -p1
%patch7 -p1 %patch7 -p1
%patch8 -p1 %patch8 -p1
@ -69,6 +67,8 @@ rm -rf ${RPM_BUILD_ROOT}
#makeinstall #makeinstall
make install DESTDIR=$RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT
rm ${RPM_BUILD_ROOT}/%{_bindir}/autoscan-%{version}
%check %check
make check make check
@ -95,6 +95,9 @@ rm -rf ${RPM_BUILD_ROOT}
%doc AUTHORS COPYING NEWS README TODO %doc AUTHORS COPYING NEWS README TODO
%changelog %changelog
* Fri Feb 20 2015 Pavel Raiskup <praiskup@redhat.com> - 2.13-33
- don't ship broken (and ancient) autoscan (rhbz#1194568)
* Mon Jul 28 2014 Pavel Raiskup <praiskup@redhat.com> - 2.13-32 * Mon Jul 28 2014 Pavel Raiskup <praiskup@redhat.com> - 2.13-32
- don't build-require compat-gcc-34-g77 at all - don't build-require compat-gcc-34-g77 at all