From d81e17f364653c539596cbe69bf954955c500ce9 Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Thu, 23 Sep 2004 06:22:14 +0000 Subject: 2004-09-23 Ralf Corsepius * autotools/autoconf-rtems.spec.in: Cleanup for chroot'ed builds. * autotools/automake-rtems.spec.in: automake-1.9.2. --- scripts/ChangeLog | 3 +++ scripts/autotools/autoconf-rtems.spec.in | 28 ++++++++++++++++++---------- scripts/autotools/automake-rtems.spec.in | 13 +++++++------ 3 files changed, 28 insertions(+), 16 deletions(-) (limited to 'scripts') diff --git a/scripts/ChangeLog b/scripts/ChangeLog index cd33f69a5b..9ad79a0d15 100644 --- a/scripts/ChangeLog +++ b/scripts/ChangeLog @@ -1,5 +1,8 @@ 2004-09-23 Ralf Corsepius + * autotools/autoconf-rtems.spec.in: Cleanup for chroot'ed builds. + * autotools/automake-rtems.spec.in: automake-1.9.2. + Cleanup for chroot'ed builds. * gcc3newlib/Makefile.am: Add avr-rtems*gcc. * gcc3newlib/gccnewlib.add: Disable c++ for avr. diff --git a/scripts/autotools/autoconf-rtems.spec.in b/scripts/autotools/autoconf-rtems.spec.in index e6bc3cd854..92b32efb64 100644 --- a/scripts/autotools/autoconf-rtems.spec.in +++ b/scripts/autotools/autoconf-rtems.spec.in @@ -25,16 +25,17 @@ Packager: Ralf Corsepius Copyright: GPL URL: http://www.gnu.org/software/autoconf Group: @rpmgroup@ -Autoreqprov: on Version: %{rpmvers} -Release: 2 +Release: 3 Summary: Tool for automatically generating GNU style Makefile.in's BuildArch: noarch BuildRoot: %{_defaultbuildroot} -BuildPreReq: autoconf perl m4 gawk +BuildRequires: autoconf perl m4 gawk emacs +Requires: m4 gawk PreReq: /sbin/install-info Source: autoconf-%{srcvers}.tar.bz2 +Patch0: autoconf-2.59-quoting-20040817-1.diff %description GNU's Autoconf is a tool for configuring source code and Makefiles. @@ -51,13 +52,21 @@ their use. %prep %setup -q -n %{_name}-%{srcvers} +%patch -p0 -P 0 %build -./configure --prefix=%{_prefix} --infodir=%{_infodir} --mandir=%{_mandir} +./configure --prefix=%{_prefix} --infodir=%{_infodir} --mandir=%{_mandir} \ + --bindir=%{_bindir} --datadir=%{_datadir} make %install -%makeinstall +rm -rf "${RPM_BUILD_ROOT}" +make DESTDIR=${RPM_BUILD_ROOT} install + +# Create this directory to prevent the corresponding line +# in %%files below to fail +mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/emacs/site-lisp + gzip -9qf $RPM_BUILD_ROOT%{_infodir}/autoconf.info* 2>/dev/null # RTEMS's standards.info comes from binutils rm -f $RPM_BUILD_ROOT%{_infodir}/standards.info* @@ -65,7 +74,6 @@ rm -f $RPM_BUILD_ROOT%{_infodir}/standards.info* gzip -9qf $RPM_BUILD_ROOT%{_mandir}/man?/* 2>/dev/null %clean -[ x"$RPM_BUILD_ROOT" = x"%{_defaultbuildroot}" ] ; \ rm -rf "$RPM_BUILD_ROOT" %post @@ -82,8 +90,8 @@ fi %defattr(-,root,root) %doc AUTHORS COPYING ChangeLog NEWS README THANKS %{_bindir}/* -%doc %{_infodir}/autoconf.info*.gz -#%doc %{_infodir}/standards.info*.gz -%doc %{_mandir}/man?/*.gz +%{_infodir}/autoconf.info* +#%{_infodir}/standards.info* +%{_mandir}/man?/* %{_datadir}/autoconf -%{_datadir}/emacs/site-lisp/* +%exclude %{_datadir}/emacs/site-lisp diff --git a/scripts/autotools/automake-rtems.spec.in b/scripts/autotools/automake-rtems.spec.in index c2213dc68b..88d7eaa24b 100644 --- a/scripts/autotools/automake-rtems.spec.in +++ b/scripts/autotools/automake-rtems.spec.in @@ -2,8 +2,8 @@ # spec file for automake # -%define rpmvers 1.9 -%define srcvers 1.9 +%define rpmvers 1.9.2 +%define srcvers 1.9.2 %define amvers 1.9 %define _defaultbuildroot %{_tmppath}/%{name}-%{srcvers}-root @@ -25,9 +25,9 @@ Name: %{name} Packager: Ralf Corsepius URL: http://sources.redhat.com/automake -Copyright: GPL +License: GPL Group: @rpmgroup@ -Autoreqprov: on + Version: %{rpmvers} Release: 1 Summary: Tool for automatically generating GNU style Makefile.in's @@ -35,7 +35,8 @@ BuildArch: noarch BuildRoot: %{_defaultbuildroot} BuildPreReq: %{requirements} perl help2man Requires: %{requirements} -PreReq: /sbin/install-info +Requires(post): /sbin/install-info +Requires(preun): /sbin/install-info Source: ftp://ftp.gnu.org/gnu/automake/automake-%{srcvers}.tar.bz2 Patch0: automake-1.8.1-rtems-20040112-1.diff @@ -58,6 +59,7 @@ PATH=%{_prefix}/bin:$PATH make %install +rm -rf "$RPM_BUILD_ROOT" make DESTDIR=${RPM_BUILD_ROOT} install install -m 755 -d $RPM_BUILD_ROOT/%{_mandir}/man1 @@ -73,7 +75,6 @@ gzip -9qf $RPM_BUILD_ROOT%{_infodir}/*.info* 2>/dev/null gzip -9qf $RPM_BUILD_ROOT%{_mandir}/man?/* 2>/dev/null %clean -[ x"$RPM_BUILD_ROOT" = x"%{_defaultbuildroot}" ] ; \ rm -rf "$RPM_BUILD_ROOT" %post -- cgit v1.2.3