From 71b7acb528b574af7af634f229387c280a9ea67cbb5dc9f626b908fd9007a230 Mon Sep 17 00:00:00 2001 From: Philipp Thomas Date: Thu, 13 Sep 2012 10:00:12 +0000 Subject: [PATCH 1/5] Accepting request 133690 from home:posophe:branches:devel:tools:building Update to 1.12.3 OBS-URL: https://build.opensuse.org/request/show/133690 OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/automake?expand=0&rev=21 --- automake-1.12.1.tar.xz | 3 --- automake-1.12.3.tar.xz | 3 +++ automake-add-mkdir_p-temporarly.patch | 12 ------------ automake.changes | 16 ++++++++++++++++ automake.spec | 7 +------ 5 files changed, 20 insertions(+), 21 deletions(-) delete mode 100644 automake-1.12.1.tar.xz create mode 100644 automake-1.12.3.tar.xz delete mode 100644 automake-add-mkdir_p-temporarly.patch diff --git a/automake-1.12.1.tar.xz b/automake-1.12.1.tar.xz deleted file mode 100644 index 734a969..0000000 --- a/automake-1.12.1.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:32750869b24ac2a25765215fdf75c349aabf9465e436de2351602e1aca5c173f -size 1352384 diff --git a/automake-1.12.3.tar.xz b/automake-1.12.3.tar.xz new file mode 100644 index 0000000..44467e1 --- /dev/null +++ b/automake-1.12.3.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c4207b057b97ab771be61b73b8f848c31fb9f0c3bb204a7f1aca5bbeff41eb5a +size 1378784 diff --git a/automake-add-mkdir_p-temporarly.patch b/automake-add-mkdir_p-temporarly.patch deleted file mode 100644 index dab934c..0000000 --- a/automake-add-mkdir_p-temporarly.patch +++ /dev/null @@ -1,12 +0,0 @@ -Index: automake-1.12.1/m4/init.m4 -=================================================================== ---- automake-1.12.1.orig/m4/init.m4 2012-06-01 15:47:10.000000000 +0200 -+++ automake-1.12.1/m4/init.m4 2012-06-01 15:47:10.000000000 +0200 -@@ -82,6 +82,7 @@ AM_MISSING_PROG([MAKEINFO], [makeinfo]) - AC_REQUIRE([AM_PROG_INSTALL_SH])dnl - AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl - AC_REQUIRE([AC_PROG_MKDIR_P])dnl -+AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl - # We need awk for the "check" target. The system "awk" is bad on - # some platforms. - AC_REQUIRE([AC_PROG_AWK])dnl diff --git a/automake.changes b/automake.changes index 56afc3c..fc2daeb 100644 --- a/automake.changes +++ b/automake.changes @@ -1,3 +1,19 @@ +------------------------------------------------------------------- +Tue Sep 11 17:34:05 UTC 2012 - p.drouand@gmail.com + +- Update to 1.12.3: + - reworks and reshuffles the Automake testsuite a bit; fixing some + weaknesses and spurious failures in the process, but also, likely, + introducing new ones; + + - introduces initial support for automatic dependency tracking with + the Portland Group C/C++ compilers (thanks to Dave Goodell and + Jeff A. Daily); + + - fixes several long-standing bugs and limitations in the 'ylwrap' + script (thanks to Akim Demaille); among the other things, the + long-standing PR/491 and automake bug#7648 are now fixed. + ------------------------------------------------------------------- Wed Jul 4 07:21:17 UTC 2012 - coolo@suse.com diff --git a/automake.spec b/automake.spec index 35daaed..c66e00c 100644 --- a/automake.spec +++ b/automake.spec @@ -31,7 +31,7 @@ Requires: flex %endif Requires: autoconf >= 2.69 Requires: info -Version: 1.12.1 +Version: 1.12.3 Release: 0 Summary: A Program for Automatically Generating GNU-Style Makefile.in Files License: GPL-2.0+ @@ -42,10 +42,6 @@ Source: automake-%{version}.tar.xz Source1: automake-rpmlintrc Patch1: automake-SuSE.patch Patch3: automake-require_file.patch -# this patch makes sure packages that do not call AM_PROG_MKDIR, but use $(mkdir_p) work -# this patch should be removed after 12.2 is done, packages need to be fixed to use $(MKDIR_P) -# or avoid autoreconf at all -Patch4: automake-add-mkdir_p-temporarly.patch BuildArch: noarch %description @@ -58,7 +54,6 @@ definitions (with rules occasionally thrown in). The generated %setup -q -n automake-%{version} %patch1 %patch3 -%patch4 -p1 %build sh bootstrap.sh From fe1d9fcdd0d4fa3e58904741c1a8ddfd62eb9aeff675c7b42782bb576807b242 Mon Sep 17 00:00:00 2001 From: Philipp Thomas Date: Thu, 13 Sep 2012 10:30:30 +0000 Subject: [PATCH 2/5] - Run pre_checkin.sh to sync automake-testsuite pec and .changes. - Update to 1.12.3: - reworks and reshuffles the Automake testsuite a bit; fixing some weaknesses and spurious failures in the process, but also, likely, introducing new ones; - introduces initial support for automatic dependency tracking with the Portland Group C/C++ compilers (thanks to Dave Goodell and Jeff A. Daily); - fixes several long-standing bugs and limitations in the 'ylwrap' script (thanks to Akim Demaille); among the other things, the long-standing PR/491 and automake bug#7648 are now fixed. - make sure we still define $(mkdir_p) for the time being - Run pre_checkin.sh to sync automake-testsuite pec and .changes. OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/automake?expand=0&rev=22 --- automake-testsuite.changes | 26 ++++++++++++++++++++++++++ automake-testsuite.spec | 11 ++++++++--- automake.changes | 5 +++++ automake.spec | 4 ++++ 4 files changed, 43 insertions(+), 3 deletions(-) diff --git a/automake-testsuite.changes b/automake-testsuite.changes index ea7c8f9..36a2851 100644 --- a/automake-testsuite.changes +++ b/automake-testsuite.changes @@ -1,3 +1,29 @@ +------------------------------------------------------------------- +Thu Sep 13 12:29:33 CEST 2012 - pth@suse.de + +- Run pre_checkin.sh to sync automake-testsuite pec and .changes. + +------------------------------------------------------------------- +Tue Sep 11 17:34:05 UTC 2012 - p.drouand@gmail.com + +- Update to 1.12.3: + - reworks and reshuffles the Automake testsuite a bit; fixing some + weaknesses and spurious failures in the process, but also, likely, + introducing new ones; + + - introduces initial support for automatic dependency tracking with + the Portland Group C/C++ compilers (thanks to Dave Goodell and + Jeff A. Daily); + + - fixes several long-standing bugs and limitations in the 'ylwrap' + script (thanks to Akim Demaille); among the other things, the + long-standing PR/491 and automake bug#7648 are now fixed. + +------------------------------------------------------------------- +Wed Jul 4 07:21:17 UTC 2012 - coolo@suse.com + +- make sure we still define $(mkdir_p) for the time being + ------------------------------------------------------------------- Wed Jun 27 15:46:00 UTC 2012 - tom.mbrt@googlemail.com diff --git a/automake-testsuite.spec b/automake-testsuite.spec index 735d106..08f2a43 100644 --- a/automake-testsuite.spec +++ b/automake-testsuite.spec @@ -16,8 +16,12 @@ # +# PLEASE run pre_checkin.sh in this directory before submitting +# this package. Otherwise the .spec and .changes for automake-testsuite +# aren't updated. + Name: automake-testsuite -BuildRequires: autoconf +BuildRequires: autoconf >= 2.69 BuildRequires: bison BuildRequires: gcc-c++ BuildRequires: gcc-fortran @@ -29,9 +33,9 @@ Requires: libtool BuildRequires: flex Requires: flex %endif -Requires: autoconf >= 2.62 +Requires: autoconf >= 2.69 Requires: info -Version: 1.12.1 +Version: 1.12.3 Release: 0 Summary: A Program for Automatically Generating GNU-Style Makefile.in Files License: GPL-2.0+ @@ -56,6 +60,7 @@ definitions (with rules occasionally thrown in). The generated %patch3 %build +sh bootstrap.sh %configure --docdir=%{_docdir}/%{name} make %{?_smp_mflags} diff --git a/automake.changes b/automake.changes index fc2daeb..36a2851 100644 --- a/automake.changes +++ b/automake.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Sep 13 12:29:33 CEST 2012 - pth@suse.de + +- Run pre_checkin.sh to sync automake-testsuite pec and .changes. + ------------------------------------------------------------------- Tue Sep 11 17:34:05 UTC 2012 - p.drouand@gmail.com diff --git a/automake.spec b/automake.spec index c66e00c..2bfaaaf 100644 --- a/automake.spec +++ b/automake.spec @@ -16,6 +16,10 @@ # +# PLEASE run pre_checkin.sh in this directory before submitting +# this package. Otherwise the .spec and .changes for automake-testsuite +# aren't updated. + Name: automake BuildRequires: autoconf >= 2.69 BuildRequires: bison From fc1dbd958e1eebfc7c8af0e16ce8d23ea504bf82c5b51619881caf58e2a509f8 Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Sat, 2 Feb 2013 09:04:34 +0000 Subject: [PATCH 3/5] - update config.guess/sub to the latest state OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/automake?expand=0&rev=23 --- automake-SuSE.patch | 64 +++++--- automake-require_file.patch | 6 +- automake-testsuite.spec | 2 +- automake.changes | 5 + automake.spec | 10 +- config-guess-sub-update.diff | 297 +++++++++++++++++++++++++++++++++++ 6 files changed, 352 insertions(+), 32 deletions(-) create mode 100644 config-guess-sub-update.diff diff --git a/automake-SuSE.patch b/automake-SuSE.patch index b20fab6..10618d7 100644 --- a/automake-SuSE.patch +++ b/automake-SuSE.patch @@ -1,6 +1,8 @@ ---- lib/config.guess.orig 2012-04-06 12:31:44.062249033 -0400 -+++ lib/config.guess 2012-04-06 12:59:56.696088199 -0400 -@@ -138,6 +138,16 @@ +Index: lib/config.guess +=================================================================== +--- lib/config.guess.orig ++++ lib/config.guess +@@ -136,6 +136,16 @@ UNAME_RELEASE=`(uname -r) 2>/dev/null` | UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown @@ -17,7 +19,12 @@ # Note: order is significant - the case branches are not exclusive. case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in -@@ -202,19 +212,19 @@ +@@ -200,23 +210,23 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$ + exit ;; + *:Bitrig:*:*) + UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'` +- echo ${UNAME_MACHINE_ARCH}-unknown-bitrig${UNAME_RELEASE} ++ echo ${UNAME_MACHINE_ARCH}-${VENDOR}-bitrig${UNAME_RELEASE} exit ;; *:OpenBSD:*:*) UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'` @@ -42,7 +49,7 @@ exit ;; alpha:OSF1:*:*) case $UNAME_RELEASE in -@@ -282,13 +292,13 @@ +@@ -284,13 +294,13 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$ echo alpha-dec-winnt3.5 exit ;; Amiga*:UNIX_System_V:4.0:*) @@ -59,16 +66,16 @@ exit ;; *:OS/390:*:*) echo i370-ibm-openedition -@@ -303,7 +313,7 @@ +@@ -305,7 +315,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$ echo arm-acorn-riscix${UNAME_RELEASE} exit ;; - arm:riscos:*:*|arm:RISCOS:*:*) + arm*:riscos:*:*|arm*:RISCOS:*:*) - echo arm-unknown-riscos + echo arm-${VENDOR}-riscos exit ;; SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*) echo hppa1.1-hitachi-hiuxmpp -@@ -411,7 +421,7 @@ +@@ -413,7 +423,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$ echo m68k-hades-mint${UNAME_RELEASE} exit ;; *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*) @@ -77,7 +84,7 @@ exit ;; m68k:machten:*:*) echo m68k-apple-machten${UNAME_RELEASE} -@@ -722,9 +732,9 @@ +@@ -724,9 +734,9 @@ EOF exit ;; i*86:OSF1:*:*) if [ -x /usr/sbin/sysversion ] ; then @@ -89,7 +96,7 @@ fi exit ;; parisc*:Lites*:*:*) -@@ -784,18 +794,18 @@ +@@ -786,18 +796,18 @@ EOF echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE} exit ;; sparc*:BSD/OS:*:*) @@ -112,7 +119,7 @@ esac exit ;; i*:CYGWIN*:*) -@@ -820,10 +830,10 @@ +@@ -825,10 +835,10 @@ EOF echo i586-pc-interix${UNAME_RELEASE} exit ;; authenticamd | genuineintel | EM64T) @@ -125,7 +132,7 @@ exit ;; esac ;; [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*) -@@ -842,31 +852,31 @@ +@@ -847,31 +857,31 @@ EOF echo ${UNAME_MACHINE}-pc-uwin exit ;; amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*) @@ -164,7 +171,7 @@ exit ;; alpha:Linux:*:*) case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in -@@ -880,26 +890,26 @@ +@@ -885,26 +895,26 @@ EOF esac objdump --private-headers /bin/sh | grep -q ld.so.1 if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi @@ -196,7 +203,7 @@ exit ;; cris:Linux:*:*) echo ${UNAME_MACHINE}-axis-linux-gnu -@@ -908,10 +918,10 @@ +@@ -913,10 +923,10 @@ EOF echo ${UNAME_MACHINE}-axis-linux-gnu exit ;; frv:Linux:*:*) @@ -209,7 +216,7 @@ exit ;; i*86:Linux:*:*) LIBC=gnu -@@ -925,13 +935,13 @@ +@@ -930,13 +940,13 @@ EOF echo "${UNAME_MACHINE}-pc-linux-${LIBC}" exit ;; ia64:Linux:*:*) @@ -226,7 +233,7 @@ exit ;; mips:Linux:*:* | mips64:Linux:*:*) eval $set_cc_for_build -@@ -950,54 +960,54 @@ +@@ -955,54 +965,54 @@ EOF #endif EOF eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'` @@ -296,7 +303,7 @@ exit ;; i*86:DYNIX/ptx:4*:*) # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. -@@ -1019,16 +1029,16 @@ +@@ -1024,16 +1034,16 @@ EOF echo ${UNAME_MACHINE}-pc-os2-emx exit ;; i*86:XTS-300:*:STOP) @@ -316,7 +323,7 @@ exit ;; i*86:*DOS:*:*) echo ${UNAME_MACHINE}-pc-msdosdjgpp -@@ -1048,7 +1058,7 @@ +@@ -1053,7 +1063,7 @@ EOF *Pentium) UNAME_MACHINE=i586 ;; *Pent*|*Celeron) UNAME_MACHINE=i686 ;; esac @@ -325,7 +332,7 @@ exit ;; i*86:*:3.2:*) if test -f /usr/options/cb.name; then -@@ -1087,7 +1097,7 @@ +@@ -1092,7 +1102,7 @@ EOF if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4 else # Add other i860-SVR4 vendors below as they are discovered. @@ -334,7 +341,7 @@ fi exit ;; mini*:CTIX:SYS*5:*) -@@ -1124,19 +1134,19 @@ +@@ -1129,19 +1139,19 @@ EOF /bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \ && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*) @@ -358,7 +365,7 @@ exit ;; SM[BE]S:UNIX_SV:*:*) echo mips-dde-sysv${UNAME_RELEASE} -@@ -1186,7 +1196,7 @@ +@@ -1191,7 +1201,7 @@ EOF if [ -d /usr/nec ]; then echo mips-nec-sysv${UNAME_RELEASE} else @@ -367,7 +374,16 @@ fi exit ;; BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only. -@@ -1280,13 +1290,13 @@ +@@ -1207,7 +1217,7 @@ EOF + echo i586-pc-haiku + exit ;; + x86_64:Haiku:*:*) +- echo x86_64-unknown-haiku ++ echo x86_64-${VENDOR}-haiku + exit ;; + SX-4:SUPER-UX:*:*) + echo sx4-nec-superux${UNAME_RELEASE} +@@ -1288,13 +1298,13 @@ EOF else UNAME_MACHINE="$cputype" fi @@ -384,7 +400,7 @@ exit ;; KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*) echo pdp10-dec-tops20 -@@ -1295,16 +1305,16 @@ +@@ -1303,16 +1313,16 @@ EOF echo pdp10-xkl-tops20 exit ;; *:TOPS-20:*:*) @@ -404,7 +420,7 @@ exit ;; *:*VMS:*:*) UNAME_MACHINE=`(uname -p) 2>/dev/null` -@@ -1326,7 +1336,7 @@ +@@ -1334,7 +1344,7 @@ EOF echo ${UNAME_MACHINE}-pc-aros exit ;; x86_64:VMkernel:*:*) diff --git a/automake-require_file.patch b/automake-require_file.patch index 2d46cc8..18960d8 100644 --- a/automake-require_file.patch +++ b/automake-require_file.patch @@ -1,8 +1,8 @@ Index: automake.in =================================================================== ---- automake.in.orig 2012-06-01 15:47:09.000000000 +0200 -+++ automake.in 2012-07-04 09:17:39.816973055 +0200 -@@ -7751,12 +7751,14 @@ sub required_file_check_or_copy ($$$) +--- automake.in.orig ++++ automake.in +@@ -7750,12 +7750,14 @@ sub required_file_check_or_copy ($$$) my $fullfile = "$dir/$file"; my $found_it = 0; my $dangling_sym = 0; diff --git a/automake-testsuite.spec b/automake-testsuite.spec index 08f2a43..09ef6cf 100644 --- a/automake-testsuite.spec +++ b/automake-testsuite.spec @@ -1,7 +1,7 @@ # # spec file for package automake-testsuite # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed diff --git a/automake.changes b/automake.changes index 36a2851..c557f89 100644 --- a/automake.changes +++ b/automake.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sat Feb 2 09:04:19 UTC 2013 - dmueller@suse.com + +- update config.guess/sub to the latest state + ------------------------------------------------------------------- Thu Sep 13 12:29:33 CEST 2012 - pth@suse.de diff --git a/automake.spec b/automake.spec index 2bfaaaf..f31f936 100644 --- a/automake.spec +++ b/automake.spec @@ -1,7 +1,7 @@ # # spec file for package automake # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -44,8 +44,9 @@ Url: http://www.gnu.org/software/automake BuildRoot: %{_tmppath}/%{name}-%{version}-build Source: automake-%{version}.tar.xz Source1: automake-rpmlintrc -Patch1: automake-SuSE.patch -Patch3: automake-require_file.patch +Patch1: config-guess-sub-update.diff +Patch2: automake-require_file.patch +Patch100: automake-SuSE.patch BuildArch: noarch %description @@ -57,7 +58,8 @@ definitions (with rules occasionally thrown in). The generated %prep %setup -q -n automake-%{version} %patch1 -%patch3 +%patch2 +%patch100 %build sh bootstrap.sh diff --git a/config-guess-sub-update.diff b/config-guess-sub-update.diff new file mode 100644 index 0000000..d6705c9 --- /dev/null +++ b/config-guess-sub-update.diff @@ -0,0 +1,297 @@ +--- lib/config.guess ++++ lib/config.guess +@@ -2,13 +2,13 @@ + # Attempt to guess a canonical system name. + # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, + # 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, +-# 2011, 2012 Free Software Foundation, Inc. ++# 2011, 2012, 2013 Free Software Foundation, Inc. + +-timestamp='2012-06-17' ++timestamp='2012-12-30' + + # This file is free software; you can redistribute it and/or modify it + # under the terms of the GNU General Public License as published by +-# the Free Software Foundation; either version 2 of the License, or ++# the Free Software Foundation; either version 3 of the License, or + # (at your option) any later version. + # + # This program is distributed in the hope that it will be useful, but +@@ -22,19 +22,17 @@ + # As a special exception to the GNU General Public License, if you + # distribute this file as part of a program that contains a + # configuration script generated by Autoconf, you may include it under +-# the same distribution terms that you use for the rest of that program. +- +- +-# Originally written by Per Bothner. Please send patches (context +-# diff format) to and include a ChangeLog +-# entry. ++# the same distribution terms that you use for the rest of that ++# program. This Exception is an additional permission under section 7 ++# of the GNU General Public License, version 3 ("GPLv3"). + # +-# This script attempts to guess a canonical system name similar to +-# config.sub. If it succeeds, it prints the system name on stdout, and +-# exits with 0. Otherwise, it exits with 1. ++# Originally written by Per Bothner. + # + # You can get the latest version of this script from: + # http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD ++# ++# Please send patches with a ChangeLog entry to config-patches@gnu.org. ++ + + me=`echo "$0" | sed -e 's,.*/,,'` + +@@ -55,8 +53,8 @@ + + Originally written by Per Bothner. + Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, +-2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 +-Free Software Foundation, Inc. ++2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, ++2012, 2013 Free Software Foundation, Inc. + + This is free software; see the source for copying conditions. There is NO + warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." +@@ -306,7 +304,7 @@ + arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) + echo arm-acorn-riscix${UNAME_RELEASE} + exit ;; +- arm:riscos:*:*|arm:RISCOS:*:*) ++ arm*:riscos:*:*|arm*:RISCOS:*:*) + echo arm-unknown-riscos + exit ;; + SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*) +@@ -805,6 +803,9 @@ + i*:CYGWIN*:*) + echo ${UNAME_MACHINE}-pc-cygwin + exit ;; ++ *:MINGW64*:*) ++ echo ${UNAME_MACHINE}-pc-mingw64 ++ exit ;; + *:MINGW*:*) + echo ${UNAME_MACHINE}-pc-mingw32 + exit ;; +@@ -1205,6 +1206,9 @@ + BePC:Haiku:*:*) # Haiku running on Intel PC compatible. + echo i586-pc-haiku + exit ;; ++ x86_64:Haiku:*:*) ++ echo x86_64-unknown-haiku ++ exit ;; + SX-4:SUPER-UX:*:*) + echo sx4-nec-superux${UNAME_RELEASE} + exit ;; +@@ -1334,9 +1338,6 @@ + exit ;; + esac + +-#echo '(No uname command or uname output not recognized.)' 1>&2 +-#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2 +- + eval $set_cc_for_build + cat >$dummy.c <. +@@ -26,11 +22,12 @@ + # As a special exception to the GNU General Public License, if you + # distribute this file as part of a program that contains a + # configuration script generated by Autoconf, you may include it under +-# the same distribution terms that you use for the rest of that program. ++# the same distribution terms that you use for the rest of that ++# program. This Exception is an additional permission under section 7 ++# of the GNU General Public License, version 3 ("GPLv3"). + + +-# Please send patches to . Submit a context +-# diff and a properly formatted GNU ChangeLog entry. ++# Please send patches with a ChangeLog entry to config-patches@gnu.org. + # + # Configuration subroutine to validate and canonicalize a configuration type. + # Supply the specified configuration type as an argument. +@@ -74,8 +71,8 @@ + GNU config.sub ($timestamp) + + Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, +-2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 +-Free Software Foundation, Inc. ++2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, ++2012, 2013 Free Software Foundation, Inc. + + This is free software; see the source for copying conditions. There is NO + warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." +@@ -123,7 +120,7 @@ + maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` + case $maybe_os in + nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \ +- linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \ ++ linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \ + knetbsd*-gnu* | netbsd*-gnu* | \ + kopensolaris*-gnu* | \ + storm-chaos* | os2-emx* | rtmk-nova*) +@@ -156,7 +153,7 @@ + -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\ + -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \ + -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \ +- -apple | -axis | -knuth | -cray | -microblaze) ++ -apple | -axis | -knuth | -cray | -microblaze*) + os= + basic_machine=$1 + ;; +@@ -259,8 +256,10 @@ + | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ + | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ + | am33_2.0 \ +- | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \ +- | be32 | be64 \ ++ | arc \ ++ | arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \ ++ | avr | avr32 \ ++ | be32 | be64 \ + | bfin \ + | c4x | clipper \ + | d10v | d30v | dlx | dsp16xx \ +@@ -273,7 +272,7 @@ + | le32 | le64 \ + | lm32 \ + | m32c | m32r | m32rle | m68000 | m68k | m88k \ +- | maxq | mb | microblaze | mcore | mep | metag \ ++ | maxq | mb | microblaze | microblazeel | mcore | mep | metag \ + | mips | mipsbe | mipseb | mipsel | mipsle \ + | mips16 \ + | mips64 | mips64el \ +@@ -291,13 +290,14 @@ + | mipsisa64r2 | mipsisa64r2el \ + | mipsisa64sb1 | mipsisa64sb1el \ + | mipsisa64sr71k | mipsisa64sr71kel \ ++ | mipsr5900 | mipsr5900el \ + | mipstx39 | mipstx39el \ + | mn10200 | mn10300 \ + | moxie \ + | mt \ + | msp430 \ + | nds32 | nds32le | nds32be \ +- | nios | nios2 \ ++ | nios | nios2 | nios2eb | nios2el \ + | ns16k | ns32k \ + | open8 \ + | or32 \ +@@ -389,7 +389,8 @@ + | lm32-* \ + | m32c-* | m32r-* | m32rle-* \ + | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ +- | m88110-* | m88k-* | maxq-* | mcore-* | metag-* | microblaze-* \ ++ | m88110-* | m88k-* | maxq-* | mcore-* | metag-* \ ++ | microblaze-* | microblazeel-* \ + | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ + | mips16-* \ + | mips64-* | mips64el-* \ +@@ -407,12 +408,13 @@ + | mipsisa64r2-* | mipsisa64r2el-* \ + | mipsisa64sb1-* | mipsisa64sb1el-* \ + | mipsisa64sr71k-* | mipsisa64sr71kel-* \ ++ | mipsr5900-* | mipsr5900el-* \ + | mipstx39-* | mipstx39el-* \ + | mmix-* \ + | mt-* \ + | msp430-* \ + | nds32-* | nds32le-* | nds32be-* \ +- | nios-* | nios2-* \ ++ | nios-* | nios2-* | nios2eb-* | nios2el-* \ + | none-* | np1-* | ns16k-* | ns32k-* \ + | open8-* \ + | orion-* \ +@@ -788,9 +790,13 @@ + basic_machine=ns32k-utek + os=-sysv + ;; +- microblaze) ++ microblaze*) + basic_machine=microblaze-xilinx + ;; ++ mingw64) ++ basic_machine=x86_64-pc ++ os=-mingw64 ++ ;; + mingw32) + basic_machine=i386-pc + os=-mingw32 +@@ -1019,7 +1025,11 @@ + basic_machine=i586-unknown + os=-pw32 + ;; +- rdos) ++ rdos | rdos64) ++ basic_machine=x86_64-pc ++ os=-rdos ++ ;; ++ rdos32) + basic_machine=i386-pc + os=-rdos + ;; +@@ -1346,7 +1356,7 @@ + -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \ + | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\ + | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \ +- | -sym* | -kopensolaris* \ ++ | -sym* | -kopensolaris* | -plan9* \ + | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \ + | -aos* | -aros* \ + | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ +@@ -1359,8 +1369,8 @@ + | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ + | -chorusos* | -chorusrdb* | -cegcc* \ + | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ +- | -mingw32* | -linux-gnu* | -linux-android* \ +- | -linux-newlib* | -linux-uclibc* \ ++ | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \ ++ | -linux-newlib* | -linux-musl* | -linux-uclibc* \ + | -uxpv* | -beos* | -mpeix* | -udk* \ + | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ + | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ +@@ -1492,9 +1502,6 @@ + -aros*) + os=-aros + ;; +- -kaos*) +- os=-kaos +- ;; + -zvmoe) + os=-zvmoe + ;; From aba586bf571cd49a8e86afd8dab4597bdb11b8f3b1941789c1acb475aadb6e08 Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Mon, 25 Feb 2013 09:21:00 +0000 Subject: [PATCH 4/5] Accepting request 155852 from home:posophe:branches:devel:tools:building Update OBS-URL: https://build.opensuse.org/request/show/155852 OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/automake?expand=0&rev=24 --- automake-1.12.3.tar.xz | 3 - automake-1.13.1.tar.xz | 3 + automake-testsuite.changes | 14 ++ automake-testsuite.spec | 16 +- automake.changes | 14 ++ automake.spec | 8 +- config-guess-sub-update.diff | 297 ----------------------------------- 7 files changed, 38 insertions(+), 317 deletions(-) delete mode 100644 automake-1.12.3.tar.xz create mode 100644 automake-1.13.1.tar.xz delete mode 100644 config-guess-sub-update.diff diff --git a/automake-1.12.3.tar.xz b/automake-1.12.3.tar.xz deleted file mode 100644 index 44467e1..0000000 --- a/automake-1.12.3.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c4207b057b97ab771be61b73b8f848c31fb9f0c3bb204a7f1aca5bbeff41eb5a -size 1378784 diff --git a/automake-1.13.1.tar.xz b/automake-1.13.1.tar.xz new file mode 100644 index 0000000..7ce74c5 --- /dev/null +++ b/automake-1.13.1.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6ecd6cf682e78e833361264263f0f9496949bfbae7f8366bc327de38ff0ad18b +size 1425080 diff --git a/automake-testsuite.changes b/automake-testsuite.changes index 36a2851..e6b35fa 100644 --- a/automake-testsuite.changes +++ b/automake-testsuite.changes @@ -1,3 +1,17 @@ +------------------------------------------------------------------- +Tue Feb 19 18:50:46 UTC 2013 - p.drouand@gmail.com + +- Update to version 1.13.1: + * Bugs fixed: + - Use of the obsolete macros AM_CONFIG_HEADER or AM_PROG_CC_STDC now + causes a clear and helpful error message, instead of obscure ones + (issue introduced in Automake 1.13). +- Remove config-guess-sub-update.diff; config.guess and config.sub are + not included anymore in /lib +- Clean the specfile; remove useless conditionnal macros +- Automake now provide manfiles by default and help2man is not required + anymore + ------------------------------------------------------------------- Thu Sep 13 12:29:33 CEST 2012 - pth@suse.de diff --git a/automake-testsuite.spec b/automake-testsuite.spec index 09ef6cf..6001876 100644 --- a/automake-testsuite.spec +++ b/automake-testsuite.spec @@ -1,5 +1,5 @@ # -# spec file for package automake-testsuite +# spec file for package automake # # Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -25,7 +25,6 @@ BuildRequires: autoconf >= 2.69 BuildRequires: bison BuildRequires: gcc-c++ BuildRequires: gcc-fortran -BuildRequires: help2man BuildRequires: xz %if "%{name}" == "automake-testsuite" BuildRequires: libtool @@ -35,7 +34,7 @@ Requires: flex %endif Requires: autoconf >= 2.69 Requires: info -Version: 1.12.3 +Version: 1.13.1 Release: 0 Summary: A Program for Automatically Generating GNU-Style Makefile.in Files License: GPL-2.0+ @@ -44,8 +43,8 @@ Url: http://www.gnu.org/software/automake BuildRoot: %{_tmppath}/%{name}-%{version}-build Source: automake-%{version}.tar.xz Source1: automake-rpmlintrc -Patch1: automake-SuSE.patch -Patch3: automake-require_file.patch +Patch2: automake-require_file.patch +Patch100: automake-SuSE.patch BuildArch: noarch %description @@ -56,8 +55,8 @@ definitions (with rules occasionally thrown in). The generated %prep %setup -q -n automake-%{version} -%patch1 -%patch3 +%patch2 +%patch100 %build sh bootstrap.sh @@ -80,9 +79,6 @@ make install DESTDIR=%{buildroot} mkdir -p %{buildroot}/etc %{buildroot}/usr/share/aclocal echo /usr/local/share/aclocal >%{buildroot}/etc/aclocal_dirlist ln -s ../../../etc/aclocal_dirlist %{buildroot}/usr/share/aclocal/dirlist -mkdir -p %{buildroot}%{_mandir}/man1 -perllibdir=lib help2man -S FSF ./aclocal > %{buildroot}%{_mandir}/man1/aclocal.1 -perllibdir=lib help2man -S FSF ./automake > %{buildroot}%{_mandir}/man1/automake.1 install -m644 AUTHORS COPYING ChangeLog NEWS README THANKS %{buildroot}%{_docdir}/%{name} # info's dir file is not auto ignored on some systems rm -rf %{buildroot}%{_infodir}/dir diff --git a/automake.changes b/automake.changes index c557f89..af238f2 100644 --- a/automake.changes +++ b/automake.changes @@ -1,3 +1,17 @@ +------------------------------------------------------------------- +Tue Feb 19 18:50:46 UTC 2013 - p.drouand@gmail.com + +- Update to version 1.13.1: + * Bugs fixed: + - Use of the obsolete macros AM_CONFIG_HEADER or AM_PROG_CC_STDC now + causes a clear and helpful error message, instead of obscure ones + (issue introduced in Automake 1.13). +- Remove config-guess-sub-update.diff; config.guess and config.sub are + not included anymore in /lib +- Clean the specfile; remove useless conditionnal macros +- Automake now provide manfiles by default and help2man is not required + anymore + ------------------------------------------------------------------- Sat Feb 2 09:04:19 UTC 2013 - dmueller@suse.com diff --git a/automake.spec b/automake.spec index f31f936..6002b50 100644 --- a/automake.spec +++ b/automake.spec @@ -25,7 +25,6 @@ BuildRequires: autoconf >= 2.69 BuildRequires: bison BuildRequires: gcc-c++ BuildRequires: gcc-fortran -BuildRequires: help2man BuildRequires: xz %if "%{name}" == "automake-testsuite" BuildRequires: libtool @@ -35,7 +34,7 @@ Requires: flex %endif Requires: autoconf >= 2.69 Requires: info -Version: 1.12.3 +Version: 1.13.1 Release: 0 Summary: A Program for Automatically Generating GNU-Style Makefile.in Files License: GPL-2.0+ @@ -44,7 +43,6 @@ Url: http://www.gnu.org/software/automake BuildRoot: %{_tmppath}/%{name}-%{version}-build Source: automake-%{version}.tar.xz Source1: automake-rpmlintrc -Patch1: config-guess-sub-update.diff Patch2: automake-require_file.patch Patch100: automake-SuSE.patch BuildArch: noarch @@ -57,7 +55,6 @@ definitions (with rules occasionally thrown in). The generated %prep %setup -q -n automake-%{version} -%patch1 %patch2 %patch100 @@ -82,9 +79,6 @@ make install DESTDIR=%{buildroot} mkdir -p %{buildroot}/etc %{buildroot}/usr/share/aclocal echo /usr/local/share/aclocal >%{buildroot}/etc/aclocal_dirlist ln -s ../../../etc/aclocal_dirlist %{buildroot}/usr/share/aclocal/dirlist -mkdir -p %{buildroot}%{_mandir}/man1 -perllibdir=lib help2man -S FSF ./aclocal > %{buildroot}%{_mandir}/man1/aclocal.1 -perllibdir=lib help2man -S FSF ./automake > %{buildroot}%{_mandir}/man1/automake.1 install -m644 AUTHORS COPYING ChangeLog NEWS README THANKS %{buildroot}%{_docdir}/%{name} # info's dir file is not auto ignored on some systems rm -rf %{buildroot}%{_infodir}/dir diff --git a/config-guess-sub-update.diff b/config-guess-sub-update.diff deleted file mode 100644 index d6705c9..0000000 --- a/config-guess-sub-update.diff +++ /dev/null @@ -1,297 +0,0 @@ ---- lib/config.guess -+++ lib/config.guess -@@ -2,13 +2,13 @@ - # Attempt to guess a canonical system name. - # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, - # 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, --# 2011, 2012 Free Software Foundation, Inc. -+# 2011, 2012, 2013 Free Software Foundation, Inc. - --timestamp='2012-06-17' -+timestamp='2012-12-30' - - # This file is free software; you can redistribute it and/or modify it - # under the terms of the GNU General Public License as published by --# the Free Software Foundation; either version 2 of the License, or -+# the Free Software Foundation; either version 3 of the License, or - # (at your option) any later version. - # - # This program is distributed in the hope that it will be useful, but -@@ -22,19 +22,17 @@ - # As a special exception to the GNU General Public License, if you - # distribute this file as part of a program that contains a - # configuration script generated by Autoconf, you may include it under --# the same distribution terms that you use for the rest of that program. -- -- --# Originally written by Per Bothner. Please send patches (context --# diff format) to and include a ChangeLog --# entry. -+# the same distribution terms that you use for the rest of that -+# program. This Exception is an additional permission under section 7 -+# of the GNU General Public License, version 3 ("GPLv3"). - # --# This script attempts to guess a canonical system name similar to --# config.sub. If it succeeds, it prints the system name on stdout, and --# exits with 0. Otherwise, it exits with 1. -+# Originally written by Per Bothner. - # - # You can get the latest version of this script from: - # http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD -+# -+# Please send patches with a ChangeLog entry to config-patches@gnu.org. -+ - - me=`echo "$0" | sed -e 's,.*/,,'` - -@@ -55,8 +53,8 @@ - - Originally written by Per Bothner. - Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, --2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 --Free Software Foundation, Inc. -+2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, -+2012, 2013 Free Software Foundation, Inc. - - This is free software; see the source for copying conditions. There is NO - warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." -@@ -306,7 +304,7 @@ - arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) - echo arm-acorn-riscix${UNAME_RELEASE} - exit ;; -- arm:riscos:*:*|arm:RISCOS:*:*) -+ arm*:riscos:*:*|arm*:RISCOS:*:*) - echo arm-unknown-riscos - exit ;; - SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*) -@@ -805,6 +803,9 @@ - i*:CYGWIN*:*) - echo ${UNAME_MACHINE}-pc-cygwin - exit ;; -+ *:MINGW64*:*) -+ echo ${UNAME_MACHINE}-pc-mingw64 -+ exit ;; - *:MINGW*:*) - echo ${UNAME_MACHINE}-pc-mingw32 - exit ;; -@@ -1205,6 +1206,9 @@ - BePC:Haiku:*:*) # Haiku running on Intel PC compatible. - echo i586-pc-haiku - exit ;; -+ x86_64:Haiku:*:*) -+ echo x86_64-unknown-haiku -+ exit ;; - SX-4:SUPER-UX:*:*) - echo sx4-nec-superux${UNAME_RELEASE} - exit ;; -@@ -1334,9 +1338,6 @@ - exit ;; - esac - --#echo '(No uname command or uname output not recognized.)' 1>&2 --#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2 -- - eval $set_cc_for_build - cat >$dummy.c <. -@@ -26,11 +22,12 @@ - # As a special exception to the GNU General Public License, if you - # distribute this file as part of a program that contains a - # configuration script generated by Autoconf, you may include it under --# the same distribution terms that you use for the rest of that program. -+# the same distribution terms that you use for the rest of that -+# program. This Exception is an additional permission under section 7 -+# of the GNU General Public License, version 3 ("GPLv3"). - - --# Please send patches to . Submit a context --# diff and a properly formatted GNU ChangeLog entry. -+# Please send patches with a ChangeLog entry to config-patches@gnu.org. - # - # Configuration subroutine to validate and canonicalize a configuration type. - # Supply the specified configuration type as an argument. -@@ -74,8 +71,8 @@ - GNU config.sub ($timestamp) - - Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, --2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 --Free Software Foundation, Inc. -+2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, -+2012, 2013 Free Software Foundation, Inc. - - This is free software; see the source for copying conditions. There is NO - warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." -@@ -123,7 +120,7 @@ - maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` - case $maybe_os in - nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \ -- linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \ -+ linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \ - knetbsd*-gnu* | netbsd*-gnu* | \ - kopensolaris*-gnu* | \ - storm-chaos* | os2-emx* | rtmk-nova*) -@@ -156,7 +153,7 @@ - -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\ - -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \ - -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \ -- -apple | -axis | -knuth | -cray | -microblaze) -+ -apple | -axis | -knuth | -cray | -microblaze*) - os= - basic_machine=$1 - ;; -@@ -259,8 +256,10 @@ - | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ - | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ - | am33_2.0 \ -- | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \ -- | be32 | be64 \ -+ | arc \ -+ | arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \ -+ | avr | avr32 \ -+ | be32 | be64 \ - | bfin \ - | c4x | clipper \ - | d10v | d30v | dlx | dsp16xx \ -@@ -273,7 +272,7 @@ - | le32 | le64 \ - | lm32 \ - | m32c | m32r | m32rle | m68000 | m68k | m88k \ -- | maxq | mb | microblaze | mcore | mep | metag \ -+ | maxq | mb | microblaze | microblazeel | mcore | mep | metag \ - | mips | mipsbe | mipseb | mipsel | mipsle \ - | mips16 \ - | mips64 | mips64el \ -@@ -291,13 +290,14 @@ - | mipsisa64r2 | mipsisa64r2el \ - | mipsisa64sb1 | mipsisa64sb1el \ - | mipsisa64sr71k | mipsisa64sr71kel \ -+ | mipsr5900 | mipsr5900el \ - | mipstx39 | mipstx39el \ - | mn10200 | mn10300 \ - | moxie \ - | mt \ - | msp430 \ - | nds32 | nds32le | nds32be \ -- | nios | nios2 \ -+ | nios | nios2 | nios2eb | nios2el \ - | ns16k | ns32k \ - | open8 \ - | or32 \ -@@ -389,7 +389,8 @@ - | lm32-* \ - | m32c-* | m32r-* | m32rle-* \ - | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ -- | m88110-* | m88k-* | maxq-* | mcore-* | metag-* | microblaze-* \ -+ | m88110-* | m88k-* | maxq-* | mcore-* | metag-* \ -+ | microblaze-* | microblazeel-* \ - | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ - | mips16-* \ - | mips64-* | mips64el-* \ -@@ -407,12 +408,13 @@ - | mipsisa64r2-* | mipsisa64r2el-* \ - | mipsisa64sb1-* | mipsisa64sb1el-* \ - | mipsisa64sr71k-* | mipsisa64sr71kel-* \ -+ | mipsr5900-* | mipsr5900el-* \ - | mipstx39-* | mipstx39el-* \ - | mmix-* \ - | mt-* \ - | msp430-* \ - | nds32-* | nds32le-* | nds32be-* \ -- | nios-* | nios2-* \ -+ | nios-* | nios2-* | nios2eb-* | nios2el-* \ - | none-* | np1-* | ns16k-* | ns32k-* \ - | open8-* \ - | orion-* \ -@@ -788,9 +790,13 @@ - basic_machine=ns32k-utek - os=-sysv - ;; -- microblaze) -+ microblaze*) - basic_machine=microblaze-xilinx - ;; -+ mingw64) -+ basic_machine=x86_64-pc -+ os=-mingw64 -+ ;; - mingw32) - basic_machine=i386-pc - os=-mingw32 -@@ -1019,7 +1025,11 @@ - basic_machine=i586-unknown - os=-pw32 - ;; -- rdos) -+ rdos | rdos64) -+ basic_machine=x86_64-pc -+ os=-rdos -+ ;; -+ rdos32) - basic_machine=i386-pc - os=-rdos - ;; -@@ -1346,7 +1356,7 @@ - -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \ - | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\ - | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \ -- | -sym* | -kopensolaris* \ -+ | -sym* | -kopensolaris* | -plan9* \ - | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \ - | -aos* | -aros* \ - | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ -@@ -1359,8 +1369,8 @@ - | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ - | -chorusos* | -chorusrdb* | -cegcc* \ - | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ -- | -mingw32* | -linux-gnu* | -linux-android* \ -- | -linux-newlib* | -linux-uclibc* \ -+ | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \ -+ | -linux-newlib* | -linux-musl* | -linux-uclibc* \ - | -uxpv* | -beos* | -mpeix* | -udk* \ - | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ - | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ -@@ -1492,9 +1502,6 @@ - -aros*) - os=-aros - ;; -- -kaos*) -- os=-kaos -- ;; - -zvmoe) - os=-zvmoe - ;; From aaa72c19fe83c94127c4b377d9c253646e43ec9e9af72676d95547891ab1507d Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Mon, 25 Feb 2013 21:28:52 +0000 Subject: [PATCH 5/5] - Remove - Remove automake-add-mkdir_p-temporarly.patch: * Only temporary hack for openSUSE 12.2, now it is time to remove it OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/automake?expand=0&rev=25 --- automake-testsuite.spec | 2 +- automake.changes | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/automake-testsuite.spec b/automake-testsuite.spec index 6001876..7f7fa9c 100644 --- a/automake-testsuite.spec +++ b/automake-testsuite.spec @@ -1,5 +1,5 @@ # -# spec file for package automake +# spec file for package automake-testsuite # # Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # diff --git a/automake.changes b/automake.changes index af238f2..5ee81c2 100644 --- a/automake.changes +++ b/automake.changes @@ -8,6 +8,7 @@ Tue Feb 19 18:50:46 UTC 2013 - p.drouand@gmail.com (issue introduced in Automake 1.13). - Remove config-guess-sub-update.diff; config.guess and config.sub are not included anymore in /lib +- Remove - Clean the specfile; remove useless conditionnal macros - Automake now provide manfiles by default and help2man is not required anymore @@ -37,6 +38,8 @@ Tue Sep 11 17:34:05 UTC 2012 - p.drouand@gmail.com - fixes several long-standing bugs and limitations in the 'ylwrap' script (thanks to Akim Demaille); among the other things, the long-standing PR/491 and automake bug#7648 are now fixed. +- Remove automake-add-mkdir_p-temporarly.patch: + * Only temporary hack for openSUSE 12.2, now it is time to remove it ------------------------------------------------------------------- Wed Jul 4 07:21:17 UTC 2012 - coolo@suse.com