Update to m4-1.4.18

This commit is contained in:
Vitezslav Crhonek 2017-01-02 09:59:48 +01:00
parent dc8b8038b8
commit 9bbbb3c95c
5 changed files with 10 additions and 50 deletions

10
.gitignore vendored
View File

@ -1,8 +1,2 @@
m4-1.4.14.tar.xz
m4-1.4.14.tar.xz.sig
/m4-1.4.15.tar.xz
/m4-1.4.15.tar.xz.sig
/m4-1.4.16.tar.xz
/m4-1.4.16.tar.xz.sig
/m4-1.4.17.tar.xz
/m4-1.4.17.tar.xz.sig
/m4-1.4.18.tar.xz
/m4-1.4.18.tar.xz.sig

View File

@ -1,19 +0,0 @@
--- m4-1.4.17/tests/test-isnanl.h.ori
+++ m4-1.4.17/tests/test-isnanl.h
@@ -51,6 +51,15 @@ main ()
/* A bit pattern that is different from a Quiet NaN. With a bit of luck,
it's a Signalling NaN. */
{
+#if defined __powerpc__ && LDBL_MANT_DIG == 106
+ /* This is PowerPC "double double", a pair of two doubles. Inf and Nan are
+ represented as the corresponding 64-bit IEEE values in the first double;
+ the second is ignored. Manipulate only the first double. */
+ #undef NWORDS
+ #define NWORDS \
+ ((sizeof (double) + sizeof (unsigned int) - 1) / sizeof (unsigned int))
+#endif
+
memory_long_double m;
m.value = NaNl ();
# if LDBL_EXPBIT0_BIT > 0

View File

@ -1,12 +0,0 @@
diff -up m4-1.4.17/build-aux/update-copyright.orig m4-1.4.17/build-aux/update-copyright
--- m4-1.4.17/build-aux/update-copyright.orig 2015-07-13 11:25:19.502749690 +0200
+++ m4-1.4.17/build-aux/update-copyright 2015-07-13 11:26:20.445044297 +0200
@@ -124,7 +124,7 @@ use strict;
use warnings;
my $copyright_re = 'Copyright';
-my $circle_c_re = '(?:\([cC]\)|@copyright{}|©)';
+my $circle_c_re = '(?:\([cC]\)|@copyright\{}|\\\\\(co|©)';
my $holder = $ENV{UPDATE_COPYRIGHT_HOLDER};
$holder ||= 'Free Software Foundation, Inc.';
my $prefix_max = 5;

15
m4.spec
View File

@ -1,17 +1,12 @@
Summary: The GNU macro processor
Name: m4
Version: 1.4.17
Release: 9%{?dist}
Version: 1.4.18
Release: 1%{?dist}
License: GPLv3+
Group: Applications/Text
Source0: http://ftp.gnu.org/gnu/m4/m4-%{version}.tar.xz
Source1: http://ftp.gnu.org/gnu/m4/m4-%{version}.tar.xz.sig
URL: http://www.gnu.org/software/m4/
# Patch0: Fixes math tests for little-endian PowerPC, rhbz#1083434
# patch by Menanteau Guy and Ulrich Weigand
Patch0: m4-1.4.17-gnulib-ppc64le.patch
# Patch1: Fixes FTBFS, already upstream
Patch1: m4-1.4.17-perl-make-check.patch
Requires(post): /sbin/install-info
Requires(preun): /sbin/install-info
BuildRequires: autoconf automake
@ -34,8 +29,6 @@ Install m4 if you need a macro processor.
%prep
%setup -q
%patch0 -p1 -b .gnulib-ppc64le
%patch1 -p1 -b .perl-make-check
chmod 644 COPYING
%build
@ -69,6 +62,10 @@ if [ "$1" = 0 ]; then
fi
%changelog
* Mon Jan 02 2017 Vitezslav Crhonek <vcrhonek@redhat.com> - 1.4.18-1
- Update to m4-1.4.18
Resolves: #1409340
* Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 1.4.17-9
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild

View File

@ -1,2 +1,2 @@
12a3c829301a4fd6586a57d3fcf196dc m4-1.4.17.tar.xz
5e527428642699b78076bf14c1857331 m4-1.4.17.tar.xz.sig
SHA512 (m4-1.4.18.tar.xz) = 06f583efc3855cd8477d8347544f4ae5153a3e50aea74d21968afa7214784ea3ddfc02d0a2b11324120d76a19f2e804d20de11a456b5da929eb6ae469519b174
SHA512 (m4-1.4.18.tar.xz.sig) = effc857a19f1496d6dde2887c0314b37d4b142a435e77614936c730878c798491ad93b28860dddd2601f99a43fa41923729b961004faafc6f798f7bc1842f980