[sdcc/el6] Upgrade to 3.2.0 from upstream

[Roy Rankin]

commit 3dd27ce1971ab9392a96ae4c1187b248278e9eac
Author: Roy Rankin <royr at rack3.iinet.net.au>
Date:   Fri Jul 27 16:34:42 2012 +1000

    Upgrade to 3.2.0 from upstream

 .gitignore                           |    1 +
 sdcc-2.8.0-debugger-makefile.diff    |   15 -
 sdcc-2.8.0-doc-lyx.diff              |   26 -
 sdcc-2.9.0-configure.diff            |   67 ---
 sdcc-2.9.0-patch-out-getline.diff    |  879 ----------------------------------
 sdcc-2.9.0-r5476-fix-doublefree.diff |   20 -
 sdcc-2.9.0-r5508-fix-bug2805333.diff |   39 --
 sdcc.spec                            |   31 +-
 sources                              |    2 +-
 9 files changed, 17 insertions(+), 1063 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 063a6ef..900c990 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 sdcc-src-2.9.0.tar.bz2
+/sdcc-src-3.2.0.tar.bz2
diff --git a/sdcc.spec b/sdcc.spec
index 707ed16..c563335 100644
--- a/sdcc.spec
+++ b/sdcc.spec
@@ -1,22 +1,19 @@
 Name:           sdcc
-Version:        2.9.0
-Release:        7%{?dist}
+Version:        3.2.0
+Release:        0%{?dist}
 Summary:        Small Device C Compiler
 Group:          Applications/Engineering
 License:        GPLv2+
 URL:            http://sdcc.sourceforge.net/
 Source0:        http://downloads.sourceforge.net/sdcc/sdcc-src-%{version}.tar.bz2
 Source1:        README.fedora
-Patch0:         sdcc-2.9.0-patch-out-getline.diff
-Patch1:         sdcc-2.9.0-configure.diff
-Patch2:         sdcc-2.9.0-r5476-fix-doublefree.diff
-Patch3:         sdcc-2.9.0-r5508-fix-bug2805333.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  autoconf
 BuildRequires:  bison
+BuildRequires:  boost-devel
 BuildRequires:  flex
-BuildRequires:  gc-devel
+#BuildRequires:  gc-devel
 BuilDrequires:  gputils
 BuildRequires:  lyx
 BuildRequires:  latex2html
@@ -54,10 +51,6 @@ Emacs extensions for SDCC.
 
 %prep
 %setup -q -n sdcc
-%patch0 -p1
-%patch1 -p1
-%patch2 -p2
-%patch3 -p1
 find -name '*.[ch]' -exec chmod -x '{}' \;
 
 # Disable brp-strip-static-archive for now because it errors trying to
@@ -68,11 +61,10 @@ find -name '*.[ch]' -exec chmod -x '{}' \;
 %build
 # Rebuild configure scripts (patched configure.in s in patch0).
 autoconf
-cd debugger/mcs51 ; autoconf ; cd ../..
-cd sim/ucsim ; autoconf ; cd ../..
 
-%configure --enable-doc --enable-libgc STRIP=:
-make Q=
+%configure --enable-doc  STRIP=:
+
+%{__make} %{?_smp_mflags} Q=
 
 
 %install
@@ -86,7 +78,7 @@ find $RPM_BUILD_ROOT -type f -name \*.c -exec chmod a-x '{}' \;
 mkdir -p $RPM_BUILD_ROOT%{_libexecdir}/sdcc
 mv $RPM_BUILD_ROOT%{_bindir}/* $RPM_BUILD_ROOT%{_libexecdir}/sdcc
 
-# Create launch scripts in %{_bindir}
+# Create launch scripts in _bindir
 pushd $RPM_BUILD_ROOT%{_bindir}
 for x in ../libexec/sdcc/*; do
 echo "#!/bin/sh
@@ -112,6 +104,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_libexecdir}/%{name}
 %{_datadir}/%{name}
 %exclude %{_datadir}/%{name}/lib/src
+# Don't include support files as already in binutils-devel
+%exclude %{_includedir}/
+%exclude %{_libdir}/
+
 
 
 %files libc-sources
@@ -125,6 +121,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Jul 27 2012 Roy Rankin <rrankin at ihug.com.au> - 3.2.0-0
+- Upstream release 3.2.0
+
 * Sun Dec 6 2009 Conrad Meyer <konrad at tylerc.org> - 2.9.0-7
 - Only disable brp-strip-static.
 
diff --git a/sources b/sources
index aac2711..b23e0e6 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-a6151ed328fd3bc48305ffbc628dc122  sdcc-src-2.9.0.tar.bz2
+0808a9b4109d2ba6046ddd7b679a0012  sdcc-src-3.2.0.tar.bz2