testing/autoconf
SHA256
3
0
Fork 0
forked from pool/autoconf
Code Pull Requests Activity

Accepting request 746050 from devel:tools:building

Browse Source 
OBS-URL: https://build.opensuse.org/request/show/746050
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/autoconf?expand=0&rev=38
This commit is contained in:
Dominique Leuenberger 2019-11-08 14:23:18 +00:00 committed by Git OBS Bridge
commit 54418a3c11
7 changed files with 125 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
autoconf-el.changes
View File

@ -1,3 +1,19 @@
-------------------------------------------------------------------
Tue Nov 5 23:07:29 UTC 2019 - Stefan Brüns <stefan.bruens@rwth-aachen.de>
- Fix testsuite with Bash 5, add port-tests-to-bash-5.patch
-------------------------------------------------------------------
Wed Oct 30 17:01:32 UTC 2019 - Stefan Brüns <stefan.bruens@rwth-aachen.de>
- Require perl-base instead of perl, none of the additional modules
are required.
-------------------------------------------------------------------
Thu Oct 17 13:55:31 UTC 2019 - Richard Brown <rbrown@suse.com>
- Remove obsolete Groups tag (fate#326485)
-------------------------------------------------------------------
Mon Aug 6 09:59:34 UTC 2018 - schwab@suse.de

5
autoconf-el.spec
View File

@ -1,7 +1,7 @@
#
# spec file for package autoconf-el
#
# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -12,7 +12,7 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
# Please submit bugfixes or comments via http://bugs.opensuse.org/
# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
@ -24,7 +24,6 @@ Version: 2.69
Release: 0
Summary: Emacs mode for editing GNU Autoconf scripts
License: GPL-3.0-or-later
Group: Productivity/Editors/Emacs
Url: http://www.gnu.org/software/autoconf
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source: http://ftp.gnu.org/gnu/autoconf/autoconf-%{version}.tar.gz

16
autoconf-testsuite.changes
View File

@ -1,3 +1,19 @@
-------------------------------------------------------------------
Tue Nov 5 23:07:29 UTC 2019 - Stefan Brüns <stefan.bruens@rwth-aachen.de>
- Fix testsuite with Bash 5, add port-tests-to-bash-5.patch
-------------------------------------------------------------------
Wed Oct 30 17:01:32 UTC 2019 - Stefan Brüns <stefan.bruens@rwth-aachen.de>
- Require perl-base instead of perl, none of the additional modules
are required.
-------------------------------------------------------------------
Thu Oct 17 13:55:31 UTC 2019 - Richard Brown <rbrown@suse.com>
- Remove obsolete Groups tag (fate#326485)
-------------------------------------------------------------------
Mon Aug 6 09:59:34 UTC 2018 - schwab@suse.de

10
autoconf-testsuite.spec
View File

@ -1,7 +1,7 @@
#
# spec file for package autoconf-testsuite
#
# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -12,7 +12,7 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
# Please submit bugfixes or comments via http://bugs.opensuse.org/
# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
@ -21,7 +21,6 @@ Version: 2.69
Release: 0
Summary: A GNU Tool for Automatically Configuring Source Code
License: GPL-3.0-or-later
Group: Development/Tools/Building
Url: http://www.gnu.org/software/autoconf
Source0: http://ftp.gnu.org/gnu/autoconf/autoconf-%{version}.tar.gz
Source1: http://ftp.gnu.org/gnu/autoconf/autoconf-%{version}.tar.gz.sig
@ -31,11 +30,13 @@ Patch0: autoreconf-ltdl.diff
Patch1: autoconf-perl-5.17-fixes.patch
# PATCH-FIX-UPSTREAM AC_HEADER_MAJOR: port to glibc 2.25
Patch2: ac-header-major.patch
# PATCH-FIX-UPSTREAM Port tests to Bash 5
Patch3: port-tests-to-bash-5.patch
BuildRequires: help2man
BuildRequires: m4 >= 1.4.6
Requires: info
Requires: m4 >= 1.4.6
Requires: perl >= 5.6
Requires: perl-base >= 5.6
Requires(post): %{install_info_prereq}
Requires(preun): %{install_info_prereq}
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@ -59,6 +60,7 @@ only required for the generation of the scripts, not their use.
%patch0
%patch1 -p1
%patch2 -p1
%patch3 -p1
%build
%configure

16
autoconf.changes
View File

@ -1,3 +1,19 @@
-------------------------------------------------------------------
Tue Nov 5 23:07:29 UTC 2019 - Stefan Brüns <stefan.bruens@rwth-aachen.de>
- Fix testsuite with Bash 5, add port-tests-to-bash-5.patch
-------------------------------------------------------------------
Wed Oct 30 17:01:32 UTC 2019 - Stefan Brüns <stefan.bruens@rwth-aachen.de>
- Require perl-base instead of perl, none of the additional modules
are required.
-------------------------------------------------------------------
Thu Oct 17 13:55:31 UTC 2019 - Richard Brown <rbrown@suse.com>
- Remove obsolete Groups tag (fate#326485)
-------------------------------------------------------------------
Mon Aug 6 09:59:34 UTC 2018 - schwab@suse.de

10
autoconf.spec
View File

@ -1,7 +1,7 @@
#
# spec file for package autoconf
#
# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -12,7 +12,7 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
# Please submit bugfixes or comments via http://bugs.opensuse.org/
# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
@ -21,7 +21,6 @@ Version: 2.69
Release: 0
Summary: A GNU Tool for Automatically Configuring Source Code
License: GPL-3.0-or-later
Group: Development/Tools/Building
Url: http://www.gnu.org/software/autoconf
Source0: http://ftp.gnu.org/gnu/autoconf/autoconf-%{version}.tar.gz
Source1: http://ftp.gnu.org/gnu/autoconf/autoconf-%{version}.tar.gz.sig
@ -31,11 +30,13 @@ Patch0: autoreconf-ltdl.diff
Patch1: autoconf-perl-5.17-fixes.patch
# PATCH-FIX-UPSTREAM AC_HEADER_MAJOR: port to glibc 2.25
Patch2: ac-header-major.patch
# PATCH-FIX-UPSTREAM Port tests to Bash 5
Patch3: port-tests-to-bash-5.patch
BuildRequires: help2man
BuildRequires: m4 >= 1.4.6
Requires: info
Requires: m4 >= 1.4.6
Requires: perl >= 5.6
Requires: perl-base >= 5.6
Requires(post): %{install_info_prereq}
Requires(preun): %{install_info_prereq}
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@ -59,6 +60,7 @@ only required for the generation of the scripts, not their use.
%patch0
%patch1 -p1
%patch2 -p1
%patch3 -p1
%build
%configure

63
port-tests-to-bash-5.patch Normal file
View File

@ -0,0 +1,63 @@
From 5b9db67786a428164abafe626ab11a2754aad528 Mon Sep 17 00:00:00 2001
From: Ondrej Dubaj <odubaj@redhat.com>
Date: Wed, 28 Aug 2019 07:39:50 +0200
Subject: [PATCH] Port tests to Bash 5
* tests/local.at (AT_CHECK_ENV, AT_CONFIG_CMP):
Add BASH_ARGC, BASH_ARGV to list of variables to be ignored when
comparing variable space dumps.
(AT_CONFIG_CMP): Also ignore LINENO.
* tests/m4sh.at: Also unset LINENO in 'reference' and 'test/test-1'.
---
tests/local.at | 5 ++++-
tests/m4sh.at | 4 ++--
2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/tests/local.at b/tests/local.at
index a22958c..852be28 100644
--- a/tests/local.at
+++ b/tests/local.at
@@ -325,7 +325,7 @@ if test -f state-env.before && test -f state-env.after; then
[AWK|LEX|LEXLIB|LEX_OUTPUT_ROOT|LN_S|M4|MKDIR_P|RANLIB|SET_MAKE|YACC],
[GREP|[EF]GREP|SED],
[[_@]|.[*#?$].],
- [argv|ARGC|LINENO|OLDPWD|PIPESTATUS|RANDOM|SECONDS]))=' \
+ [argv|ARGC|LINENO|BASH_ARGC|BASH_ARGV|OLDPWD|PIPESTATUS|RANDOM|SECONDS]))=' \
$act_file ||
test $? -eq 1 || echo failed >&2
) 2>stderr-$act_file |
@@ -382,6 +382,9 @@ do
/'\'\\\$\''=/ d
/^argv=/ d
/^ARGC=/ d
+ /^BASH_ARGC=/ d
+ /^BASH_ARGV=/ d
+ /^LINENO=/ d
' $act_file >at_config_vars-$act_file
done
AT_CMP([at_config_vars-$1], [at_config_vars-$2])[]dnl
diff --git a/tests/m4sh.at b/tests/m4sh.at
index e9d70b0..cbdfcb6 100644
--- a/tests/m4sh.at
+++ b/tests/m4sh.at
@@ -254,7 +254,7 @@ AT_CHECK([autom4te -l m4sh $1.as -o $1])
# `_oline_', once processed and ran, produces our reference.
# We check that we find ourselves by looking at a string which is
# available only in the original script: `_oline_'.
-AT_DATA_LINENO([reference], [false], [__OLINE__], [_oline__])
+AT_DATA_LINENO([reference], [true], [__OLINE__], [_oline__])
AT_CHECK([./reference], 0, [stdout])
# The reference:
@@ -264,7 +264,7 @@ mv stdout expout
# Be sure to be out of the PATH.
AT_CHECK([mkdir test || exit 77])
-AT_DATA_LINENO([test/test-1], [false], [__LINENO__], [LINENO])
+AT_DATA_LINENO([test/test-1], [true], [__LINENO__], [LINENO])
AT_CHECK([./test/test-1], 0, [expout])
AT_CHECK([(PATH=test$PATH_SEPARATOR$PATH; export PATH; exec test-1)],
0, [expout])
--
1.9.1