From aba586bf571cd49a8e86afd8dab4597bdb11b8f3b1941789c1acb475aadb6e08 Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Mon, 25 Feb 2013 09:21:00 +0000 Subject: [PATCH] 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 - ;;