2005-04-13 Ralf Corsepius <ralf.corsepius@rtems.org>

	* gdb/gdb.add, gdb/target-gdb.add: Introduce %{_infodir}, %{_mandir},
	%{_bindir}. Various minor fixes.
	Rename src.rpm into <target>-gdb.
	Disable sim for avr.

2 files changed, 29 insertions, 23 deletions

diff --git a/scripts/gdb/gdb.add b/scripts/gdb/gdb.add
index 2a3ab4f9c7..f029a8486c 100644
--- a/scripts/gdb/gdb.add
+++ b/scripts/gdb/gdb.add
@@ -2,7 +2,7 @@
 %define gdb_version	@gdb_version@
 %define gdb_target	@target_alias@
 
-Name:         %{rpmprefix}%{gdb_target}-gdb-collection
+Name:         %{rpmprefix}%{gdb_target}-gdb
 Release:      @Release@
 License:      GPL/LGPL
 Group:        %{rpmgroup}
@@ -43,6 +43,9 @@ BuildPreReq:	ncurses-devel
 #  and targets which require extra arguments.
 %define _sim	1
 
+%if "%{gdb_target}" == "avr-rtems@osversion@"
+%define _sim	0
+%endif
 %if "%{gdb_target}" == "m68k-rtems@osversion@"
 %define _sim	0
 %endif
@@ -99,16 +102,20 @@ test -d build || mkdir build
   rm -rf $RPM_BUILD_ROOT%{_prefix}/lib/lib*a
 
   # These come from other packages
-  rm -rf $RPM_BUILD_ROOT%{_prefix}/info/bfd*
-  rm -rf $RPM_BUILD_ROOT%{_prefix}/info/configure*
-  rm -rf $RPM_BUILD_ROOT%{_prefix}/info/standards*
+  rm -rf $RPM_BUILD_ROOT%{_infodir}/bfd*
+  rm -rf $RPM_BUILD_ROOT%{_infodir}/configure*
+  rm -rf $RPM_BUILD_ROOT%{_infodir}/standards*
  
   # gzip info files
-  gzip -f $RPM_BUILD_ROOT%{_prefix}/info/*.info 2>/dev/null
-  gzip -f $RPM_BUILD_ROOT%{_prefix}/info/*.info-? 2>/dev/null
-%if "%{gdb_version}" < "6.0"
-  gzip -f $RPM_BUILD_ROOT%{_prefix}/info/*.info-?? 2>/dev/null
-%endif
+  ls $RPM_BUILD_ROOT%{_infodir}/*.info \
+    $RPM_BUILD_ROOT%{_infodir}/*.info-? \
+    $RPM_BUILD_ROOT%{_infodir}/*.info-?? \
+  | while read a; do \
+    gzip -9qf $a 2>/dev/null; \
+  done
 
   # We don't ship info/dir
-  rm -f $RPM_BUILD_ROOT%{_prefix}/info/dir
+  rm -f $RPM_BUILD_ROOT%{_infodir}/dir
+
+  # gzip man pages
+  gzip -9qf $RPM_BUILD_ROOT%{_mandir}/man?/*.? 2>/dev/null
diff --git a/scripts/gdb/target-gdb.add b/scripts/gdb/target-gdb.add
index ad14e44c34..3e37cfad8b 100644
--- a/scripts/gdb/target-gdb.add
+++ b/scripts/gdb/target-gdb.add
@@ -1,11 +1,10 @@
 # =====================================================================
 # %{gdb_target}-gdb
 # =====================================================================
-
-%package -n %{rpmprefix}%{gdb_target}-gdb
-Summary:      rtems gdb for %{gdb_target}
-Group: %{rpmgroup}
-Requires: %{rpmprefix}rtems@osversion@-base-gdb
+# %package -n %{rpmprefix}%{gdb_target}-gdb
+# Summary:      rtems gdb for %{gdb_target}
+# Group: %{rpmgroup}
+# Requires: %{rpmprefix}rtems@osversion@-base-gdb
 
 %description -n %{rpmprefix}%{gdb_target}-gdb
 
@@ -15,22 +14,22 @@ This is the GNU gdb for RTEMS targetting %{gdb_target}.
 
 %files -n %{rpmprefix}%{gdb_target}-gdb
 %defattr(-,root,root)
-%doc %{_prefix}/man/man1/%{gdb_target}-gdb.1*
+%doc %{_mandir}/man1/%{gdb_target}-gdb.1*
 %if "%_sim" == "1"
-%doc %{_prefix}/man/man1/%{gdb_target}-run.1*
+%doc %{_mandir}/man1/%{gdb_target}-run.1*
 %endif
 %if "%{gdb_version}" >= "6.3"
-%{_prefix}/man/man1/%{gdb_target}-gdbtui.1*
+%{_mandir}/man1/%{gdb_target}-gdbtui.1*
 %endif
 
-%dir %{_prefix}/bin
-%{_prefix}/bin/%{gdb_target}-gdb%{_exeext}
+%dir %{_bindir}
+%{_bindir}/%{gdb_target}-gdb%{_exeext}
 %if "%_sim" == "1"
-%{_prefix}/bin/%{gdb_target}-run%{_exeext}
+%{_bindir}/%{gdb_target}-run%{_exeext}
 %endif
 %if "%{gdb_target}" == "sparc-rtems@osversion@"
-%{_prefix}/bin/%{gdb_target}-sis%{_exeext}
+%{_bindir}/%{gdb_target}-sis%{_exeext}
 %endif
 %if "%{gdb_version}" >= "6.3"
-%{_prefix}/bin/%{gdb_target}-gdbtui
+%{_bindir}/%{gdb_target}-gdbtui
 %endif