Merger from CVS-HEAD.

This commit is contained in:
Ralf Corsepius
2008-11-12 15:40:26 +00:00
parent 6f536795d6
commit 0b1ceac847
8 changed files with 18 additions and 7 deletions

View File

@@ -1,5 +1,5 @@
%define rpmvers 2.61
%define srcvers 2.61
%define srcvers @AUTOCONF_VERS@
%define rpmvers %{expand:%(echo "@AUTOCONF_VERS@" | tr - _ )}
%if "%{_prefix}" != "/usr"
%define name @rpmprefix@autoconf
@@ -13,7 +13,7 @@ License: GPL
URL: http://www.gnu.org/software/autoconf
Group: Development/Tools
Version: %{rpmvers}
Release: @AUTOCONF_RPMREL@%{?dist}
Release: @AUTOCONF_RPMREL@
Summary: Tool for automatically generating GNU style Makefile.in's
%if "%{_prefix}" != "/usr"
@@ -24,6 +24,9 @@ Provides: @rpmprefix@autoconf-rtems = %{version}-%{release}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
BuildRequires: perl m4 gawk emacs
%if "%{version}" >= "2.62"
BuildRequires: m4 >= 1.4.5
%endif
Requires: m4 gawk
Requires(post): /sbin/install-info
Requires(preun): /sbin/install-info

View File

@@ -6,6 +6,7 @@ AUTOCONF_SUBPACKAGES += $(top_srcdir)/autotools/target-autoconf.add
autoconf.spec.in: $(AUTOCONF_SUBPACKAGES) Makefile.in
cat $(AUTOCONF_SUBPACKAGES) | sed \
-e "s/[@]AUTOCONF_VERS[@]/$(AUTOCONF_VERS)/" \
-e "s/[@]AUTOCONF_RPMREL[@]/$(AUTOCONF_RPMREL)/" > $@
CLEANFILES += autoconf.spec.in

View File

@@ -1,5 +1,5 @@
%define rpmvers 1.10
%define srcvers 1.10
%define rpmvers @AUTOMAKE_VERS@
%define srcvers @AUTOMAKE_VERS@
%define amvers 1.10
%if "%{_prefix}" != "/usr"
@@ -15,7 +15,7 @@ URL: http://sources.redhat.com/automake
License: GPL
Group: Development/Tools
Version: %{rpmvers}
Release: @AUTOMAKE_RPMREL@%{?dist}
Release: @AUTOMAKE_RPMREL@
Summary: Tool for automatically generating GNU style Makefile.in's
%if "%{_prefix}" != "/usr"

View File

@@ -6,6 +6,7 @@ AUTOMAKE_SUBPACKAGES += $(top_srcdir)/autotools/target-automake.add
automake.spec.in: $(AUTOMAKE_SUBPACKAGES) Makefile.in
cat $(AUTOMAKE_SUBPACKAGES) | sed \
-e "s/[@]AUTOMAKE_VERS[@]/$(AUTOMAKE_VERS)/" \
-e "s/[@]AUTOMAKE_RPMREL[@]/$(AUTOMAKE_RPMREL)/" > $@
CLEANFILES += automake.spec.in

View File

@@ -38,6 +38,7 @@ fi
%files -n @rpmprefix@binutils-common
%defattr(-,root,root)
%sysdir %{_prefix}
%sysdir %{_infodir}
%ghost %{_infodir}/dir
%{_infodir}/as.info*

View File

@@ -45,6 +45,9 @@
if test ! -f ${RPM_BUILD_ROOT}%{_bindir}/@tool_target@-windres%{_exeext}; then
rm -f ${RPM_BUILD_ROOT}%{_mandir}/man1/@tool_target@-windres*
fi
if test ! -f ${RPM_BUILD_ROOT}%{_bindir}/@tool_target@-windmc%{_exeext}; then
rm -f ${RPM_BUILD_ROOT}%{_mandir}/man1/@tool_target@-windmc*
fi
cd ..

View File

@@ -13,6 +13,7 @@ GNU binutils targetting @tool_target@.
%files -n @rpmprefix@@tool_target@-binutils
%defattr(-,root,root)
%sysdir %{_prefix}
%sysdir %{_mandir}
%sysdir %{_mandir}/man1
%{_mandir}/man1/@tool_target@-*.1*

View File

@@ -47,7 +47,7 @@ EOF
chmod +x %{_builddir}/%{name}-%{gcc_rpmvers}/find-requires
%define __find_requires %{_builddir}/%{name}-%{gcc_rpmvers}/find-requires
%ifnarch noarch
# Extract %%__debug_install_post into debug_install_post~
cat << \EOF > debug_install_post~
%__debug_install_post
@@ -69,4 +69,5 @@ sed -e 's,^[ ]*/usr/lib/rpm/find-debuginfo.sh,./find-debuginfo.sh,' \
< debug_install_post~ > debug_install_post
%define __debug_install_post . ./debug_install_post
%endif