From edebdab58875c4ecf9689416bbce53111d0cb2b4 Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Wed, 14 Feb 2007 15:59:48 +0000 Subject: Sync with rtems-4.8 --- contrib/crossrpms/autotools/autoconf.add | 7 +++++- contrib/crossrpms/autotools/autoconf.am | 12 +++++----- contrib/crossrpms/autotools/automake.add | 32 +++++++++++++++++++++++-- contrib/crossrpms/autotools/automake.am | 12 +++++----- contrib/crossrpms/autotools/target-automake.add | 7 ++++-- 5 files changed, 53 insertions(+), 17 deletions(-) diff --git a/contrib/crossrpms/autotools/autoconf.add b/contrib/crossrpms/autotools/autoconf.add index 983d86fa96..c451879cc6 100644 --- a/contrib/crossrpms/autotools/autoconf.add +++ b/contrib/crossrpms/autotools/autoconf.add @@ -2,7 +2,7 @@ %define srcvers 2.60 %if "%{_prefix}" != "/usr" -%define name @rpmprefix@autoconf-rtems +%define name @rpmprefix@autoconf %else %define name autoconf %endif @@ -16,6 +16,11 @@ Version: %{rpmvers} Release: @AUTOCONF_RPMREL@%{?dist} Summary: Tool for automatically generating GNU style Makefile.in's +%if "%{_prefix}" != "/usr" +Obsoletes: @rpmprefix@autoconf-rtems < %{version}-%{release} +Provides: @rpmprefix@autoconf-rtems = %{version}-%{release} +%endif + BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl m4 gawk emacs diff --git a/contrib/crossrpms/autotools/autoconf.am b/contrib/crossrpms/autotools/autoconf.am index 2d923b5b79..cdd77f7f88 100644 --- a/contrib/crossrpms/autotools/autoconf.am +++ b/contrib/crossrpms/autotools/autoconf.am @@ -4,15 +4,15 @@ AUTOCONF_SUBPACKAGES += $(top_srcdir)/binutils/rpm-install.add AUTOCONF_SUBPACKAGES += $(top_srcdir)/common/clean.add AUTOCONF_SUBPACKAGES += $(top_srcdir)/autotools/target-autoconf.add -autoconf-rtems.spec.in: $(AUTOCONF_SUBPACKAGES) Makefile.in +autoconf.spec.in: $(AUTOCONF_SUBPACKAGES) Makefile.in cat $(AUTOCONF_SUBPACKAGES) | sed \ -e "s/[@]AUTOCONF_RPMREL[@]/$(AUTOCONF_RPMREL)/" > $@ -CLEANFILES += autoconf-rtems.spec.in +CLEANFILES += autoconf.spec.in -@rpmprefix@autoconf-rtems.spec: autoconf-rtems.spec.in - $(MKSPEC) autoconf-rtems.spec.in | $(SPECSTRIP) > $@ -CLEANFILES += @rpmprefix@autoconf-rtems.spec -noinst_DATA += @rpmprefix@autoconf-rtems.spec +@rpmprefix@autoconf.spec: autoconf.spec.in + $(MKSPEC) autoconf.spec.in | $(SPECSTRIP) > $@ +CLEANFILES += @rpmprefix@autoconf.spec +noinst_DATA += @rpmprefix@autoconf.spec EXTRA_DIST += $(AUTOCONF_SUBPACKAGES) diff --git a/contrib/crossrpms/autotools/automake.add b/contrib/crossrpms/autotools/automake.add index a9fe0126a1..ba8c72cb77 100644 --- a/contrib/crossrpms/autotools/automake.add +++ b/contrib/crossrpms/autotools/automake.add @@ -3,8 +3,8 @@ %define amvers 1.10 %if "%{_prefix}" != "/usr" -%define name @rpmprefix@automake-rtems -%define requirements @rpmprefix@autoconf-rtems >= 2.60 +%define name @rpmprefix@automake +%define requirements @rpmprefix@autoconf >= 2.60 %else %define name automake %define requirements autoconf >= 2.60 @@ -18,6 +18,11 @@ Version: %{rpmvers} Release: @AUTOMAKE_RPMREL@%{?dist} Summary: Tool for automatically generating GNU style Makefile.in's +%if "%{_prefix}" != "/usr" +Obsoletes: @rpmprefix@automake-rtems < %{version}-%{release} +Provides: @rpmprefix@automake-rtems = %{version}-%{release} +%endif + BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: %{requirements} perl help2man @@ -37,6 +42,24 @@ standards. %prep %setup -q -n automake-%{srcvers} +# Work around rpm inserting bogus perl-module deps +cat << \EOF > %{name}-prov +#!/bin/sh +%{__perl_provides} $* |\ + sed -e '/^perl(Automake/d' +EOF +%define __perl_provides %{_builddir}/automake-%{srcvers}/%{name}-prov +chmod +x %{__perl_provides} + +cat << \EOF > %{name}-requ +#!/bin/sh +%{__perl_requires} $* |\ + sed -e '/^perl(Automake/d' +EOF +%define __perl_requires %{_builddir}/automake-%{srcvers}/%{name}-requ +chmod +x %{__perl_requires} + + %build PATH=%{_bindir}:$PATH # Don't use %%configure, it replaces config.sub/config.guess with the @@ -59,6 +82,11 @@ do install -m 644 `basename $i`.1 $RPM_BUILD_ROOT/%{_mandir}/man1 done +%if "%{_prefix}" != "/usr" +mkdir -p $RPM_BUILD_ROOT%{_datadir}/aclocal +echo "/usr/share/aclocal" > $RPM_BUILD_ROOT%{_datadir}/aclocal/dirlist +%endif + rm -f $RPM_BUILD_ROOT%{_infodir}/dir touch $RPM_BUILD_ROOT%{_infodir}/dir diff --git a/contrib/crossrpms/autotools/automake.am b/contrib/crossrpms/autotools/automake.am index ad1513c312..bcf7dc4648 100644 --- a/contrib/crossrpms/autotools/automake.am +++ b/contrib/crossrpms/autotools/automake.am @@ -4,15 +4,15 @@ AUTOMAKE_SUBPACKAGES += $(top_srcdir)/binutils/rpm-install.add AUTOMAKE_SUBPACKAGES += $(top_srcdir)/common/clean.add AUTOMAKE_SUBPACKAGES += $(top_srcdir)/autotools/target-automake.add -automake-rtems.spec.in: $(AUTOMAKE_SUBPACKAGES) Makefile.in +automake.spec.in: $(AUTOMAKE_SUBPACKAGES) Makefile.in cat $(AUTOMAKE_SUBPACKAGES) | sed \ -e "s/[@]AUTOMAKE_RPMREL[@]/$(AUTOMAKE_RPMREL)/" > $@ -CLEANFILES += automake-rtems.spec.in +CLEANFILES += automake.spec.in -@rpmprefix@automake-rtems.spec: automake-rtems.spec.in - $(MKSPEC) automake-rtems.spec.in | $(SPECSTRIP) > $@ -CLEANFILES += @rpmprefix@automake-rtems.spec -noinst_DATA += @rpmprefix@automake-rtems.spec +@rpmprefix@automake.spec: automake.spec.in + $(MKSPEC) automake.spec.in | $(SPECSTRIP) > $@ +CLEANFILES += @rpmprefix@automake.spec +noinst_DATA += @rpmprefix@automake.spec EXTRA_DIST += $(AUTOMAKE_SUBPACKAGES) diff --git a/contrib/crossrpms/autotools/target-automake.add b/contrib/crossrpms/autotools/target-automake.add index 1e6545e058..4658da4c8f 100644 --- a/contrib/crossrpms/autotools/target-automake.add +++ b/contrib/crossrpms/autotools/target-automake.add @@ -1,9 +1,9 @@ %post -/sbin/install-info --info-dir=%{_infodir} %{_infodir}/automake.info.gz +/sbin/install-info --info-dir=%{_infodir} %{_infodir}/automake.info.gz ||: %preun if [ $1 -eq 0 ]; then - /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/automake.info.gz + /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/automake.info.gz ||: fi %files @@ -19,6 +19,9 @@ fi %sysdir %{_mandir}/man1 %{_mandir}/man1/* %sysdir %{_datadir} +%if "%{_prefix}" != "/usr" +%{_datadir}/aclocal +%endif %{_datadir}/aclocal-%{amvers} %{_datadir}/automake-%{amvers} -- cgit v1.2.3