Hello community, here is the log from the commit of package automake for openSUSE:Factory checked in at 2013-02-27 06:42:22 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/automake (Old) and /work/SRC/openSUSE:Factory/.automake.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "automake", Maintainer is "pth@suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/automake/automake-testsuite.changes 2013-02-26 15:13:08.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.automake.new/automake-testsuite.changes 2013-02-27 06:42:23.000000000 +0100 @@ -2,40 +1,0 @@ -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 - -- 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 - -------------------------------------------------------------------- automake.changes: same change Old: ---- automake-1.13.1.tar.xz New: ---- automake-1.12.1.tar.xz automake-add-mkdir_p-temporarly.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ automake-testsuite.spec ++++++ --- /var/tmp/diff_new_pack.oF3wmq/_old 2013-02-27 06:42:26.000000000 +0100 +++ /var/tmp/diff_new_pack.oF3wmq/_new 2013-02-27 06:42:26.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package automake-testsuite # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 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 @@ -16,15 +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 >= 2.69 +BuildRequires: autoconf BuildRequires: bison BuildRequires: gcc-c++ BuildRequires: gcc-fortran +BuildRequires: help2man BuildRequires: xz %if "%{name}" == "automake-testsuite" BuildRequires: libtool @@ -32,9 +29,9 @@ BuildRequires: flex Requires: flex %endif -Requires: autoconf >= 2.69 +Requires: autoconf >= 2.62 Requires: info -Version: 1.13.1 +Version: 1.12.1 Release: 0 Summary: A Program for Automatically Generating GNU-Style Makefile.in Files License: GPL-2.0+ @@ -43,8 +40,8 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build Source: automake-%{version}.tar.xz Source1: automake-rpmlintrc -Patch2: automake-require_file.patch -Patch100: automake-SuSE.patch +Patch1: automake-SuSE.patch +Patch3: automake-require_file.patch BuildArch: noarch %description @@ -55,11 +52,10 @@ %prep %setup -q -n automake-%{version} -%patch2 -%patch100 +%patch1 +%patch3 %build -sh bootstrap.sh %configure --docdir=%{_docdir}/%{name} make %{?_smp_mflags} @@ -79,6 +75,9 @@ 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 ++++++ automake.spec ++++++ --- /var/tmp/diff_new_pack.oF3wmq/_old 2013-02-27 06:42:26.000000000 +0100 +++ /var/tmp/diff_new_pack.oF3wmq/_new 2013-02-27 06:42:26.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package automake # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 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 @@ -16,15 +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 BuildRequires: autoconf >= 2.69 BuildRequires: bison BuildRequires: gcc-c++ BuildRequires: gcc-fortran +BuildRequires: help2man BuildRequires: xz %if "%{name}" == "automake-testsuite" BuildRequires: libtool @@ -34,7 +31,7 @@ %endif Requires: autoconf >= 2.69 Requires: info -Version: 1.13.1 +Version: 1.12.1 Release: 0 Summary: A Program for Automatically Generating GNU-Style Makefile.in Files License: GPL-2.0+ @@ -43,8 +40,12 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build Source: automake-%{version}.tar.xz Source1: automake-rpmlintrc -Patch2: automake-require_file.patch -Patch100: automake-SuSE.patch +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 @@ -55,8 +56,9 @@ %prep %setup -q -n automake-%{version} -%patch2 -%patch100 +%patch1 +%patch3 +%patch4 -p1 %build sh bootstrap.sh @@ -79,6 +81,9 @@ 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 ++++++ automake-SuSE.patch ++++++ --- /var/tmp/diff_new_pack.oF3wmq/_old 2013-02-27 06:42:26.000000000 +0100 +++ /var/tmp/diff_new_pack.oF3wmq/_new 2013-02-27 06:42:26.000000000 +0100 @@ -1,8 +1,6 @@ -Index: lib/config.guess -=================================================================== ---- lib/config.guess.orig -+++ lib/config.guess -@@ -136,6 +136,16 @@ UNAME_RELEASE=`(uname -r) 2>/dev/null` | +--- 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 @@ UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown @@ -19,12 +17,7 @@ # Note: order is significant - the case branches are not exclusive. case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in -@@ -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} +@@ -202,19 +212,19 @@ exit ;; *:OpenBSD:*:*) UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'` @@ -49,7 +42,7 @@ exit ;; alpha:OSF1:*:*) case $UNAME_RELEASE in -@@ -284,13 +294,13 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$ +@@ -282,13 +292,13 @@ echo alpha-dec-winnt3.5 exit ;; Amiga*:UNIX_System_V:4.0:*) @@ -66,16 +59,16 @@ exit ;; *:OS/390:*:*) echo i370-ibm-openedition -@@ -305,7 +315,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$ +@@ -303,7 +313,7 @@ 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 -@@ -413,7 +423,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$ +@@ -411,7 +421,7 @@ echo m68k-hades-mint${UNAME_RELEASE} exit ;; *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*) @@ -84,7 +77,7 @@ exit ;; m68k:machten:*:*) echo m68k-apple-machten${UNAME_RELEASE} -@@ -724,9 +734,9 @@ EOF +@@ -722,9 +732,9 @@ exit ;; i*86:OSF1:*:*) if [ -x /usr/sbin/sysversion ] ; then @@ -96,7 +89,7 @@ fi exit ;; parisc*:Lites*:*:*) -@@ -786,18 +796,18 @@ EOF +@@ -784,18 +794,18 @@ echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE} exit ;; sparc*:BSD/OS:*:*) @@ -119,7 +112,7 @@ esac exit ;; i*:CYGWIN*:*) -@@ -825,10 +835,10 @@ EOF +@@ -820,10 +830,10 @@ echo i586-pc-interix${UNAME_RELEASE} exit ;; authenticamd | genuineintel | EM64T) @@ -132,7 +125,7 @@ exit ;; esac ;; [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*) -@@ -847,31 +857,31 @@ EOF +@@ -842,31 +852,31 @@ echo ${UNAME_MACHINE}-pc-uwin exit ;; amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*) @@ -171,7 +164,7 @@ exit ;; alpha:Linux:*:*) case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in -@@ -885,26 +895,26 @@ EOF +@@ -880,26 +890,26 @@ esac objdump --private-headers /bin/sh | grep -q ld.so.1 if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi @@ -203,7 +196,7 @@ exit ;; cris:Linux:*:*) echo ${UNAME_MACHINE}-axis-linux-gnu -@@ -913,10 +923,10 @@ EOF +@@ -908,10 +918,10 @@ echo ${UNAME_MACHINE}-axis-linux-gnu exit ;; frv:Linux:*:*) @@ -216,7 +209,7 @@ exit ;; i*86:Linux:*:*) LIBC=gnu -@@ -930,13 +940,13 @@ EOF +@@ -925,13 +935,13 @@ echo "${UNAME_MACHINE}-pc-linux-${LIBC}" exit ;; ia64:Linux:*:*) @@ -233,7 +226,7 @@ exit ;; mips:Linux:*:* | mips64:Linux:*:*) eval $set_cc_for_build -@@ -955,54 +965,54 @@ EOF +@@ -950,54 +960,54 @@ #endif EOF eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'` @@ -303,7 +296,7 @@ exit ;; i*86:DYNIX/ptx:4*:*) # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. -@@ -1024,16 +1034,16 @@ EOF +@@ -1019,16 +1029,16 @@ echo ${UNAME_MACHINE}-pc-os2-emx exit ;; i*86:XTS-300:*:STOP) @@ -323,7 +316,7 @@ exit ;; i*86:*DOS:*:*) echo ${UNAME_MACHINE}-pc-msdosdjgpp -@@ -1053,7 +1063,7 @@ EOF +@@ -1048,7 +1058,7 @@ *Pentium) UNAME_MACHINE=i586 ;; *Pent*|*Celeron) UNAME_MACHINE=i686 ;; esac @@ -332,7 +325,7 @@ exit ;; i*86:*:3.2:*) if test -f /usr/options/cb.name; then -@@ -1092,7 +1102,7 @@ EOF +@@ -1087,7 +1097,7 @@ 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. @@ -341,7 +334,7 @@ fi exit ;; mini*:CTIX:SYS*5:*) -@@ -1129,19 +1139,19 @@ EOF +@@ -1124,19 +1134,19 @@ /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*:*) @@ -365,7 +358,7 @@ exit ;; SM[BE]S:UNIX_SV:*:*) echo mips-dde-sysv${UNAME_RELEASE} -@@ -1191,7 +1201,7 @@ EOF +@@ -1186,7 +1196,7 @@ if [ -d /usr/nec ]; then echo mips-nec-sysv${UNAME_RELEASE} else @@ -374,16 +367,7 @@ fi exit ;; BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only. -@@ -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 +@@ -1280,13 +1290,13 @@ else UNAME_MACHINE="$cputype" fi @@ -400,7 +384,7 @@ exit ;; KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*) echo pdp10-dec-tops20 -@@ -1303,16 +1313,16 @@ EOF +@@ -1295,16 +1305,16 @@ echo pdp10-xkl-tops20 exit ;; *:TOPS-20:*:*) @@ -420,7 +404,7 @@ exit ;; *:*VMS:*:*) UNAME_MACHINE=`(uname -p) 2>/dev/null` -@@ -1334,7 +1344,7 @@ EOF +@@ -1326,7 +1336,7 @@ echo ${UNAME_MACHINE}-pc-aros exit ;; x86_64:VMkernel:*:*) ++++++ automake-add-mkdir_p-temporarly.patch ++++++ 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 ++++++ automake-require_file.patch ++++++ --- /var/tmp/diff_new_pack.oF3wmq/_old 2013-02-27 06:42:26.000000000 +0100 +++ /var/tmp/diff_new_pack.oF3wmq/_new 2013-02-27 06:42:26.000000000 +0100 @@ -1,8 +1,8 @@ Index: automake.in =================================================================== ---- automake.in.orig -+++ automake.in -@@ -7750,12 +7750,14 @@ sub required_file_check_or_copy ($$$) +--- 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 ($$$) my $fullfile = "$dir/$file"; my $found_it = 0; my $dangling_sym = 0; -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org