devel/automake17 automake-1.7.9-info.patch, NONE, 1.1 automake17.spec, 1.11, 1.12
Karsten Hopp (karsten)
fedora-extras-commits at redhat.com
Mon Sep 17 12:01:25 UTC 2007
Author: karsten
Update of /cvs/extras/devel/automake17
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30526
Modified Files:
automake17.spec
Added Files:
automake-1.7.9-info.patch
Log Message:
- fix licenses
- add README AUTHORS THANKS to %%doc
- add comment about using ./configure
- fix automake17 info page and install it
automake-1.7.9-info.patch:
--- NEW FILE automake-1.7.9-info.patch ---
diff -urN automake-1.7.9/automake.texi automake-1.7.9_new/automake.texi
--- automake-1.7.9/automake.texi 2003-11-09 19:57:13.000000000 +0100
+++ automake-1.7.9_new/automake.texi 2007-09-17 13:37:58.000000000 +0200
@@ -1,7 +1,7 @@
\input texinfo @c -*-texinfo-*-
@c %**start of header
- at setfilename automake.info
- at settitle automake
+ at setfilename automake17.info
+ at settitle automake17
@setchapternewpage off
@c %**end of header
@@ -9,12 +9,12 @@
@dircategory Software development
@direntry
-* automake: (automake). Making Makefile.in's.
+* automake17: (automake17). Making Makefile.in's.
@end direntry
@dircategory Individual utilities
@direntry
-* aclocal: (automake)Invoking aclocal. Generating aclocal.m4.
+* aclocal-1.7: (automake17)Invoking aclocal. Generating aclocal.m4.
@end direntry
@ifinfo
@@ -5303,7 +5303,7 @@
@example
ETAGS_ARGS = automake.in --lang=none \
- --regex='/^@@node[ \t]+\([^,]+\)/\1/' automake.texi
+ --regex='/^@@node[ \t]+\([^,]+\)/\1/' automake17.texi
@end example
If you add filenames to @samp{ETAGS_ARGS}, you will probably also
diff -urN automake-1.7.9/Makefile.am automake-1.7.9_new/Makefile.am
--- automake-1.7.9/Makefile.am 2003-07-29 22:27:41.000000000 +0200
+++ automake-1.7.9_new/Makefile.am 2007-09-17 13:28:58.000000000 +0200
@@ -25,7 +25,7 @@
SUBDIRS = . m4 lib tests
bin_SCRIPTS = automake aclocal
-info_TEXINFOS = automake.texi
+info_TEXINFOS = automake17.texi
CLEANFILES = $(bin_SCRIPTS)
AUTOMAKESOURCES = automake.in aclocal.in
@@ -34,8 +34,8 @@
# The following requires a fixed version of the Emacs 19.30 etags.
ETAGS_ARGS = --lang=none \
- --regex='/^@node[ \t]+\([^,]+\)/\1/' $(srcdir)/automake.texi
-TAGS_DEPENDENCIES = automake.texi
+ --regex='/^@node[ \t]+\([^,]+\)/\1/' $(srcdir)/automake17.texi
+TAGS_DEPENDENCIES = automake17.texi
EXTRA_DIST = ChangeLog.96 ChangeLog.98 ChangeLog.00 ChangeLog.01 \
$(AUTOMAKESOURCES)
diff -urN automake-1.7.9/Makefile.in automake-1.7.9_new/Makefile.in
--- automake-1.7.9/Makefile.in 2003-11-09 20:29:57.000000000 +0100
+++ automake-1.7.9_new/Makefile.in 2007-09-17 13:32:46.000000000 +0200
@@ -97,7 +97,7 @@
SUBDIRS = . m4 lib tests
bin_SCRIPTS = automake aclocal
-info_TEXINFOS = automake.texi
+info_TEXINFOS = automake17.texi
CLEANFILES = $(bin_SCRIPTS)
AUTOMAKESOURCES = automake.in aclocal.in
@@ -106,9 +106,9 @@
# The following requires a fixed version of the Emacs 19.30 etags.
ETAGS_ARGS = --lang=none \
- --regex='/^@node[ \t]+\([^,]+\)/\1/' $(srcdir)/automake.texi
+ --regex='/^@node[ \t]+\([^,]+\)/\1/' $(srcdir)/automake17.texi
-TAGS_DEPENDENCIES = automake.texi
+TAGS_DEPENDENCIES = automake17.texi
EXTRA_DIST = ChangeLog.96 ChangeLog.98 ChangeLog.00 ChangeLog.01 \
$(AUTOMAKESOURCES)
@@ -143,11 +143,11 @@
DIST_SOURCES =
TEXINFO_TEX = $(top_srcdir)/lib/texinfo.tex
am__TEXINFO_TEX_DIR = $(top_srcdir)/lib
-INFO_DEPS = automake.info
-DVIS = automake.dvi
-PDFS = automake.pdf
-PSS = automake.ps
-TEXINFOS = automake.texi
+INFO_DEPS = automake17.info
+DVIS = automake17.dvi
+PDFS = automake17.pdf
+PSS = automake17.ps
+TEXINFOS = automake17.texi
RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
ps-recursive install-info-recursive uninstall-info-recursive \
@@ -213,13 +213,13 @@
TEXINPUTS="$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEXINPUTS" \
MAKEINFO='$(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir)' \
$(TEXI2PDF) `test -f '$<' || echo '$(srcdir)/'`$<
-automake.info: automake.texi version.texi
-automake.dvi: automake.texi version.texi
-automake.pdf: automake.texi version.texi
+automake17.info: automake17.texi version.texi
+automake17.dvi: automake17.texi version.texi
+automake17.pdf: automake17.texi version.texi
version.texi: stamp-vti
-stamp-vti: automake.texi $(top_srcdir)/configure
- @(dir=.; test -f ./automake.texi || dir=$(srcdir); \
- set `$(SHELL) $(top_srcdir)/lib/mdate-sh $$dir/automake.texi`; \
+stamp-vti: automake17.texi $(top_srcdir)/configure
+ @(dir=.; test -f ./automake17.texi || dir=$(srcdir); \
+ set `$(SHELL) $(top_srcdir)/lib/mdate-sh $$dir/automake17.texi`; \
echo "@set UPDATED $$1 $$2 $$3"; \
echo "@set UPDATED-MONTH $$2 $$3"; \
echo "@set EDITION $(VERSION)"; \
@@ -276,11 +276,11 @@
done
mostlyclean-aminfo:
- -rm -f automake.aux automake.cm automake.cp automake.cps automake.cv \
- automake.fn automake.ky automake.kys automake.log automake.op \
- automake.ov automake.pg automake.pgs automake.tmp \
- automake.toc automake.tp automake.tps automake.tr automake.vr \
- automake.vrs automake.dvi automake.pdf automake.ps
+ -rm -f automake17.aux automake17.cm automake17.cp automake17.cps automake17.cv \
+ automake17.fn automake17.ky automake17.kys automake17.log automake17.op \
+ automake17.ov automake17.pg automake17.pgs automake17.tmp \
+ automake17.toc automake17.tp automake17.tps automake17.tr automake17.vr \
+ automake17.vrs automake17.dvi automake17.pdf automake17.ps
maintainer-clean-aminfo:
@list='$(INFO_DEPS)'; for i in $$list; do \
Index: automake17.spec
===================================================================
RCS file: /cvs/extras/devel/automake17/automake17.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- automake17.spec 20 Feb 2007 17:07:14 -0000 1.11
+++ automake17.spec 17 Sep 2007 12:00:53 -0000 1.12
@@ -3,20 +3,25 @@
Summary: A GNU tool for automatically creating Makefiles
Name: automake17
Version: %{api_version}.9
-Release: 8
-License: GPL
+Release: 9
+License: GPLv2+ and MIT and OFSFDL
Group: Development/Tools
Source: ftp://ftp.gnu.org/gnu/automake/automake-%{version}.tar.bz2
Source10: filter-provides-automake.sh
Source11: filter-requires-automake.sh
#Patch0: automake-1.7.9-dvi.patch
Patch1: automake-1.7.9-check.patch
+Patch2: automake-1.7.9-info.patch
URL: http://sources.redhat.com/automake
-Conflicts: automake = 1.7.8
+Conflicts: Obsoletes = 1.7.8
Requires: autoconf >= 2.54
-Buildrequires: autoconf >= 2.54, texinfo, texinfo-tex
+Buildrequires: autoconf >= 2.54, texinfo
+# Required for 'make check':
+Buildrequires: texinfo-tex
BuildArch: noarch
Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Requires(post): /sbin/install-info
+Requires(preun): /sbin/install-info
%define _use_internal_dependency_generator 0
%define __find_provides %{SOURCE10}
@@ -38,8 +43,13 @@
%setup -q -n automake-%{version}
#patch0 -p1
%patch1 -p1
+%patch2 -p1
+rm -f automake.info*
+mv automake.texi automake17.texi
%build
+# don't use %%configure here as we'd use config.{sub,guess} from the rpm package
+# instead of our own
./configure --prefix=%{_prefix} --mandir=%{_mandir} --infodir=%{_infodir} \
--bindir=%{_bindir} --datadir=%{_datadir} --libdir=%{_libdir}
@@ -52,7 +62,7 @@
# create this dir empty so we can own it
mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/aclocal
-rm -rf $RPM_BUILD_ROOT%{_infodir}
+rm -rf $RPM_BUILD_ROOT%{_infodir}/dir
# KH: FIXME This needs to be looked at, exdir2 gettext gettext2 subcond fail
# gettext probably because the gettext.m4 isn't compatible with automake <1.9
@@ -60,20 +70,36 @@
# make check # VERBOSE=x
#endif
+%post
+/sbin/install-info %{_infodir}/automake17.info %{_infodir}/dir || :
+
+%preun
+if [ $1 = 0 ]; then
+ /sbin/install-info --delete %{_infodir}/automake17.info %{_infodir}/dir || :
+fi
+
%clean
rm -rf ${RPM_BUILD_ROOT}
%files
%defattr(-,root,root,-)
-%doc COPYING
+%doc COPYING README AUTHORS THANKS
%{_bindir}/*-%{api_version}
%exclude %{_bindir}/automake
%exclude %{_bindir}/aclocal
%{_datadir}/automake-%{api_version}
%{_datadir}/aclocal-%{api_version}
+%{_infodir}/*
%dir %{_datadir}/aclocal
%changelog
+* Mon Sep 17 2007 Karsten Hopp <karsten at redhat.com> 1.7.9-9
+- fix licenses
+- add README AUTHORS THANKS to %%doc
+- add comment about using ./configure
+- fix automake17 info page and install it
+
+
* Mon Feb 19 2007 Karsten Hopp <karsten at redhat.com> 1.7.9-8
- misc. cleanups for review
More information about the scm-commits
mailing list