2003-09-02 Ralf Corsepius <corsepiu@faw.uni-ulm.de>

* binutils/base-binutils.add: Preps for 2.14 (Merger from CVS trunk).
	* binutils/binutils.add: Use %{binutils_version} instead of
	@binutils_version@ (Missed in previous patches).
This commit is contained in:
Ralf Corsepius
2003-09-02 15:57:53 +00:00
parent 13a4b60239
commit 38a09f9c09
3 changed files with 15 additions and 7 deletions

View File

@@ -1,3 +1,9 @@
2003-09-02 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* binutils/base-binutils.add: Preps for 2.14 (Merger from CVS trunk).
* binutils/binutils.add: Use %{binutils_version} instead of
@binutils_version@ (Missed in previous patches).
2003-09-02 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* autotools/autoconf.spec.in, autotools/automake.spec.in:

View File

@@ -37,13 +37,15 @@ This is the base for binutils regardless of target CPU.
%dir %{_prefix}/info
%doc %{_prefix}/info/dir
%doc %{_prefix}/info/as.info.gz
%doc %{_prefix}/info/as.info-*.gz
%doc %{_prefix}/info/bfd.info.gz
%doc %{_prefix}/info/bfd.info-?.gz
%doc %{_prefix}/info/binutils.info.gz
%doc %{_prefix}/info/binutils.info-?.gz
%doc %{_prefix}/info/ld.info.gz
%if "%{binutils_version}" < "2.14"
%doc %{_prefix}/info/as.info-*.gz
%doc %{_prefix}/info/bfd.info-?.gz
%doc %{_prefix}/info/binutils.info-?.gz
%doc %{_prefix}/info/ld.info-?.gz
%endif
# deleted as of 2.13
# %doc %{_prefix}/info/gasp.info.gz
%doc %{_prefix}/info/standards.info.gz

View File

@@ -14,8 +14,8 @@ Prefix: %{_prefix}
BuildPreReq: /sbin/install-info
BuildPreReq: texinfo >= 4.2
Version: @binutils_version@
Source0: ftp://ftp.gnu.org/pub/gnu/binutils/binutils-@binutils_version@.tar.bz2
Version: %{binutils_version}
Source0: ftp://ftp.gnu.org/pub/gnu/binutils/binutils-%{binutils_version}.tar.bz2
@PATCH1@
#
@@ -45,7 +45,7 @@ This is binutils sources with patches for RTEMS.
%build
cd build
../binutils-@binutils_version@/configure \
../binutils-%{binutils_version}/configure \
--build=%_build --host=%_host \
--target=%{binutils_target} \
--verbose --prefix=%{_prefix} --disable-nls
@@ -60,7 +60,7 @@ This is binutils sources with patches for RTEMS.
make prefix=$RPM_BUILD_ROOT%{_prefix} install-info
# A bug in binutils: binutils does not install share/locale
# however it uses it
../binutils-@binutils_version@/mkinstalldirs \
../binutils-%{binutils_version}/mkinstalldirs \
$RPM_BUILD_ROOT%{_prefix}/share/locale
rm -f $RPM_BUILD_ROOT%{_prefix}/bin/%{binutils_target}-c++filt%{_exeext}