From 93462a8a7b1a4b298f07c97a8cb3640c4a4c3419 Mon Sep 17 00:00:00 2001 From: cvsdist Date: Thu, 9 Sep 2004 05:17:04 +0000 Subject: [PATCH] auto-import gdb-6.1post-1.20040607.3.1 from gdb-6.1post-1.20040607.3.1.src.rpm --- gdb.spec | 32 ++++++++++++++++++++++---------- 1 file changed, 22 insertions(+), 10 deletions(-) diff --git a/gdb.spec b/gdb.spec index 437ddbb..3902418 100644 --- a/gdb.spec +++ b/gdb.spec @@ -6,7 +6,7 @@ Summary: A GNU source-level debugger for C, C++ and other languages. Name: gdb # Daily snapshot of gdb taken from FSF mainline cvs, after the 6.1 branchpoint. Version: 6.1post -Release: 1 +Release: 1.%{cvsdate}.3.1 License: GPL Group: Development/Debuggers Source: ftp://sources.redhat.com/pub/gdb/snapshots/current/gdb+dejagnu-20040607.tar.bz2 @@ -31,6 +31,7 @@ Patch3: gdb-6.1post-libunwind-tst.patch # Silence gcc warnings. Patch4: gdb-6.1post-gccwarn.patch ####### end patches from the previous RPM. +Patch5: gdb-6.0post-pie-mar2004.patch BuildRequires: ncurses-devel glibc-devel gcc make gzip texinfo dejagnu libunwind >= 0.96-3 @@ -54,7 +55,8 @@ printing their data. %patch1 -p1 %patch2 -p1 %patch3 -p1 -%patch4 -p1 +%patch4 -p1 +%patch5 -p1 # Change the version that gets printed at GDB startup, so it is RedHat # specific. @@ -163,15 +165,26 @@ chmod 755 $RPM_BUILD_ROOT%{_prefix}/bin/gcore # These are part of binutils rm -rf $RPM_BUILD_ROOT/usr/share/locale/ -rm -f $RPM_BUILD_ROOT%{_infodir}/bfd* $RPM_BUILD_ROOT%{_infodir}/standard* +rm -f $RPM_BUILD_ROOT%{_infodir}/bfd* +rm -f $RPM_BUILD_ROOT%{_infodir}/standard* +rm -f $RPM_BUILD_ROOT%{_infodir}/mmalloc* rm -f $RPM_BUILD_ROOT%{_infodir}/configure* -rm -rf $RPM_BUILD_ROOT/usr/include/ $RPM_BUILD_ROOT/%{_libdir}/lib{bfd*,opcodes*,iberty*} +rm -rf $RPM_BUILD_ROOT/usr/include/ +rm -rf $RPM_BUILD_ROOT/%{_libdir}/lib{bfd*,opcodes*,iberty*,mmalloc*} # Delete this too because the dir file will be updated at rpm install time. # We don't want a gdb specific one overwriting the system wide one. rm -f $RPM_BUILD_ROOT%{_infodir}/dir +# This opprobrious hack is to get rid of the full path of the source texinfo +# file, that makeinfo adds to the info file. The fullpath contains +# architecture information, and it would make the resulting info files differ +# on different arches, therefore creating unnecessary conflicts when +# installing multiple RPMS. +path=`echo $RPM_BUILD_ROOT | sed s/install/BUILD/` +sed -i "s|$path||" $RPM_BUILD_ROOT%{_infodir}/*.info* + %clean rm -rf $RPM_BUILD_ROOT @@ -185,8 +198,6 @@ rm -rf $RPM_BUILD_ROOT [ -f %{_infodir}/gdb.info.gz ] && /sbin/install-info %{_infodir}/gdb.info.gz %{_infodir}/dir || : [ -f %{_infodir}/gdbint.info ] && /sbin/install-info %{_infodir}/gdbint.info %{_infodir}/dir || : [ -f %{_infodir}/gdbint.info.gz ] && /sbin/install-info %{_infodir}/gdbint.info.gz %{_infodir}/dir || : -[ -f %{_infodir}/mmalloc.info ] && /sbin/install-info %{_infodir}/mmalloc.info %{_infodir}/dir || : -[ -f %{_infodir}/mmalloc.info.gz ] && /sbin/install-info %{_infodir}/mmalloc.info.gz %{_infodir}/dir || : [ -f %{_infodir}/stabs.info ] && /sbin/install-info %{_infodir}/stabs.info %{_infodir}/dir || : [ -f %{_infodir}/stabs.info.gz ] && /sbin/install-info %{_infodir}/stabs.info.gz %{_infodir}/dir || : @@ -198,8 +209,6 @@ if [ $1 = 0 ]; then [ -f %{_infodir}/gdb.info.gz ] && /sbin/install-info --delete %{_infodir}/gdb.info.gz %{_infodir}/dir || : [ -f %{_infodir}/gdbint.info ] && /sbin/install-info --delete %{_infodir}/gdbint.info %{_infodir}/dir || : [ -f %{_infodir}/gdbint.info.gz ] && /sbin/install-info --delete %{_infodir}/gdbint.info.gz %{_infodir}/dir || : - [ -f %{_infodir}/mmalloc.info ] && /sbin/install-info --delete %{_infodir}/mmalloc.info %{_infodir}/dir || : - [ -f %{_infodir}/mmalloc.info.gz ] && /sbin/install-info --delete %{_infodir}/mmalloc.info.gz %{_infodir}/dir || : [ -f %{_infodir}/stabs.info ] && /sbin/install-info --delete %{_infodir}/stabs.info %{_infodir}/dir || : [ -f %{_infodir}/stabs.info.gz ] && /sbin/install-info --delete %{_infodir}/stabs.info.gz %{_infodir}/dir || : fi @@ -208,17 +217,20 @@ fi %defattr(-,root,root) %doc COPYING COPYING.LIB README NEWS /usr/bin/* -%{_libdir}/libmmalloc.a* %{_mandir}/*/* %{_infodir}/annotate.info* %{_infodir}/gdb.info* %{_infodir}/gdbint.info* %{_infodir}/stabs.info* -%{_infodir}/mmalloc.info* # don't include the files in include, they are part of binutils %changelog +* Tue Jun 15 2004 Elena Zannoni 0.200400607.3 +- Remove installation of mmalloc, and its info files. +- Add hack to deal with differring info files generated by makeinfo. +- Restore release number convention. + * Tue Jun 15 2004 Elliot Lee - rebuilt