From 60f70a5b55045cb3e566d31f2d5e295ecf9cc3de387350df0044861d453510fb Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Tue, 17 Mar 2009 15:44:42 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/automake?expand=0&rev=10 --- automake-1.10.1.tar.bz2 | 3 - automake-1.10.2.tar.bz2 | 3 + automake-SuSE.patch | 133 ++++++++++++++++-- ..._file.patch => automake-require_file.patch | 0 automake-rpmlintrc | 4 + automake.changes | 26 ++++ automake.spec | 83 +++++++---- 7 files changed, 210 insertions(+), 42 deletions(-) delete mode 100644 automake-1.10.1.tar.bz2 create mode 100644 automake-1.10.2.tar.bz2 rename require_file.patch => automake-require_file.patch (100%) create mode 100644 automake-rpmlintrc diff --git a/automake-1.10.1.tar.bz2 b/automake-1.10.1.tar.bz2 deleted file mode 100644 index ca6691a..0000000 --- a/automake-1.10.1.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b26a3499672b0eddcbd87c8e61dfb60ae74d9ee0cc181a5d924fb73db62a25ec -size 918341 diff --git a/automake-1.10.2.tar.bz2 b/automake-1.10.2.tar.bz2 new file mode 100644 index 0000000..3d3184c --- /dev/null +++ b/automake-1.10.2.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f48f2a26d9988e09fa4ddf5879c5942f9fb0de6ba85fd95f2d82ac77e70a8234 +size 936420 diff --git a/automake-SuSE.patch b/automake-SuSE.patch index b5ec300..c62002e 100644 --- a/automake-SuSE.patch +++ b/automake-SuSE.patch @@ -1,6 +1,6 @@ --- lib/config.guess +++ lib/config.guess -@@ -139,6 +139,16 @@ UNAME_RELEASE=`(uname -r) 2>/dev/null` | +@@ -139,6 +139,16 @@ UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown @@ -17,7 +17,7 @@ # Note: order is significant - the case branches are not exclusive. case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in -@@ -840,13 +850,13 @@ EOF +@@ -853,13 +863,13 @@ if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \ | grep -q __ARM_EABI__ then @@ -34,7 +34,7 @@ exit ;; cris:Linux:*:*) echo cris-axis-linux-gnu -@@ -855,16 +865,16 @@ EOF +@@ -868,16 +878,16 @@ echo crisv32-axis-linux-gnu exit ;; frv:Linux:*:*) @@ -55,7 +55,7 @@ exit ;; mips:Linux:*:*) eval $set_cc_for_build -@@ -887,7 +897,7 @@ EOF +@@ -900,7 +910,7 @@ s: ::g p }'`" @@ -64,7 +64,7 @@ ;; mips64:Linux:*:*) eval $set_cc_for_build -@@ -910,16 +920,16 @@ EOF +@@ -923,16 +933,16 @@ s: ::g p }'`" @@ -85,13 +85,16 @@ exit ;; alpha:Linux:*:*) case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in -@@ -933,39 +943,39 @@ EOF +@@ -946,7 +956,7 @@ esac objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi - echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} -+ echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu${LIBC} ++ echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu${LIBC} exit ;; + padre:Linux:*:*) + echo sparc-unknown-linux-gnu +@@ -954,34 +964,34 @@ parisc:Linux:*:* | hppa:Linux:*:*) # Look for CPU level case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in @@ -135,7 +138,7 @@ exit ;; i*86:Linux:*:*) # The BFD linker knows what the default object file format is, so -@@ -980,18 +990,18 @@ EOF +@@ -996,15 +1006,15 @@ p'` case "$ld_supported_targets" in elf32-i386) @@ -146,10 +149,6 @@ - echo "${UNAME_MACHINE}-pc-linux-gnuaout" + echo "${UNAME_MACHINE}-${VENDOR}-linux-gnuaout" exit ;; - coff-i386) -- echo "${UNAME_MACHINE}-pc-linux-gnucoff" -+ echo "${UNAME_MACHINE}-${VENDOR}-linux-gnucoff" - exit ;; "") # Either a pre-BFD a.out linker (linux-gnuoldld) or # one that does not give us useful --help. @@ -158,7 +157,7 @@ exit ;; esac # Determine whether the default compiler is a.out or elf -@@ -1025,7 +1035,7 @@ EOF +@@ -1038,7 +1048,7 @@ p }'`" test x"${LIBC}" != x && { @@ -167,3 +166,111 @@ exit } test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; exit; } +@@ -1063,16 +1073,16 @@ + echo ${UNAME_MACHINE}-pc-os2-emx + exit ;; + i*86:XTS-300:*:STOP) +- echo ${UNAME_MACHINE}-unknown-stop ++ echo ${UNAME_MACHINE}-${VENDOR}-stop + exit ;; + i*86:atheos:*:*) +- echo ${UNAME_MACHINE}-unknown-atheos ++ echo ${UNAME_MACHINE}-${VENDOR}-atheos + exit ;; + i*86:syllable:*:*) + echo ${UNAME_MACHINE}-pc-syllable + exit ;; + i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*) +- echo i386-unknown-lynxos${UNAME_RELEASE} ++ echo i386-${VENDOR}-lynxos${UNAME_RELEASE} + exit ;; + i*86:*DOS:*:*) + echo ${UNAME_MACHINE}-pc-msdosdjgpp +@@ -1092,7 +1102,7 @@ + *Pentium) UNAME_MACHINE=i586 ;; + *Pent*|*Celeron) UNAME_MACHINE=i686 ;; + esac +- echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION} ++ echo ${UNAME_MACHINE}-${VENDOR}-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION} + exit ;; + i*86:*:3.2:*) + if test -f /usr/options/cb.name; then +@@ -1128,7 +1138,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. +- echo i860-unknown-sysv${UNAME_RELEASE} # Unknown i860-SVR4 ++ echo i860-${VENDOR}-sysv${UNAME_RELEASE} # Unknown i860-SVR4 + fi + exit ;; + mini*:CTIX:SYS*5:*) +@@ -1155,19 +1165,19 @@ + /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ + && { echo i486-ncr-sysv4; exit; } ;; + m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*) +- echo m68k-unknown-lynxos${UNAME_RELEASE} ++ echo m68k-${VENDOR}-lynxos${UNAME_RELEASE} + exit ;; + mc68030:UNIX_System_V:4.*:*) + echo m68k-atari-sysv4 + exit ;; + TSUNAMI:LynxOS:2.*:*) +- echo sparc-unknown-lynxos${UNAME_RELEASE} ++ echo sparc-${VENDOR}-lynxos${UNAME_RELEASE} + exit ;; + rs6000:LynxOS:2.*:*) +- echo rs6000-unknown-lynxos${UNAME_RELEASE} ++ echo rs6000-${VENDOR}-lynxos${UNAME_RELEASE} + exit ;; + PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*) +- echo powerpc-unknown-lynxos${UNAME_RELEASE} ++ echo powerpc-${VENDOR}-lynxos${UNAME_RELEASE} + exit ;; + SM[BE]S:UNIX_SV:*:*) + echo mips-dde-sysv${UNAME_RELEASE} +@@ -1217,7 +1227,7 @@ + if [ -d /usr/nec ]; then + echo mips-nec-sysv${UNAME_RELEASE} + else +- echo mips-unknown-sysv${UNAME_RELEASE} ++ echo mips-${VENDOR}-sysv${UNAME_RELEASE} + fi + exit ;; + BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only. +@@ -1298,13 +1308,13 @@ + else + UNAME_MACHINE="$cputype" + fi +- echo ${UNAME_MACHINE}-unknown-plan9 ++ echo ${UNAME_MACHINE}-${VENDOR}-plan9 + exit ;; + *:TOPS-10:*:*) +- echo pdp10-unknown-tops10 ++ echo pdp10-${VENDOR}-tops10 + exit ;; + *:TENEX:*:*) +- echo pdp10-unknown-tenex ++ echo pdp10-${VENDOR}-tenex + exit ;; + KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*) + echo pdp10-dec-tops20 +@@ -1313,16 +1323,16 @@ + echo pdp10-xkl-tops20 + exit ;; + *:TOPS-20:*:*) +- echo pdp10-unknown-tops20 ++ echo pdp10-${VENDOR}-tops20 + exit ;; + *:ITS:*:*) +- echo pdp10-unknown-its ++ echo pdp10-${VENDOR}-its + exit ;; + SEI:*:*:SEIUX) + echo mips-sei-seiux${UNAME_RELEASE} + exit ;; + *:DragonFly:*:*) +- echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ++ echo ${UNAME_MACHINE}-${VENDOR}-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` + exit ;; + *:*VMS:*:*) + UNAME_MACHINE=`(uname -p) 2>/dev/null` diff --git a/require_file.patch b/automake-require_file.patch similarity index 100% rename from require_file.patch rename to automake-require_file.patch diff --git a/automake-rpmlintrc b/automake-rpmlintrc new file mode 100644 index 0000000..d209b54 --- /dev/null +++ b/automake-rpmlintrc @@ -0,0 +1,4 @@ +# This line is mandatory to access the configuration functions +from Config import * + +addFilter("automake.* devel-file-in-non-devel-package") diff --git a/automake.changes b/automake.changes index 74116cc..4959c25 100644 --- a/automake.changes +++ b/automake.changes @@ -1,3 +1,29 @@ +------------------------------------------------------------------- +Wed Mar 11 15:02:32 CET 2009 - pth@suse.de + +- Update to 1.10.2: + * Rebuild rules now also work for a removed `subdir/Makefile.in' in + an otherwise up to date tree. + * Work around AIX sh quoting issue in AC_PROG_CC_C_O, leading to + unnecessary use of the `compile' script. + * `config.status --file=Makefile depfiles' now also works with the + extra quoting used internally by Autoconf 2.62 and newer + (it used to work only without the `--file=' bit). + * distcheck works with Libtool 2.x even when LT_OUTPUT is used, as + config.lt is removed correctly now. + * The manual is now distributed under the terms of the GNU FDL 1.3. + * When `automake --add-missing' causes the COPYING file to be installed, + it will also warn that the license file should be added to source + control. +- Add bison again. +- Pass docdir on to configure. +- Add a rpmlintrc file + +------------------------------------------------------------------- +Wed Mar 4 13:59:35 CET 2009 - pth@suse.de + +- Prefix patches with package name. + ------------------------------------------------------------------- Mon Jan 28 13:18:29 CET 2008 - schwab@suse.de diff --git a/automake.spec b/automake.spec index 3359ac8..95b801d 100644 --- a/automake.spec +++ b/automake.spec @@ -1,30 +1,39 @@ # -# spec file for package automake (Version 1.10.1) +# spec file for package automake (Version 1.10.2) # -# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. -# This file and all modifications and additions to the pristine -# package are under the same license as the package itself. +# Copyright (c) 2009 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 +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# 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/ # # norootforbuild + Name: automake -BuildRequires: help2man +BuildRequires: bison help2man License: GPL v2 or later Group: Development/Tools/Building AutoReqProv: on PreReq: %{install_info_prereq} Requires: autoconf >= 2.60 -Version: 1.10.1 -Release: 4 +Version: 1.10.2 +Release: 1 Summary: A Program for Automatically Generating GNU-Style Makefile.in Files Url: http://www.gnu.org/software/automake BuildRoot: %{_tmppath}/%{name}-%{version}-build Source: automake-%{version}.tar.bz2 +Source1: automake-rpmlintrc Patch1: automake-SuSE.patch -Patch3: require_file.patch +Patch3: automake-require_file.patch %description Automake is a tool for automatically generating "Makefile.in" files @@ -42,27 +51,29 @@ Authors: Alexandre Duret-Lutz %prep -%setup -q -n automake-%{version} +%setup -q %patch1 %patch3 %build -./configure --prefix=/usr --infodir=%{_infodir} --mandir=%{_mandir} \ - --docdir=%{_docdir}/%{name} +%configure --docdir=%{_docdir}/%{name} make + +%check # Some architectures can't keep up the pace. %ifnarch alpha make check VERBOSE=1 %endif %install -make install DESTDIR=$RPM_BUILD_ROOT -mkdir -p $RPM_BUILD_ROOT/etc $RPM_BUILD_ROOT/usr/share/aclocal -echo /usr/local/share/aclocal >$RPM_BUILD_ROOT/etc/aclocal_dirlist -ln -s ../../../etc/aclocal_dirlist $RPM_BUILD_ROOT/usr/share/aclocal/dirlist -mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1 -perllibdir=lib help2man -S FSF ./aclocal > $RPM_BUILD_ROOT%{_mandir}/man1/aclocal.1 -perllibdir=lib help2man -S FSF ./automake > $RPM_BUILD_ROOT%{_mandir}/man1/automake.1 +%makeinstall +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} %post %install_info --info-dir=%{_infodir} %{_infodir}/automake.info.gz @@ -71,19 +82,39 @@ perllibdir=lib help2man -S FSF ./automake > $RPM_BUILD_ROOT%{_mandir}/man1/autom %install_info_delete --info-dir=%{_infodir} %{_infodir}/automake.info.gz %clean -rm -rf $RPM_BUILD_ROOT +rm -rf %{buildroot} %files %defattr(-,root,root) -%doc AUTHORS COPYING ChangeLog NEWS README THANKS -/usr/bin/* +%doc %{_docdir}/%{name} +%{_bindir}/* %doc %{_infodir}/*.gz %doc %{_mandir}/man1/* -/usr/share/aclocal* -/usr/share/automake-* +%{_datadir}/aclocal* +%{_datadir}/automake-* %config /etc/aclocal_dirlist %changelog +* Wed Mar 11 2009 pth@suse.de +- Update to 1.10.2: + * Rebuild rules now also work for a removed `subdir/Makefile.in' in + an otherwise up to date tree. + * Work around AIX sh quoting issue in AC_PROG_CC_C_O, leading to + unnecessary use of the `compile' script. + * `config.status --file=Makefile depfiles' now also works with the + extra quoting used internally by Autoconf 2.62 and newer + (it used to work only without the `--file=' bit). + * distcheck works with Libtool 2.x even when LT_OUTPUT is used, as + config.lt is removed correctly now. + * The manual is now distributed under the terms of the GNU FDL 1.3. + * When `automake --add-missing' causes the COPYING file to be installed, + it will also warn that the license file should be added to source + control. +- Add bison again. +- Pass docdir on to configure. +- Add a rpmlintrc file +* Wed Mar 04 2009 pth@suse.de +- Prefix patches with package name. * Mon Jan 28 2008 schwab@suse.de - Revert last change. * Sat Jan 26 2008 aj@suse.de @@ -275,7 +306,7 @@ rm -rf $RPM_BUILD_ROOT - incremental fix for py-compile * Fri Nov 19 2004 schwab@suse.de - Fix py-compile to avoid putting $(DESTDIR) in the output. -* Tue Nov 02 2004 schwab@suse.de +* Mon Nov 01 2004 schwab@suse.de - Update to automake 1.9.3. * Fri Oct 08 2004 schwab@suse.de - Update to automake 1.9.2. @@ -376,7 +407,7 @@ rm -rf $RPM_BUILD_ROOT - recognize ppc64 * Tue Jun 12 2001 olh@suse.de - fix typo in automake-1.4-SuSE.patch -* Tue Jun 12 2001 schwab@suse.de +* Mon Jun 11 2001 schwab@suse.de - Recognize AC_PROG_LIBTOOL as well as AM_PROG_LIBTOOL. * Mon Jun 11 2001 schwab@suse.de - Update to automake 1.4-p4. @@ -397,7 +428,7 @@ rm -rf $RPM_BUILD_ROOT - Use vendor within config.sub even for s390 * Mon May 01 2000 kukuk@suse.de - Use mandir und infodir macro -* Thu Mar 30 2000 bk@suse.de +* Wed Mar 29 2000 bk@suse.de - updated config.guess and config.sub for s390 * Wed Mar 01 2000 werner@suse.de - Add arm/ppc patch from teTeX sources