From 37757ec85d5176c672f1dece8bc4dac0c72fdef8 Mon Sep 17 00:00:00 2001 From: Karsten Hopp Date: Thu, 15 Feb 2007 10:58:20 +0000 Subject: [PATCH] - add autoconf213 info entry - add disttag --- autoconf213-info.patch | 79 ++++++++++++++++++++++++++++++++++++++++++ autoconf213.spec | 13 ++++--- 2 files changed, 88 insertions(+), 4 deletions(-) create mode 100644 autoconf213-info.patch diff --git a/autoconf213-info.patch b/autoconf213-info.patch new file mode 100644 index 0000000..65a594d --- /dev/null +++ b/autoconf213-info.patch @@ -0,0 +1,79 @@ +--- autoconf-2.13/autoconf.texi.version 2007-02-15 11:33:42.000000000 +0100 ++++ autoconf-2.13/autoconf.texi 2007-02-15 11:33:42.000000000 +0100 +@@ -1,7 +1,7 @@ + \input texinfo @c -*-texinfo-*- + @c %**start of header +-@setfilename autoconf.info +-@settitle Autoconf ++@setfilename autoconf213.info ++@settitle Autoconf-2.13 + @c For double-sided printing, uncomment: + @c @setchapternewpage odd + @c %**end of header +@@ -17,7 +17,8 @@ + @ifinfo + @format + START-INFO-DIR-ENTRY +-* Autoconf: (autoconf). Create source code configuration scripts. ++* Autoconf213: (autoconf213). Create source code configuration scripts. ++ This is a legacy version of autoconf. + END-INFO-DIR-ENTRY + @end format + +--- autoconf-2.13/Makefile.in.version 2007-02-15 11:33:42.000000000 +0100 ++++ autoconf-2.13/Makefile.in 2007-02-15 11:37:18.000000000 +0100 +@@ -68,8 +68,8 @@ + DISTFILES = AUTHORS COPYING ChangeLog ChangeLog.1 INSTALL \ + Makefile.in NEWS README TODO $(M4FILES) \ + acconfig.h acfunctions acheaders acidentifiers \ +- acmakevars acprograms autoconf.info* \ +- autoconf.sh autoconf.texi install.texi \ ++ acmakevars acprograms autoconf213.info* \ ++ autoconf.sh autoconf213.texi install.texi \ + autoheader.sh autoscan.pl autoreconf.sh autoupdate.sh ifnames.sh \ + config.guess config.sub configure configure.in \ + install-sh mkinstalldirs texinfo.tex \ +@@ -106,11 +106,11 @@ + autoconf.m4f: autoconf.m4 acgeneral.m4 acspecific.m4 acoldnames.m4 + autoheader.m4f: autoheader.m4 acgeneral.m4 acspecific.m4 acoldnames.m4 + +-info: autoconf.info @standards_info@ INSTALL ++info: autoconf213.info @standards_info@ INSTALL + + # Use --no-split to avoid creating filenames > 14 chars. +-autoconf.info: autoconf.texi install.texi +- $(MAKEINFO) -I$(srcdir) $(srcdir)/autoconf.texi --no-split --output=$@ ++autoconf213.info: autoconf213.texi install.texi ++ $(MAKEINFO) -I$(srcdir) $(srcdir)/autoconf213.texi --no-split --output=$@ + + INSTALL: install.texi + $(MAKEINFO) -I$(srcdir) $(srcdir)/install.texi --output=$@ \ +@@ -121,8 +121,8 @@ + + dvi: autoconf.dvi @standards_dvi@ + +-autoconf.dvi: autoconf.texi +- $(TEXI2DVI) $(srcdir)/autoconf.texi ++autoconf.dvi: autoconf213.texi ++ $(TEXI2DVI) $(srcdir)/autoconf213.texi + + standards.dvi: standards.texi make-stds.texi + $(TEXI2DVI) $(srcdir)/standards.texi +@@ -159,7 +159,7 @@ + + # Don't cd, to avoid breaking install-sh references. + install-info: info installdirs +- if test -f autoconf.info; then \ ++ if test -f autoconf213.info; then \ + for i in *.info*; do \ + $(INSTALL_DATA) $$i $(DESTDIR)/$(infodir)/$$i; \ + done; \ +@@ -174,7 +174,7 @@ + rm -f $(bindir)/`echo $$p|sed '$(transform)'`; \ + done + rm -fr $(acdatadir) +- cd $(infodir) && rm -f autoconf.info* ++ cd $(infodir) && rm -f autoconf213.info* + if test -f standards.info || test -f $(srcdir)/standards.info; \ + then cd $(infodir) && rm -f standards.info*; fi + diff --git a/autoconf213.spec b/autoconf213.spec index 1091cf5..e591f4d 100644 --- a/autoconf213.spec +++ b/autoconf213.spec @@ -1,7 +1,7 @@ Summary: A GNU tool for automatically configuring source code Name: autoconf213 Version: 2.13 -Release: 14 +Release: 15%{?dist} License: GPL Group: Development/Tools URL: http://www.gnu.org/software/autoconf/ @@ -17,6 +17,7 @@ Patch7: autoconf-2.13-wait3test.patch Patch8: autoconf-2.13-make-defs-62361.patch Patch9: autoconf-2.13-versioning.patch Patch10: autoconf213-destdir.patch +Patch11: autoconf213-info.patch Requires: gawk, m4 >= 1.1, mktemp, perl Requires(post): /sbin/install-info Requires(preun): /sbin/install-info @@ -52,7 +53,9 @@ use. %patch7 -p1 %patch8 -p1 %patch9 -p1 -%patch10 -p1 -b .rh1 +%patch10 -p1 +%patch11 -p1 +mv autoconf.texi autoconf213.texi %build %configure --program-suffix=-%{version} @@ -63,8 +66,6 @@ rm -rf ${RPM_BUILD_ROOT} #makeinstall make install DESTDIR=$RPM_BUILD_ROOT -mv ${RPM_BUILD_ROOT}%{_infodir}/autoconf.info ${RPM_BUILD_ROOT}%{_infodir}/%{name}.info - # We don't want to include the standards.info stuff in the package, # because it comes from binutils... rm -f ${RPM_BUILD_ROOT}%{_infodir}/standards* @@ -88,6 +89,10 @@ rm -rf ${RPM_BUILD_ROOT} %doc AUTHORS COPYING NEWS README TODO %changelog +* Thu Feb 15 2007 Karsten Hopp 2.13-15 +- add autoconf213 info entry +- add disttag + * Wed Feb 14 2007 Karsten Hopp 2.13-14 - buildrequire perl for autoscan script