OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/autoconf?expand=0&rev=3

autoconf-el.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Mar 10 14:43:21 CET 2008 - schwab@suse.de
+
+- Fix spurious testsuite failure.
+
 -------------------------------------------------------------------
 Tue Feb 19 19:57:01 CET 2008 - schwab@suse.de
 

autoconf-el.spec

@@ -16,7 +16,7 @@ License:        GPL v2 or later
 Group:          Productivity/Editors/Emacs
 AutoReqProv:    on
 Version:        2.61
-Release:        124
+Release:        131
 Summary:        Emacs mode for editing GNU Autoconf scripts
 Url:            http://www.gnu.org/software/autoconf
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
@@ -70,6 +70,8 @@ rm -rf $RPM_BUILD_ROOT
 %{site_lisp}/*.elc
 
 %changelog
+* Mon Mar 10 2008 schwab@suse.de
+- Fix spurious testsuite failure.
 * Tue Feb 19 2008 schwab@suse.de
 - Fix undefined behaviour in AC_FUNC_MKTIME test.
 * Fri Jun 01 2007 schwab@suse.de

autoconf.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Mar 10 14:43:21 CET 2008 - schwab@suse.de
+
+- Fix spurious testsuite failure.
+
 -------------------------------------------------------------------
 Tue Feb 19 19:57:01 CET 2008 - schwab@suse.de
 

autoconf.spec

@@ -19,12 +19,13 @@ AutoReqProv:    on
 Requires:       m4 >= %(rpm -q --qf=%%{VERSION} m4)
 PreReq:         %{install_info_prereq}
 Version:        2.61
-Release:        68
+Release:        70
 Summary:        A GNU Tool for Automatically Configuring Source Code
 Source:         autoconf-%{version}.tar.bz2
 Patch:          autoreconf-ltdl.diff
 Patch1:         ac-proc-sed.diff
 Patch2:         ac-func-mktime.diff
+Patch3:         tests.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
@@ -52,11 +53,14 @@ Authors:
 %patch
 %patch1
 %patch2 -p1
+%patch3 -p1
 
 %build
 %{suse_update_config -f config}
 ./configure --prefix=%{_prefix} --infodir=%{_infodir} --mandir=%{_mandir}
 make
+
+%check
 trap 'test $? -ne 0 && cat tests/testsuite.log' EXIT
 make check
 
@@ -82,6 +86,8 @@ rm -rf $RPM_BUILD_ROOT
 %doc %{_mandir}/man1/*.gz
 
 %changelog
+* Mon Mar 10 2008 schwab@suse.de
+- Fix spurious testsuite failure.
 * Tue Feb 19 2008 schwab@suse.de
 - Fix undefined behaviour in AC_FUNC_MKTIME test.
 * Fri Jun 01 2007 schwab@suse.de

tests.diff

@@ -0,0 +1,45 @@
+2007-12-12  Eric Blake  <ebb9@byu.net>
+
+	Fix spurious testsuite failure with M4 1.4.11.
+	* tests/local.at (AT_CHECK_M4): Cater to new m4 error message.
+
+diff --git a/tests/local.at b/tests/local.at
+index 855ebd3..9caac75 100644
+--- a/tests/local.at
++++ b/tests/local.at
+@@ -63,11 +63,16 @@ m4_define([AT_CHECK_PERL_SYNTAX],
+ # AT_CHECK_M4(COMMAND, [EXIT-STATUS = 0], STDOUT, STDERR)
+ # -------------------------------------------------------
+ # If stderr is specified, normalize the observed stderr.
+-# This (using GNU M4 1.4.6 or later)
++# This (using GNU M4 1.4.6)
+ #
+ #  /usr/local/bin/m4:script.4s:1: cannot open `foo': No such file or directory
+ #  autom4te: /usr/local/bin/m4 failed with exit status: 1
+ #
++# or this (GNU M4 1.4.11)
++#
++#  /usr/local/bin/m4:script.4s:1: include: cannot open `foo': No such file or directory
++#  autom4te: /usr/local/bin/m4 failed with exit status: 1
++#
+ # or this (GNU M4 1.4 installed as gm4)
+ #
+ #  script.4s:1: /usr/local/bin/gm4: Cannot open foo: No such file or directory
+@@ -86,6 +91,7 @@ m4_define([AT_CHECK_PERL_SYNTAX],
+ #
+ # and
+ #     m4:(file):(line): Cannot open foo:
++# or  m4:(file):(line): include: cannot open `foo':
+ # to  m4:(file):(line): cannot open `foo':
+ #
+ # and
+@@ -102,7 +108,8 @@ m4_define([AT_CHECK_M4],
+ m4_case([$4], [], [], [ignore], [],
+ [AT_CHECK([[sed 's/^[^:]*m4: *\([^:]*:\) *\([0-9][0-9]*: \)/m4:\1\2/
+ 	s/^\([^:]*:\) *\([0-9][0-9]*:\)[^:]*m4: /m4:\1\2 /
+-	s/^\(m4:[^:]*:[0-9][0-9]*: \)C\(annot open \)\([^`:]*\):/\1c\2`\3'\'':/
++	s/: C\(annot open \)\([^`:]*\):/: c\1`\2'\'':/
++	s/: include:\( cannot open\)/:\1/
+ 	s/^autom4te: [^ ]*m4 /autom4te: m4 /
+ 	s/^autom4te: [^ ]*m4\.exe /autom4te: m4 /
+ 	s/ (E[A-Z]*)$//