[rtems-crossrpms commit] Regenerate.
Ralf Corsepius
ralf at rtems.org
Fri Sep 7 05:29:25 UTC 2012
Module: rtems-crossrpms
Branch: master
Commit: 695a7ff65540364fece75cc154959b28b378969d
Changeset: http://git.rtems.org/rtems-crossrpms/commit/?id=695a7ff65540364fece75cc154959b28b378969d
Author: Ralf Corsépius <ralf.corsepius at rtems.org>
Date: Fri Jul 20 14:00:37 2012 +0200
Regenerate.
---
rtems4.11/v850/Makefile.in | 6 +-
rtems4.11/v850/rtems-4.11-v850-rtems4.11-gdb.spec | 64 +++------------------
2 files changed, 12 insertions(+), 58 deletions(-)
diff --git a/rtems4.11/v850/Makefile.in b/rtems4.11/v850/Makefile.in
index b9cf74c..93c3649 100644
--- a/rtems4.11/v850/Makefile.in
+++ b/rtems4.11/v850/Makefile.in
@@ -216,10 +216,10 @@ GCC_SUBPACKAGES = $(top_srcdir)/common/common.add \
$(top_srcdir)/gcc/target-objc.add \
$(top_srcdir)/gcc/target-newlib.add \
$(top_srcdir)/gcc/base-newlib.add
-GDB_VERS = 7.4.1
+GDB_VERS = 7.4.91
GDB_PKGVERS = $(GDB_VERS)
-GDB_RPMREL = 3
-GDB_OPTS =
+GDB_RPMREL = 1
+GDB_OPTS = --disable-infos
GDB_SUBPACKAGES = $(top_srcdir)/common/common.add \
$(top_srcdir)/gdb/gdb.add $(top_srcdir)/gdb/prep.add \
$(top_srcdir)/gdb/build.add $(top_srcdir)/gdb/install.add \
diff --git a/rtems4.11/v850/rtems-4.11-v850-rtems4.11-gdb.spec b/rtems4.11/v850/rtems-4.11-v850-rtems4.11-gdb.spec
index 111fcdc..c1e5afe 100644
--- a/rtems4.11/v850/rtems-4.11-v850-rtems4.11-gdb.spec
+++ b/rtems4.11/v850/rtems-4.11-v850-rtems4.11-gdb.spec
@@ -45,14 +45,14 @@
%define _host_rpmprefix %{nil}
%endif
-%define gdb_version 7.4.1
-%define gdb_rpmvers %{expand:%(echo 7.4.1 | tr - _)}
+%define gdb_version 7.4.91
+%define gdb_rpmvers %{expand:%(echo 7.4.91 | tr - _)}
Name: rtems-4.11-v850-rtems4.11-gdb
Summary: Gdb for target v850-rtems4.11
Group: Development/Tools
Version: %{gdb_rpmvers}
-Release: 3%{?dist}
+Release: 1%{?dist}
License: GPL/LGPL
URL: http://sources.redhat.com/gdb
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -93,11 +93,12 @@ BuildRequires: %{_host_rpmprefix}expat-devel
%{?with_system_readline:BuildRequires: %{_host_rpmprefix}readline-devel}
BuildRequires: %{_host_rpmprefix}ncurses-devel
-# Required for building the infos
-BuildRequires: /sbin/install-info
BuildRequires: texinfo >= 4.2
-Requires: rtems-4.11-gdb-common
+%if "%{gdb_version}" == "7.4.91"
+Source0: ftp://ftp.sourceware.org/pub/gdb/snapshots/gdb-7.4.91.tar.bz2
+Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gdb-7.4.91-rtems4.11-20120720.diff
+%endif
%if "%{gdb_version}" == "7.4.1"
Source0: ftp://ftp.gnu.org/gnu/gdb/gdb-7.4.1.tar.bz2
Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gdb-7.4.1-rtems4.11-20120706.diff
@@ -144,7 +145,6 @@ cd ..
--mandir=%{_mandir} --infodir=%{_infodir}
make %{?_smp_mflags} all
- make info
cd ..
%install
@@ -154,13 +154,8 @@ cd ..
cd build
make DESTDIR=$RPM_BUILD_ROOT install
- rm -f $RPM_BUILD_ROOT%{_infodir}/dir
- touch $RPM_BUILD_ROOT%{_infodir}/dir
-
-# These come from other packages
- rm -rf $RPM_BUILD_ROOT%{_infodir}/bfd*
- rm -rf $RPM_BUILD_ROOT%{_infodir}/configure*
- rm -rf $RPM_BUILD_ROOT%{_infodir}/standards*
+# Conflict with a native gdb's infos
+ rm -rf $RPM_BUILD_ROOT%{_infodir}
# We don't ship host files
rm -f ${RPM_BUILD_ROOT}%{_libdir}/libiberty*
@@ -251,44 +246,3 @@ GNU gdb targetting v850-rtems4.11.
%dir %{_bindir}
%{_bindir}/v850-rtems4.11-*
-# ==============================================================
-# rtems-4.11-gdb-common
-# ==============================================================
-%package -n rtems-4.11-gdb-common
-Summary: Base package for RTEMS gdbs
-Group: Development/Tools
-Requires(post): /sbin/install-info
-Requires(preun): /sbin/install-info
-%{?_with_noarch_subpackages:BuildArch: noarch}
-
-%description -n rtems-4.11-gdb-common
-
-GDB files shared by all targets.
-
-%post -n rtems-4.11-gdb-common
- /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gdb.info.gz || :
- /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gdbint.info.gz || :
- /sbin/install-info --info-dir=%{_infodir} %{_infodir}/stabs.info.gz || :
- /sbin/install-info --info-dir=%{_infodir} %{_infodir}/annotate.info.gz || :
-
-%preun -n rtems-4.11-gdb-common
-if [ $1 -eq 0 ]; then
- /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gdb.info.gz || :
- /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gdbint.info.gz || :
- /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/stabs.info.gz || :
- /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/annotate.info.gz || :
-fi
-
-%files -n rtems-4.11-gdb-common
-%defattr(-,root,root)
-%dir %{_prefix}
-%dir %{_prefix}/share
-
-%dir %{_infodir}
-%ghost %{_infodir}/dir
-%{_infodir}/gdb.info*
-
-%{_infodir}/gdbint.info*
-%{_infodir}/stabs.info*
-%{_infodir}/annotate.info*
-
More information about the vc
mailing list