[avr-gdb] Pass --disable-werror to configure (Fix FTBS BZ#716110). Remove hacks to work-around -Werror. Get ri

[corsepiu]

commit efe53c23d42a4a9b7469730eccb5b6a7a2edfdce
Author: Ralf Corsépius <corsepiu at fedoraproject.org>
Date:   Mon Jun 27 09:59:38 2011 +0200

    Pass --disable-werror to configure (Fix FTBS BZ#716110).
    Remove hacks to work-around -Werror.
    Get rid of superflous calls to "chrpath".
    Remove BR: chrpath.
    Remove %{_libdir}/libavr-sim.a.

 avr-gdb.spec |   26 ++++++++++++--------------
 1 files changed, 12 insertions(+), 14 deletions(-)
---
diff --git a/avr-gdb.spec b/avr-gdb.spec
index ca41fe4..ea7d00e 100644
--- a/avr-gdb.spec
+++ b/avr-gdb.spec
@@ -2,7 +2,7 @@
 
 Name:           %{target}-gdb
 Version:        7.1
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        GDB for (remote) debugging %{target} binaries
 Group:          Development/Tools
 License:        GPLv2+
@@ -10,7 +10,7 @@ URL:            http://sources.redhat.com/gdb/
 Source0:        http://ftp.gnu.org/gnu/gdb/gdb-%{version}.tar.bz2
 Source1:        README.fedora
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-%(%{__id_u} -n)
-BuildRequires:  ncurses-devel chrpath
+BuildRequires:  ncurses-devel
 
 %description
 This is a special version of GDB, the GNU Project debugger, for (remote)
@@ -21,11 +21,6 @@ the moment it crashed.
 
 %prep
 %setup -q -c
-pushd gdb-%{version}
-# fix various configure tests failing on -Werror-implicit-function-declaration
-sed -i -e 's/exit (0)/return 0/g' -e 's/ exit(2)/ return 2/g' \
-  `find -name configure`
-popd
 cp %{SOURCE1} .
 
 
@@ -35,7 +30,7 @@ pushd build
 CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE" \
   ../gdb-%{version}/configure --prefix=%{_prefix} \
   --libdir=%{_libdir} --mandir=%{_mandir} --infodir=%{_infodir} \
-  --target=%{target} --disable-nls
+  --target=%{target} --disable-nls --disable-werror
 make %{?_smp_mflags}
 popd
 
@@ -45,16 +40,13 @@ rm -rf $RPM_BUILD_ROOT
 pushd build
 make install DESTDIR=$RPM_BUILD_ROOT
 popd
-# our usual libtool sed magic doesn't work as libtool gets generated during
-# the make <sigh>
-chrpath --delete $RPM_BUILD_ROOT%{_bindir}/%{name}
-chrpath --delete $RPM_BUILD_ROOT%{_bindir}/%{name}tui
-chrpath --delete $RPM_BUILD_ROOT%{_bindir}/avr-run
 
 # we don't want these as we are a cross version
 rm -r $RPM_BUILD_ROOT%{_infodir}
 rm    $RPM_BUILD_ROOT%{_libdir}/libiberty.a
 rm -r $RPM_BUILD_ROOT%{_datadir}/gdb
+# Should not be installed
+rm    $RPM_BUILD_ROOT%{_libdir}/libavr-sim.a
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -65,12 +57,18 @@ rm -rf $RPM_BUILD_ROOT
 %doc gdb-%{version}/COPYING* gdb-%{version}/README*
 %{_bindir}/%{name}*
 %{_bindir}/avr-run
-%{_libdir}/libavr-sim.a
 %{_mandir}/man1/avr-*
 
 
 
 %changelog
+* Mon Jun 27 2011 Ralf Corsépius <corsepiu at fedoraproject.org> - 7.1-3
+- Pass --disable-werror to configure (Fix FTBS BZ#716110).
+- Remove hacks to work-around -Werror.
+- Get rid of superflous calls to "chrpath".
+- Remove BR: chrpath.
+- Remove %%{_libdir}/libavr-sim.a.
+
 * Mon Feb 07 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 7.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild