diff --git a/autogen-5.16.2.tar.xz b/autogen-5.16.2.tar.xz deleted file mode 100644 index d7eb4f2..0000000 --- a/autogen-5.16.2.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:aa0dd7cab871b8ac9cbabff1693859631a7411bc26da7a5fa4fbb45ba5923e7a -size 945700 diff --git a/autogen-5.18.3.tar.xz b/autogen-5.18.3.tar.xz new file mode 100644 index 0000000..77d3b09 --- /dev/null +++ b/autogen-5.18.3.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ca94bfe0a78b4664f1c9f4e34e14ad545eb8eec4c24277c2d34ae9f30043c5c3 +size 1011676 diff --git a/autogen-build_ldpath.patch b/autogen-build_ldpath.patch index 03d4e94..5ace737 100644 --- a/autogen-build_ldpath.patch +++ b/autogen-build_ldpath.patch @@ -5,9 +5,9 @@ Index: autoopts/Makefile.am =================================================================== ---- autoopts/Makefile.am.orig 2012-08-11 18:41:23.000000000 +0200 -+++ autoopts/Makefile.am 2013-04-16 11:26:51.454797966 +0200 -@@ -133,7 +133,7 @@ INST_SH = autoopts-con +--- autoopts/Makefile.am.orig ++++ autoopts/Makefile.am +@@ -159,7 +159,7 @@ INST_SH = autoopts-con man_MANS = $(INST_MANS) m4data_DATA = autoopts.m4 @@ -18,9 +18,9 @@ Index: autoopts/Makefile.am bin_SCRIPTS = $(INST_SH) Index: doc/mk-agen-texi.sh =================================================================== ---- doc/mk-agen-texi.sh.orig 2012-05-13 22:52:48.000000000 +0200 -+++ doc/mk-agen-texi.sh 2013-04-16 11:27:17.865173188 +0200 -@@ -91,9 +91,9 @@ setup_exports() +--- doc/mk-agen-texi.sh.orig ++++ doc/mk-agen-texi.sh +@@ -93,9 +93,9 @@ setup_exports() PATH=${top_builddir}/columns:${PATH} timer=`expr ${AG_TIMEOUT} '*' 5` @@ -28,8 +28,8 @@ Index: doc/mk-agen-texi.sh - test -f "$d" || die "Cannot locate libopts.a" - LIBS="$d ${LIBS}" + d=`find ${top_builddir}/autoopts -type f -name libopts.a -o -name libopts.so | head -n 1` -+ LIBS="-L`dirname \"$d\"` -lopts ${LIBS}" -+ LD_LIBRARY_PATH="`dirname \"$d\"`:$LD_LIBRARY_PATH" ++ LIBS="-L$(dirname "$d") -lopts ${LIBS}" ++ LD_LIBRARY_PATH="$(dirname "$d"):$LD_LIBRARY_PATH" eval `${EGREP} '^AG_[A-Z_]*' ${top_srcdir}/VERSION` diff --git a/autogen-setfilename.patch b/autogen-setfilename.patch deleted file mode 100644 index ee7e72d..0000000 --- a/autogen-setfilename.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- - doc/autogen.texi | 1 + - 1 file changed, 1 insertion(+) - -Index: doc/autogen.texi -=================================================================== ---- doc/autogen.texi.orig 2012-08-11 18:42:47.000000000 +0200 -+++ doc/autogen.texi 2013-04-16 11:20:14.285193571 +0200 -@@ -1,4 +1,5 @@ - \input texinfo -+@setfilename autogen.info - @ignore - \internalpagesizes{46\baselineskip}{6in}{-.25in}{-.25in}{\bindingoffset}{36pt}% - @end ignore diff --git a/autogen.changes b/autogen.changes index 081bd3b..9d106ac 100644 --- a/autogen.changes +++ b/autogen.changes @@ -1,3 +1,48 @@ +------------------------------------------------------------------- +Thu Jul 3 08:43:05 UTC 2014 - schwab@suse.de + +- Update to 5.18.3 + * ATTRIBUTE_FORMAT_ARG is a configured attribute that wraps + __attribute__((__format_arg__(n))) procedure declaration attributes. + To configure it, the ag_macros.m4 has a new macroo, + AG_COMPILE_FORMAT_ARG (which is a compile only test probe). + + * Auto-edit Guile headers that depend upon configure values + most especially: noreturn + but check for "ptrdiff_t" in our configure too, so that Guile does + not create its own duplicate definition. + + * Abort from the failing function so that stack traces are useful + * The libopts m4 configure code must configure the libopts/Makefile + * Happy 2014 New Year + * make sure library option handling code does nothing when the + library is just trying to get information about an option. + * Only apply texi2mdoc when it is needed. + * The aoGetsText() emitted i18n helper function needs its argument + to have the "format_arg" attribute. + * documentation clarifications + * properly create generated main procedures from user supplied code. + * ChangeLog files have been removed from GIT sources + (though still obtainable with tagged checkouts). + * LIBGUILE_PATH is not needed and its derivation is wrong on + where binaries and libraries have different prefixes. + * fixed char casting issue that shows in UTF-8 files + * fixed installation error for str2init + * fixed failure handling in the usage template + * fix broken flag values for auto-supported options + * various tweaks to make Coverity happy. + * allow the fatal error message functions to be tagged "noreturn" + and incorporate sysnoreturn.h technology into AutoGen. + * --save-opts documentation cleanup + * optionMemberList() will return an allocated string containing + the names of the bits set in the option. + * tab stripped "here strings" include stripping the backslash + escape character when it precedes any whitespace character. +- autoopts-remove-stupid-set-e.patch: remove stupid use of set -e +- autogen-setfilename.patch: remove +- autogen-build_ldpath.patch: regenerate +- run testsuite + ------------------------------------------------------------------- Tue Apr 16 11:24:00 CEST 2013 - pth@suse.de diff --git a/autogen.spec b/autogen.spec index 07d3ef7..bc9107a 100644 --- a/autogen.spec +++ b/autogen.spec @@ -1,7 +1,7 @@ # # spec file for package autogen # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 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 @@ -26,12 +26,12 @@ BuildRequires: xz Summary: Automated Text File Generator License: GPL-3.0+ Group: Development/Tools/Building -Version: 5.16.2 +Version: 5.18.3 Release: 0 Url: http://autogen.sourceforge.net/ Source: %{name}-%{version}.tar.xz -Patch0: autogen-setfilename.patch Patch1: autogen-build_ldpath.patch +Patch2: autoopts-remove-stupid-set-e.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build PreReq: %{install_info_prereq} @@ -44,10 +44,8 @@ that must be kept synchronized in parallel tables. %prep %setup -q -%patch0 %patch1 -# autmake 1.13 removed AM_CONFIG_HEADER -sed -i 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/' configure.ac +%patch2 -p1 %build autoreconf -fi @@ -57,6 +55,9 @@ make %{?_smp_mflags} %install %makeinstall +%check +make check + %post /sbin/ldconfig %install_info --info-dir=%{_infodir} %{_infodir}/autogen.info.gz diff --git a/autoopts-remove-stupid-set-e.patch b/autoopts-remove-stupid-set-e.patch new file mode 100644 index 0000000..40c7f80 --- /dev/null +++ b/autoopts-remove-stupid-set-e.patch @@ -0,0 +1,21 @@ +Index: autogen-5.18.3/autoopts/mk-tpl-config.sh +=================================================================== +--- autogen-5.18.3.orig/autoopts/mk-tpl-config.sh ++++ autogen-5.18.3/autoopts/mk-tpl-config.sh +@@ -31,7 +31,6 @@ die() { + + init() { + PS4='>tpc-${FUNCNAME}> ' +- set -e + progpid=$$ + prog=`basename $0` + progdir=`\cd \`dirname $0\` >/dev/null ; pwd` +@@ -200,7 +199,7 @@ fix_guile() { + cd ${builddir} + find_libguiledir "${LGCFLAGS}" + +- list=`set +e ; exec 2>/dev/null ++ list=`exec 2>/dev/null + find ${libguiledir}/libguile* -type f | \ + xargs grep -l -E '\'` +