[rtems-crossrpms commit] Preps for gdb-7.7

Ralf Corsepius ralf at rtems.org
Thu May 8 11:04:59 UTC 2014


Module:    rtems-crossrpms
Branch:    master
Commit:    cd0e9ad3ca824a6e66b702466969feafc595ce93
Changeset: http://git.rtems.org/rtems-crossrpms/commit/?id=cd0e9ad3ca824a6e66b702466969feafc595ce93

Author:    Ralf Corsépius <ralf.corsepius at rtems.org>
Date:      Fri Feb  7 06:33:07 2014 +0100

Preps for gdb-7.7

---

 gdb/base-gdb.add   |    8 +++++++-
 gdb/install.add    |   13 ++++++++++++-
 gdb/target-gdb.add |    7 ++++++-
 3 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/gdb/base-gdb.add b/gdb/base-gdb.add
index 658f8a3..558bf0e 100644
--- a/gdb/base-gdb.add
+++ b/gdb/base-gdb.add
@@ -15,20 +15,24 @@ GDB files shared by all targets.
 
 %post -n @rpmprefix at gdb-common
   /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gdb.info.gz || :
+%if "%{gdb_version}" < "7.7"
   /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gdbint.info.gz || :
+%endif
   /sbin/install-info --info-dir=%{_infodir} %{_infodir}/stabs.info.gz || :
   /sbin/install-info --info-dir=%{_infodir} %{_infodir}/annotate.info.gz || :
 
 %preun -n @rpmprefix at gdb-common
 if [ $1 -eq 0 ]; then
   /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gdb.info.gz || :
+%if "%{gdb_version}" < "7.7"
   /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gdbint.info.gz || :
+%endif
   /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 @rpmprefix at gdb-common
-%defattr(-,root,root)
+%{?el5:%defattr(-,root,root)}
 %sysdir %{_prefix}
 %sysdir %{_prefix}/share
 
@@ -36,7 +40,9 @@ fi
 %ghost %{_infodir}/dir
 %{_infodir}/gdb.info*
 
+%if "%{gdb_version}" < "7.7"
 %{_infodir}/gdbint.info*
+%endif
 %{_infodir}/stabs.info*
 %{_infodir}/annotate.info*
 
diff --git a/gdb/install.add b/gdb/install.add
index 7b84f64..86cae26 100644
--- a/gdb/install.add
+++ b/gdb/install.add
@@ -46,9 +46,20 @@
 %endif
 
 %if "%{gdb_version}" >= "7.3.91"
-# gdb-7.3.91 installs host files, we don't want
+# gdb >= 7.3.91 installs host files, we don't want
   rm ${RPM_BUILD_ROOT}%{_includedir}/gdb/jit-reader.h
 %endif
 
   cd ..
 
+%if "%{gdb_version}" == "7.7"
+# gdb-7.7 misses to canonicalize man-pages
+  mv ${RPM_BUILD_ROOT}%{_mandir}/man1/gdb.1 ${RPM_BUILD_ROOT}%{_mandir}/man1/@tool_target at -gdb.1
+  mv ${RPM_BUILD_ROOT}%{_mandir}/man1/gdbserver.1 ${RPM_BUILD_ROOT}%{_mandir}/man1/@tool_target at -gdbserver.1
+  mv ${RPM_BUILD_ROOT}%{_mandir}/man5/gdbinit.5 ${RPM_BUILD_ROOT}%{_mandir}/man5/@tool_target at -gdbinit.5
+
+# not useful for us.
+  rm -f ${RPM_BUILD_ROOT}%{_datadir}/@tool_target at -gdb-%{gdb_version}/system-gdbinit/{wrs-linux,elinos}.*
+  rmdir ${RPM_BUILD_ROOT}%{_datadir}/@tool_target at -gdb-%{gdb_version}/system-gdbinit
+%endif
+
diff --git a/gdb/target-gdb.add b/gdb/target-gdb.add
index 6376ffd..b5dab39 100644
--- a/gdb/target-gdb.add
+++ b/gdb/target-gdb.add
@@ -12,7 +12,7 @@
 GNU gdb targetting @tool_target at .
 
 %files -n @rpmprefix@@tool_target at -gdb
-%defattr(-,root,root)
+%{?el5:%defattr(-,root,root)}
 %sysdir %{_prefix}
 %sysdir %{_prefix}/share
 %{?with_python:%{_datadir}/@tool_target at -gdb-%{gdb_version}}
@@ -21,6 +21,11 @@ GNU gdb targetting @tool_target at .
 %sysdir %{_mandir}/man1
 %{_mandir}/man1/@tool_target at -*.1*
 
+%if "%{gdb_version}" >= "7.7"
+%sysdir %{_mandir}/man5
+%{_mandir}/man5/@tool_target at -*.5*
+%endif
+
 %sysdir %{_bindir}
 %{_bindir}/@tool_target at -*
 




More information about the vc mailing list