diff --git a/autogen-5.11.1.tar.bz2 b/autogen-5.11.1.tar.bz2 new file mode 100644 index 0000000..04c23c5 --- /dev/null +++ b/autogen-5.11.1.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8ea6de8c9e146defff5dd5883631d2a9baf2559486532f8cb7a9d819ff8122d8 +size 1029963 diff --git a/autogen-5.9.7.tar.bz2 b/autogen-5.9.7.tar.bz2 deleted file mode 100644 index 9584d05..0000000 --- a/autogen-5.9.7.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d9284446b08f7a9cdd0ad359d29b6c2eb6c79cf67865168ccdf7613237bbd41e -size 1019339 diff --git a/autogen-bash_path.patch b/autogen-bash_path.patch new file mode 100644 index 0000000..21268b5 --- /dev/null +++ b/autogen-bash_path.patch @@ -0,0 +1,18 @@ +diff -urN autoopts.orig/autoopts-config.in autoopts/autoopts-config.in +--- autoopts.orig/autoopts-config.in 2010-09-08 02:54:30.000000000 +0200 ++++ autoopts/autoopts-config.in 2010-09-11 05:54:15.000000000 +0200 +@@ -1,4 +1,4 @@ +-#! /old-home/ROOT/usr/local/bin/bash ++#! /bin/bash + ## --------------------------------------------------------------------- + ## autoopts-config.in -- Describe AutoOpts configuration + ## +diff -urN autoopts.orig/mk-autoopts-pc.in autoopts/mk-autoopts-pc.in +--- autoopts.orig/mk-autoopts-pc.in 2010-09-08 02:54:30.000000000 +0200 ++++ autoopts/mk-autoopts-pc.in 2010-09-11 05:54:07.000000000 +0200 +@@ -1,4 +1,4 @@ +-#! /old-home/ROOT/usr/local/bin/bash ++#! /bin/bash + ## --------------------------------------------------------------------- + ## mk-autoopts-pc.in -- Describe AutoOpts configuration + ## diff --git a/autogen-build_ldpath.patch b/autogen-build_ldpath.patch new file mode 100644 index 0000000..135435a --- /dev/null +++ b/autogen-build_ldpath.patch @@ -0,0 +1,45 @@ +diff -urN doc.orig/auto-opts.tpl doc/auto-opts.tpl +--- doc.orig/auto-opts.tpl 2010-07-10 20:08:57.000000000 +0200 ++++ doc/auto-opts.tpl 2010-09-11 05:22:09.000000000 +0200 +@@ -106,7 +106,7 @@ + _EOF_ + ( + ${AGexe} -L${top_srcdir}/autoopts checkopt.def +- opts=\"-o check -DTEST_CHECK_OPTS ${CFLAGS} ${INCLUDES}\" ++ opts=\"-o check -DTEST_CHECK_OPTS ${CFLAGS} ${LDFLAGS} ${INCLUDES}\" + ${CC} -include ${top_builddir}/config.h ${opts} checkopt.c ${LIBS} + ) > checkopt.err 2>&1 + +diff -urN doc.orig/mk-agen-texi-in doc/mk-agen-texi-in +--- doc.orig/mk-agen-texi-in 2010-09-08 02:35:48.000000000 +0200 ++++ doc/mk-agen-texi-in 2010-09-11 05:24:42.000000000 +0200 +@@ -90,8 +90,9 @@ + srcdir=`cd @srcdir@ ; pwd` + PATH=${top_builddir}/columns:${PATH} + timer=`expr @AG_TIMEOUT@ '*' 5` +- d=`find ${top_builddir}/autoopts -type f -name 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" + + eval `egrep '^AG_[A-Z_]*' ${top_srcdir}/VERSION` + +@@ -100,7 +101,7 @@ + GDexe=@GDexe@ + CLexe=@CLexe@ + +- LIBS=${LIBS}\ `find ${top_builddir}/autoopts -name libopts.a -print` ++ LIBS="${LIBS} `find ${top_builddir}/autoopts -name libopts.a -print`" + OPTIONS_DEF=${AGsrc}/opts.def + DIRECTIVESRC=${AGsrc}/defDirect.c + GETDEF_SRC=` +@@ -211,7 +212,7 @@ + sanity_check + run_getdefs + +-env >&2 ++${VERBOSE} && env | sort >&2 + exec 3> ${tmp_dir}/ag.ini + cat >&3 <<- _EOF_ + timeout ${timer} diff --git a/autogen-setfilename.patch b/autogen-setfilename.patch new file mode 100644 index 0000000..96b5e61 --- /dev/null +++ b/autogen-setfilename.patch @@ -0,0 +1,8 @@ +Index: doc/autogen.texi +=================================================================== +--- doc/autogen.texi.orig 2010-09-08 02:55:50.000000000 +0200 ++++ doc/autogen.texi 2010-09-09 12:46:29.602075564 +0200 +@@ -1,2 +1,3 @@ + \input texinfo ++@setfilename autogen.info + @include agdoc.texi diff --git a/autogen.changes b/autogen.changes index 48c1d4c..28425b9 100644 --- a/autogen.changes +++ b/autogen.changes @@ -1,3 +1,21 @@ +------------------------------------------------------------------- +Mon Sep 13 12:01:49 CEST 2010 - pth@suse.de + +- Add patch from dnh@opensuse.org to fix building the documentation + with an uninstalled libopts. + +------------------------------------------------------------------- +Thu Sep 9 13:06:20 CEST 2010 - pth@suse.de + +- Update to 5.11.1: + * Fix (kill) orphaned shell program + * add file-next-line functions to facilitate #line "C" directives + * simplify some snprintfv code + * implement dependency generation in autogen output. + * fix up fmemopen() + * Fixes for unusual shell programs + * Remove guile option code + ------------------------------------------------------------------- Wed Apr 1 15:14:32 CEST 2009 - crrodriguez@suse.de diff --git a/autogen.spec b/autogen.spec index cf6c5f2..2d70ad1 100644 --- a/autogen.spec +++ b/autogen.spec @@ -1,7 +1,7 @@ # -# spec file for package autogen (Version 5.9.7) +# spec file for package autogen (Version 5.11.1) # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2010 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 @@ -20,12 +20,15 @@ Name: autogen BuildRequires: guile-devel libxml2-devel Summary: Automated Text File Generator -Version: 5.9.7 -Release: 2 +Version: 5.11.1 +Release: 1 Group: Development/Tools/Building -License: GPL v3 or later +License: GPLv3+ Url: http://autogen.sourceforge.net/ Source: http://mesh.dl.sourceforge.net/sourceforge/autogen/%{name}-%{version}.tar.bz2 +Patch0: autogen-setfilename.patch +Patch1: autogen-build_ldpath.patch +Patch2: autogen-bash_path.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build PreReq: %{install_info_prereq} @@ -44,14 +47,18 @@ Authors: %prep %setup -q +%patch0 +%patch1 +%patch2 %build autoreconf -fi %configure --disable-static --with-pic -%{__make} %{?jobs:-j%jobs} +#make %{?jobs:-j%jobs} +make %install -make install DESTDIR=$RPM_BUILD_ROOT +%makeinstall %post /sbin/ldconfig @@ -66,174 +73,13 @@ rm -fr $RPM_BUILD_ROOT %files %defattr(-, root, root) -/usr/bin/* -/usr/include/* +%{_bindir}/* +%{_includedir}/* %{_libdir}/lib* %{_libdir}/pkgconfig/autoopts.pc %{_mandir}/man?/*.gz -/usr/share/aclocal/* -/usr/share/autogen +%{_datadir}/aclocal/* +%{_datadir}/autogen %{_infodir}/*.gz %changelog -* Wed Apr 01 2009 crrodriguez@suse.de -- disable static libraries but keep "la" files, package uses - libltdl -* Mon Jan 12 2009 schwab@suse.de -- Update to autogen 5.9.7. - * several cleanups. - * "more-help" is only supported with libopts is in use at run time. - Allow for it to be expunged from the documentation. - * Add a #define for the configured shell to config.h - * add --used-defines to autogen. You can now find out all the names - that autogen looked up during processing. That will include computed - names and values passed to macros by name and it won't include names - only referenced in sections of a template that were not processed. - But it helps in documenting a template anyway. -* Mon Nov 17 2008 schwab@suse.de -- Update to autogen 5.9.6. - * Hierarchically valued options can now be stored with ``--save-opt'' option - * option state may now be "reset". This is indistinguishable from the - compiled state. If option state is "saved" later, such an option will - not appear in the save file. - * there is a new option argument type: time. Its argument string - represents years (?!), months, weeks, days, hours, minutes and seconds. - The value seen by the program is an integer number of seconds. - (This is not a date/time.) The duration of a year is always 365 days - and the duration of a month is always 30 days. - * various obscure cleanups. -* Mon Jan 07 2008 schwab@suse.de -- Update to autogen 5.9.5. - * integer number arguments may now have their values suffixed with - one of the letters k/K/m/M/g/G/t/T to signify scaling by powers - of 1000 (lower case) or 1024 (upper case). Specify, "scaled". - * AutoOpts "arg-type" may now be set to "file". Existence of the directory - portion of the name will be checked. The existence (or not) of the actual - file may also be checked. Finally, the file may be pre-opened with either - "fopen(3C)" or "open(2)". - * The "columns" program now accepts a "--fill" option to cause it to fill - text instead of filling columns. - * The tests should no longer indirectly reference installed versions of - the binaries. They should all work out of the build directories. -* Mon Oct 08 2007 schwab@suse.de -- Update to autogen 5.9.3. - * libopts requires strsignal, so the config test has been moved. - * fixed ``--save'' option bug - * programs may now choose to have config files kept in cannonical form - ("C" locale), even if long option names are translated. The option - definition file must contain ``no-xlate = opt-cfg;'' or - ``no-xlate = opt;'' See the documentation for details. -* Mon Jul 30 2007 schwab@suse.de -- Update to autogen 5.9.2. - * GNU GPL v3 is now emitted with the "gpl" and "lgpl" functions. - * usage.tpl template has been added. - * getopt.tpl uses this template for constructing its usage string. - * if "short-usage" or "full-usage" can be used to specify the form - of the usage text: - * not supplied -> compute it at run time - * supplied, but empty -> use "usage.tpl" to compute it - * is a variable name -> insert into option structure - * is text -> emit the text and point to it from option structure -* Mon May 07 2007 schwab@suse.de -- Update to autogen 5.9.1. - * getopt.tpl template is fixed to not require the internal header - autoopts/autoopts.h. - * MAXPATHLEN will use _MAX_PATH on Windows platforms - * new libopts configuration option: --disable-optional-args This will #define - NO_OPTIONAL_OPT_ARGS in config.h and cause the built library to ignore the - OPTST_ARG_OPTIONAL bit in an option descriptor. autoopts generated code - compiled with NO_OPTIONAL_OPT_ARGS #defined will never have that bit set in - the option descriptors either. If libopts has been so configured, then the - installed options.h header will contain: #define NO_OPTIONAL_OPT_ARGS 1 so - that client code will generally be compiled with that flag set. - The OPTST_ARG_OPTIONAL bit is ignored regardless. - * Fixed up --load-opts environment variable processing. You can - now correctly suppress config file loading with either: - PROGRAM_LOAD_OPTS=no - PROGRAM=--no-load-opts - * added new auto-supported option, --usage. It is incorporated - by specifying ``usage-opt;'' in the option definitions file. - * libopts now uses several exit codes from sysexits.h: - EX_NOINPUT (66) - a specified config file cannot be found - EX_SOFTWARE (70) - libopts error - please file a bug report - EX_CONFIG (78) - a NULL option descriptor was passed in - user bug -* Sun Feb 18 2007 schwab@suse.de -- Update to autogen 5.9. - * a script for producing Debian packages is included - * including of templates and definitions now works more like - ``#include "foo"'' instead of ``#include ''. - * fixed sizeof(int) != sizeof(size_t) bug. - * fixed incorrect argument number format string -* Mon Jan 29 2007 schwab@suse.de -- Update to autogen 5.8.9. - * GREP is now a configurable. (Sheesh!) - * options with hierarchical structure (nested values) had some - bugs in the config file parsing code. Fixed. - * Since YACC is not used any more, it is no longer required. :) -* Sun Oct 15 2006 schwab@suse.de -- Update to autogen 5.8.7. - * Tweaks for Windows' compat/windows-config.h - * new string-table convenience functions: string-table-add-ref and - string-table-size - * fixed a value referencing bug in enumeration arg handling - (seen on platforms where sizeof(int) != sizeof(void*)). -* Fri Oct 13 2006 aj@suse.de -- add guile-devel buildrequires. -* Thu Oct 12 2006 ro@suse.de -- added gmp-devel to buildrequires (guile) -* Mon Oct 09 2006 schwab@suse.de -- Update to autogen 5.8.6. - * AutoOpts code presumed that there were no #defines for the option - names. You can now force aside such conflicts. - * AutoOpts generated code unconditionally #includes limits.h and stdint.h. - * aliased pointer cleanups should allow higher optimization of code. - * The installation of the tear-off libopt library is now optional - to the installers of client projects. -* Mon May 15 2006 schwab@suse.de -- Update to autogen 5.8.5. - * ag-fprintf will now allow you to emit text into a suspended output stream. - * string tables have been implemented as a scheme function. This makes it - very easy to produce an array of characters containing NUL termintaed - strings and have these string offsets (indexes) available for indexing into - the string arrays. - * The libopts code will omit Windows-unfriendly code if the compile defines - _WIN32 and does not define __CYGWIN__. - * suffix specifications in the pseudo macro may now construct an output - file name format string using scheme code, a la: - [= autogen5 template - h=(string-append (getenv "TMPDIR") "/%%s-hdr.h") =] - The "%%s" will still be replaced by the base name. - * the scheme function "version-compare" will allow you to compare - two dotted version numbers. These can be your own versions or - that of autogen. The scheme variable ``autogen-version'' has been - around for a long time and may be used as one of the arguments. - * #assert is now active in definition files. If the text begins - with a back quote, it is handed off to the shell for processing. - If an open parenthesis, it is handed off to Guile. If it is - anything else, it is ignored. -* Wed Jan 25 2006 mls@suse.de -- converted neededforbuild to BuildRequires -* Sun Jan 15 2006 schwab@suse.de -- Run %%install_info. -* Sat Jan 14 2006 schwab@suse.de -- Update to autogen 5.8.1. -* Wed Jan 11 2006 schwab@suse.de -- Run ldconfig in %%post. -* Mon Jan 09 2006 schwab@suse.de -- Update to autogen 5.8. -* Fri Oct 14 2005 schwab@suse.de -- Fix strict-aliasing bugs. -* Tue Oct 11 2005 schwab@suse.de -- Update to autogen 5.7.3. -* Tue Aug 02 2005 schwab@suse.de -- Update to autogen 5.7.2. -* Fri Apr 29 2005 schwab@suse.de -- Update to autogen 5.7. -* Tue Mar 29 2005 schwab@suse.de -- Update to autogen 5.6.6. -* Mon Jan 10 2005 schwab@suse.de -- Update to autogen 5.6.5. -* Thu Nov 11 2004 ro@suse.de -- fixed file list -* Sat Nov 06 2004 schwab@suse.de -- Initial version 5.6.4.