diff options
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/ChangeLog | 6 | ||||
| -rw-r--r-- | scripts/binutils/base-binutils.add | 8 | ||||
| -rw-r--r-- | scripts/binutils/binutils.add | 8 |
3 files changed, 15 insertions, 7 deletions
diff --git a/scripts/ChangeLog b/scripts/ChangeLog index 609fcca197..99b6d700f7 100644 --- a/scripts/ChangeLog +++ b/scripts/ChangeLog @@ -1,5 +1,11 @@ 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: Add rpmgroup, rpmprefix support. diff --git a/scripts/binutils/base-binutils.add b/scripts/binutils/base-binutils.add index 0041f84913..21644618a2 100644 --- a/scripts/binutils/base-binutils.add +++ b/scripts/binutils/base-binutils.add @@ -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 diff --git a/scripts/binutils/binutils.add b/scripts/binutils/binutils.add index facbd683bb..e811d33a99 100644 --- a/scripts/binutils/binutils.add +++ b/scripts/binutils/binutils.add @@ -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} |