rpms/autoconf
6
0
Fork 0
Code Issues Pull Requests Releases Activity

- add 2 upstream patches (#611661)

Browse Source 
- allow rpmbuild --without check
This commit is contained in:
Karsten Hopp 2010-07-06 06:59:56 +00:00
parent 4870acb876
commit a3d24c85a3
2 changed files with 59 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
autoconf-2.66-611661.patch Normal file
View File

@ -0,0 +1,45 @@
diff -up autoconf-2.66/lib/autoconf/status.m4.611661 autoconf-2.66/lib/autoconf/status.m4
--- autoconf-2.66/lib/autoconf/status.m4.611661 2010-07-06 08:32:47.000000000 +0200
+++ autoconf-2.66/lib/autoconf/status.m4 2010-07-06 08:33:24.000000000 +0200
@@ -1102,7 +1102,7 @@ AC_DEFUN([AC_CONFIG_SUBDIRS],
_AC_CONFIG_COMPUTE_DEST(], [))])]dnl
[m4_append([_AC_LIST_SUBDIRS], [$1], [
])]dnl
-[AS_LITERAL_WORD_IF([$1], [],
+[AS_LITERAL_IF([$1], [],
[AC_DIAGNOSE([syntax], [$0: you should use literals])])]dnl
[AC_SUBST([subdirs], ["$subdirs m4_normalize([$1])"])])
diff -up autoconf-2.66/lib/autoconf/types.m4.611661 autoconf-2.66/lib/autoconf/types.m4
--- autoconf-2.66/lib/autoconf/types.m4.611661 2010-07-06 08:31:36.000000000 +0200
+++ autoconf-2.66/lib/autoconf/types.m4 2010-07-06 08:32:29.000000000 +0200
@@ -763,7 +763,7 @@ Remove this warning and the `AC_CACHE_CH
# AC_CHECK_SIZEOF(TYPE, [IGNORED], [INCLUDES = DEFAULT-INCLUDES])
# ---------------------------------------------------------------
AC_DEFUN([AC_CHECK_SIZEOF],
-[AS_LITERAL_IF([$1], [],
+[AS_LITERAL_IF(m4_translit([[$1]], [*], [p]), [],
[m4_fatal([$0: requires literal arguments])])]dnl
[# The cast to long int works around a bug in the HP C Compiler
# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
diff -up autoconf-2.66/lib/m4sugar/m4sh.m4.611661 autoconf-2.66/lib/m4sugar/m4sh.m4
--- autoconf-2.66/lib/m4sugar/m4sh.m4.611661 2010-07-06 08:37:32.000000000 +0200
+++ autoconf-2.66/lib/m4sugar/m4sh.m4 2010-07-06 08:38:53.000000000 +0200
@@ -1779,7 +1779,7 @@ m4_defun_init([AS_TR_SH],
[_$0(m4_expand([$1]))])
m4_define([_AS_TR_SH],
-[_AS_LITERAL_IF([$1], [ ][
+[_AS_LITERAL_IF([$1], [*+][ ][
])([], [$0_INDIR], [$0_LITERAL])([$1])])
m4_define([_AS_TR_SH_LITERAL],
@@ -1812,7 +1812,7 @@ m4_defun_init([AS_TR_CPP],
[_$0(m4_expand([$1]))])
m4_define([_AS_TR_CPP],
-[_AS_LITERAL_IF([$1], [ ][
+[_AS_LITERAL_IF([$1], [*][ ][
])([], [$0_INDIR], [$0_LITERAL])([$1])])
m4_define([_AS_TR_CPP_LITERAL],

16
autoconf.spec
View File

@ -1,10 +1,11 @@
Summary: A GNU tool for automatically configuring source code
Name: autoconf
Version: 2.66
Release: 1%{?dist}
Release: 2%{?dist}
License: GPLv2+ and GFDL
Group: Development/Tools
Source: http://ftpmirror.gnu.org/autoconf/autoconf-%{version}.tar.xz
Patch0: autoconf-2.66-611661.patch
URL: http://www.gnu.org/software/autoconf/
BuildArch: noarch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@ -18,11 +19,15 @@ BuildRequires: perl-devel
Requires(post): /sbin/install-info
Requires(preun): /sbin/install-info
# for check only:
# run "make check" by default
%{?_without_check: %define _without_check 1}
%{!?_without_check: %define _without_check 0}
%if ! %{_without_check}
BuildRequires: automake libtool gcc-gfortran
%if 0%{?fedora}
BuildRequires: erlang
%endif
%endif
# filter out bogus perl(Autom4te*) dependencies
%define _use_internal_dependency_generator 0
@ -50,6 +55,7 @@ their use.
%prep
%setup -q
%patch0 -p1
%build
%configure
@ -61,7 +67,9 @@ make
# 199: autotest.at parallel autotest and signal handling
# In test/autotest.at, under comment "Test PIPE", the exit code written
# to file "status" is 0. Report mailed to bug-autoconf.
%if ! %{_without_check}
make check TESTSUITEFLAGS='-198 200-'
%endif
%install
rm -rf ${RPM_BUILD_ROOT}
@ -93,6 +101,10 @@ fi
%doc AUTHORS COPYING ChangeLog NEWS README THANKS TODO
%changelog
* Tue Jul 06 2010 Karsten Hopp <karsten@redhat.com> 2.66-2
- add 2 upstream patches (#611661)
- allow rpmbuild --without check
* Mon Jul 5 2010 Stepan Kasal <kasal@ucw.cz> - 2.66-1
- new upstream version, drop upstreamed patches