From: Jakub Bogusz Date: Mon, 24 Aug 2020 18:56:31 +0000 (+0200) Subject: - added info patch (adjust filename and formatting in index); rel 2 X-Git-Tag: auto/th/autoconf-dickey-2.52-0.20180819.2 X-Git-Url: http://git.pld-linux.org/gitweb.cgi?a=commitdiff_plain;h=8a6fa26681c530140785189296285135c50e6b38;p=packages%2Fautoconf-dickey.git - added info patch (adjust filename and formatting in index); rel 2 --- diff --git a/autoconf-dickey-info.patch b/autoconf-dickey-info.patch new file mode 100644 index 0000000..50065ed --- /dev/null +++ b/autoconf-dickey-info.patch @@ -0,0 +1,390 @@ +--- autoconf-2.52-20180819/doc/autoconf.texi.orig 2001-12-01 18:45:23.000000000 +0100 ++++ autoconf-2.52-20180819/doc/autoconf.texi 2020-08-23 22:34:16.257886594 +0200 +@@ -27,25 +27,15 @@ + @end ifnothtml + + +-@dircategory GNU admin ++@dircategory Programming tools: + @direntry +-* Autoconf: (autoconf). Create source code configuration scripts +-@end direntry +- +-@dircategory Individual utilities +-@direntry +-* autoscan: (autoconf)autoscan Invocation. +- Semi-automatic @file{configure.ac} writing +-* ifnames: (autoconf)ifnames Invocation. +- Listing the conditionals in source code +-* autoconf: (autoconf)autoconf Invocation. +- How to create configuration scripts +-* autoreconf: (autoconf)autoreconf Invocation. +- Remaking multiple @code{configure} scripts +-* configure: (autoconf)configure Invocation. +- Configuring a package +-* config.status: (autoconf)config.status Invocation. +- Recreating a configuration ++* Autoconf-dickey: (autoconf-dickey). Create source code configuration scripts ++* autoscan-dickey: (autoconf-dickey)autoscan. Semi-automatic @file{configure.ac} writing ++* ifnames-dickey: (autoconf-dickey)ifnames. Listing the conditionals in source code ++* autoconf-dickey: (autoconf-dickey)autoconf. How to create configuration scripts ++* autoreconf-dickey: (autoconf-dickey)autoreconf. Remaking multiple @code{configure} scripts ++* configure: (autoconf-dickey)configure. Configuring a package ++* config.status: (autoconf-dickey)config.status. Recreating a configuration + @end direntry + + @ifinfo +@@ -146,7 +136,7 @@ + * Manual Configuration:: Selecting features that can't be guessed + * Site Configuration:: Local defaults for @code{configure} + * Running configure scripts:: How to use the Autoconf output +-* config.status Invocation:: Recreating a configuration ++* config.status:: Recreating a configuration + * Obsolete Constructs:: Kept for backward compatibility + * Questions:: Questions about Autoconf, with answers + * History:: History of Autoconf +@@ -168,10 +158,10 @@ + Making @code{configure} Scripts + + * Writing configure.ac:: What to put in an Autoconf input file +-* autoscan Invocation:: Semi-automatic @file{configure.ac} writing +-* ifnames Invocation:: Listing the conditionals in source code +-* autoconf Invocation:: How to create configuration scripts +-* autoreconf Invocation:: Remaking multiple @code{configure} scripts ++* autoscan:: Semi-automatic @file{configure.ac} writing ++* ifnames:: Listing the conditionals in source code ++* autoconf:: How to create configuration scripts ++* autoreconf:: Remaking multiple @code{configure} scripts + + Writing @file{configure.ac} + +@@ -203,7 +193,7 @@ + Configuration Header Files + + * Header Templates:: Input for the configuration headers +-* autoheader Invocation:: How to create configuration templates ++* autoheader:: How to create configuration templates + * Autoheader Macros:: How to specify CPP templates + + Existing Tests +@@ -369,13 +359,13 @@ + * System Type:: Specifying the system type + * Sharing Defaults:: Setting site-wide defaults for @code{configure} + * Environment Variables:: Defining environment variables. +-* configure Invocation:: Changing how @code{configure} runs ++* configure:: Changing how @code{configure} runs + + Obsolete Constructs + + * Obsolete config.status Use:: Different calling convention + * acconfig.h:: Additional entries in @file{config.h.in} +-* autoupdate Invocation:: Automatic update of @file{configure.ac} ++* autoupdate:: Automatic update of @file{configure.ac} + * Obsolete Macros:: Backward compatibility macros + * Autoconf 1:: Tips for upgrading your files + * Autoconf 2.13:: Some fresher tips +@@ -680,7 +670,7 @@ + + @item + a shell script called @file{config.status} that, when run, will recreate +-the files listed above (@pxref{config.status Invocation}); ++the files listed above (@pxref{config.status}); + + @item + an optional shell script normally called @file{config.cache} +@@ -740,13 +730,13 @@ + + @menu + * Writing configure.ac:: What to put in an Autoconf input file +-* autoscan Invocation:: Semi-automatic @file{configure.ac} writing +-* ifnames Invocation:: Listing the conditionals in source code +-* autoconf Invocation:: How to create configuration scripts +-* autoreconf Invocation:: Remaking multiple @code{configure} scripts ++* autoscan:: Semi-automatic @file{configure.ac} writing ++* ifnames:: Listing the conditionals in source code ++* autoconf:: How to create configuration scripts ++* autoreconf:: Remaking multiple @code{configure} scripts + @end menu + +-@node Writing configure.ac, autoscan Invocation, Making configure Scripts, Making configure Scripts ++@node Writing configure.ac, autoscan, Making configure Scripts, Making configure Scripts + @section Writing @file{configure.ac} + + To produce a @code{configure} script for a software package, create a +@@ -759,7 +749,7 @@ + or specialized features, @file{configure.ac} might need to contain some + hand-crafted shell commands; see @ref{Portable Shell}. The + @code{autoscan} program can give you a good start in writing +-@file{configure.ac} (@pxref{autoscan Invocation}, for more information). ++@file{configure.ac} (@pxref{autoscan}, for more information). + + Previous versions of Autoconf promoted the name @file{configure.in}, + which is somewhat ambiguous (the tool needed to produce this file is not +@@ -987,7 +977,7 @@ + @end display + + +-@node autoscan Invocation, ifnames Invocation, Writing configure.ac, Making configure Scripts ++@node autoscan, ifnames, Writing configure.ac, Making configure Scripts + @section Using @code{autoscan} to Create @file{configure.ac} + @cindex @code{autoscan} + +@@ -1009,7 +999,7 @@ + use a configuration header file, you must add a call to + @code{AC_CONFIG_HEADERS} (@pxref{Configuration Headers}). You might + also have to change or add some @code{#if} directives to your program in +-order to make it work with Autoconf (@pxref{ifnames Invocation}, for ++order to make it work with Autoconf (@pxref{ifnames}, for + information about a program that can help with that job). + + When using @command{autoscan} to maintain a @file{configure.ac}, simply +@@ -1051,7 +1041,7 @@ + plays with different versions of Autoconf simultaneously. + @end table + +-@node ifnames Invocation, autoconf Invocation, autoscan Invocation, Making configure Scripts ++@node ifnames, autoconf, autoscan, Making configure Scripts + @section Using @code{ifnames} to List Conditionals + @cindex @code{ifnames} + +@@ -1060,8 +1050,7 @@ + preprocessor conditionals. If a package has already been set up to have + some portability, @code{ifnames} can thus help you figure out what its + @code{configure} needs to check for. It may help fill in some gaps in a +-@file{configure.ac} generated by @code{autoscan} (@pxref{autoscan +-Invocation}). ++@file{configure.ac} generated by @code{autoscan} (@pxref{autoscan}). + + @code{ifnames} scans all of the C source files named on the command line + (or the standard input, if none are given) and writes to the standard +@@ -1083,7 +1072,7 @@ + Print the version number of Autoconf and exit. + @end table + +-@node autoconf Invocation, autoreconf Invocation, ifnames Invocation, Making configure Scripts ++@node autoconf, autoreconf, ifnames, Making configure Scripts + @section Using @code{autoconf} to Create @code{configure} + @cindex @code{autoconf} + +@@ -1346,7 +1335,7 @@ + @end group + @end example + +-@node autoreconf Invocation, , autoconf Invocation, Making configure Scripts ++@node autoreconf, , autoconf, Making configure Scripts + @section Using @code{autoreconf} to Update @code{configure} Scripts + @cindex @code{autoreconf} + +@@ -1568,8 +1557,8 @@ + source directory; @code{configure} checks for this file's existence to + make sure that the directory that it is told contains the source code in + fact does. Occasionally people accidentally specify the wrong directory +-with @option{--srcdir}; this is a safety check. @xref{configure +-Invocation}, for more information. ++with @option{--srcdir}; this is a safety check. @xref{configure}, ++for more information. + @end defmac + + +@@ -1755,7 +1744,7 @@ + when used in @var{output}, or the standard input when used in the + @var{inputs}. You most probably don't need to use this in + @file{configure.ac}, but it is convenient when using the command line +-interface of @file{./config.status}, see @ref{config.status Invocation}, ++interface of @file{./config.status}, see @ref{config.status}, + for more details. + + The @var{inputs} may be absolute or relative filenames. In the latter +@@ -2223,7 +2212,7 @@ + @file{config.h} is considered up to date. @xref{Output}, for more + information about @code{AC_OUTPUT}. + +-@xref{config.status Invocation}, for more examples of handling ++@xref{config.status}, for more examples of handling + configuration-related dependencies. + + @node Configuration Headers, Configuration Commands, Makefile Substitutions, Setup +@@ -2284,11 +2273,11 @@ + + @menu + * Header Templates:: Input for the configuration headers +-* autoheader Invocation:: How to create configuration templates ++* autoheader:: How to create configuration templates + * Autoheader Macros:: How to specify CPP templates + @end menu + +-@node Header Templates, autoheader Invocation, Configuration Headers, Configuration Headers ++@node Header Templates, autoheader, Configuration Headers, Configuration Headers + @subsection Configuration Header Templates + @cindex Configuration Header Template + @cindex @file{config.h.in} +@@ -2335,10 +2324,10 @@ + @samp{#undef} is strongly discouraged. + + Since it is a tedious task to keep a template header up to date, you may +-use @code{autoheader} to generate it, see @ref{autoheader Invocation}. ++use @code{autoheader} to generate it, see @ref{autoheader}. + + +-@node autoheader Invocation, Autoheader Macros, Header Templates, Configuration Headers ++@node autoheader, Autoheader Macros, Header Templates, Configuration Headers + @subsection Using @code{autoheader} to Create @file{config.h.in} + @cindex @code{autoheader} + +@@ -2443,7 +2432,7 @@ + + + +-@node Autoheader Macros, , autoheader Invocation, Configuration Headers ++@node Autoheader Macros, , autoheader, Configuration Headers + @subsection Autoheader Macros + + @code{autoheader} scans @file{configure.ac} and figures out which C +@@ -5621,7 +5610,7 @@ + files will depend upon @command{bizarre-cc} being the C compiler. If + for some reason the user runs @command{/configure} again, or if it is + run via @samp{./config.status --recheck}, (@xref{Automatic Remaking}, +-and @pxref{config.status Invocation}), then the configuration can be ++and @pxref{config.status}), then the configuration can be + inconsistent, composed of results depending upon two different + compilers. + +@@ -5665,7 +5654,7 @@ + + @item + @var{variable} is kept during automatic reconfiguration +-(@pxref{config.status Invocation}) as if it had been passed as a command ++(@pxref{config.status}) as if it had been passed as a command + line argument, including when no cache is used: + + @example +@@ -6670,7 +6659,7 @@ + + When the user runs @samp{autoconf -W error}, warnings from + @code{AC_DIAGNOSE} and @code{AC_WARNING} are reported as error, see +-@ref{autoconf Invocation}. ++@ref{autoconf}. + + @node Dependencies Between Macros, Obsoleting Macros, Reporting Messages, Writing Autoconf Macros + @section Dependencies Between Macros +@@ -9445,7 +9434,7 @@ + + @c ============================================== Running configure Scripts. + +-@node Running configure scripts, config.status Invocation, Site Configuration, Top ++@node Running configure scripts, config.status, Site Configuration, Top + @chapter Running @code{configure} Scripts + @cindex @code{configure} + +@@ -9463,7 +9452,7 @@ + * System Type:: Specifying the system type + * Sharing Defaults:: Setting site-wide defaults for @code{configure} + * Environment Variables:: Defining environment variables. +-* configure Invocation:: Changing how @code{configure} runs ++* configure:: Changing how @code{configure} runs + @end menu + + @include install.texi +@@ -9471,7 +9460,7 @@ + + @c ============================================== Recreating a Configuration + +-@node config.status Invocation, Obsolete Constructs, Running configure scripts, Top ++@node config.status, Obsolete Constructs, Running configure scripts, Top + @chapter Recreating a Configuration + @cindex @code{config.status} + +@@ -9590,7 +9579,7 @@ + + @c =================================================== Obsolete Constructs + +-@node Obsolete Constructs, Questions, config.status Invocation, Top ++@node Obsolete Constructs, Questions, config.status, Top + @chapter Obsolete Constructs + + Autoconf changes, and throughout the years some constructs are obsoleted. +@@ -9604,17 +9593,17 @@ + @menu + * Obsolete config.status Use:: Different calling convention + * acconfig.h:: Additional entries in @file{config.h.in} +-* autoupdate Invocation:: Automatic update of @file{configure.ac} ++* autoupdate:: Automatic update of @file{configure.ac} + * Obsolete Macros:: Backward compatibility macros + * Autoconf 1:: Tips for upgrading your files + * Autoconf 2.13:: Some fresher tips + @end menu + + @node Obsolete config.status Use, acconfig.h, Obsolete Constructs, Obsolete Constructs + @section Obsolete @file{config.status} Invocation + + @file{config.status} now supports arguments to specify the files to +-instantiate, see @ref{config.status Invocation}, for more details. ++instantiate, see @ref{config.status}, for more details. + Before, environment variables had to be used. + + @defvar CONFIG_COMMANDS +@@ -9645,7 +9634,7 @@ + @file{config.status} ignores this variable. + @end defvar + +-In @ref{config.status Invocation}, using this old interface, the example ++In @ref{config.status}, using this old interface, the example + would be: + + @example +@@ -9668,7 +9657,7 @@ + for @code{CONFIG_COMMANDS} etc.) + + +-@node acconfig.h, autoupdate Invocation, Obsolete config.status Use, Obsolete Constructs ++@node acconfig.h, autoupdate, Obsolete config.status Use, Obsolete Constructs + @section @file{acconfig.h} + + @cindex @file{acconfig.h} +@@ -9719,7 +9708,7 @@ + self-contained, and should not depend upon @file{acconfig.h} etc. + + +-@node autoupdate Invocation, Obsolete Macros, acconfig.h, Obsolete Constructs ++@node autoupdate, Obsolete Macros, acconfig.h, Obsolete Constructs + @section Using @code{autoupdate} to Modernize @file{configure.ac} + @cindex @code{autoupdate} + +@@ -9777,7 +9766,7 @@ + instead of in the current directory. + @end table + +-@node Obsolete Macros, Autoconf 1, autoupdate Invocation, Obsolete Constructs ++@node Obsolete Macros, Autoconf 1, autoupdate, Obsolete Constructs + @section Obsolete Macros + + Several macros are obsoleted in Autoconf, for various reasons (typically +@@ -10588,7 +10577,7 @@ + + If you have an @file{aclocal.m4} installed with Autoconf (as opposed to + in a particular package's source directory), you must rename it to +-@file{acsite.m4}. @xref{autoconf Invocation}. ++@file{acsite.m4}. @xref{autoconf}. + + If you distribute @file{install.sh} with your package, rename it to + @file{install-sh} so @code{make} builtin rules won't inadvertently +@@ -10643,7 +10632,7 @@ + the documentation for them. @xref{Obsolete Macros}, for a table showing the + new names for the old macros. Use the @code{autoupdate} program to + convert your @file{configure.ac} to using the new macro names. +-@xref{autoupdate Invocation}. ++@xref{autoupdate}. + + Some macros have been superseded by similar ones that do the job better, + but are not call-compatible. If you get warnings about calling obsolete +--- autoconf-2.52-20180819/doc/install.texi.orig 2001-01-12 10:16:30.000000000 +0100 ++++ autoconf-2.52-20180819/doc/install.texi 2020-08-24 06:11:20.559316410 +0200 +@@ -215,7 +215,7 @@ + overridden in the site shell script). + + +-@node configure Invocation ++@node configure + @section @code{configure} Invocation + + @code{configure} recognizes the following options to control how it diff --git a/autoconf-dickey.spec b/autoconf-dickey.spec index 6bb28ed..97491e9 100644 --- a/autoconf-dickey.spec +++ b/autoconf-dickey.spec @@ -3,17 +3,19 @@ %bcond_with tests # do not perform "make check" %define snap 20180819 +%define rel 2 Summary: Thomas Dickey's autoconf - source configuration tools Summary(pl.UTF-8): autoconf (wersja Thomasa Dickeya) - narzędzie do automatycznego konfigurowania źródeł Name: autoconf-dickey Version: 2.52 -Release: 0.%{snap}.1 +Release: 0.%{snap}.%{rel} License: GPL v2+/v3+ Group: Development/Building # stable releases: Source0: http://ftp.debian.org:/debian/pool/main/a/autoconf-dickey/%{name}_%{version}+20180819.orig.tar.gz # Source0-md5: 1f9a7b4682902cdced6fa4b1bb67bb0c +Patch0: %{name}-info.patch URL: https://invisible-island.net/autoconf/ BuildRequires: m4 >= 3:1.4.13 BuildRequires: rpm-perlprov @@ -68,6 +70,7 @@ tylko podczas generowania samych skryptów autokonfiguracyjnych. %prep %setup -q -n autoconf-%{version}-%{snap} +%patch0 -p1 %build %configure \ @@ -85,6 +88,9 @@ rm -rf $RPM_BUILD_ROOT %{__make} -j1 install \ DESTDIR=$RPM_BUILD_ROOT +# no need for duplicates +%{__rm} $RPM_BUILD_ROOT%{_infodir}/standards*.info + rm -f $RPM_BUILD_ROOT%{_infodir}/dir %clean @@ -99,10 +105,9 @@ rm -rf $RPM_BUILD_ROOT %files %defattr(644,root,root,755) %doc AUTHORS BUGS ChangeLog ChangeLog.2 NEWS README THANKS TODO -%attr(755,root,root) %{_bindir}/auto* +%attr(755,root,root) %{_bindir}/auto*-dickey %attr(755,root,root) %{_bindir}/ifnames-dickey %{_libdir}/autoconf-dickey %{_infodir}/autoconf-dickey.info* -%{_infodir}/standards-dickey.info* -%{_mandir}/man1/auto*.1* +%{_mandir}/man1/auto*-dickey.1* %{_mandir}/man1/ifnames-dickey.1*