From 658d3a08bd96dc57e638c73b1f4c30c261f2be0d Mon Sep 17 00:00:00 2001
From: Roy Rankin <rrankin@ihug.com.au>
Date: Jul 04 2015 06:47:46 +0000
Subject: upgrade to version 3.5.0


---

diff --git a/.gitignore b/.gitignore
index aea93da..feeea2a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,6 @@
 /sdcc-src-3.4.0.tar.bz2
 /sdcc-3.4.0-libiberty.patch
 /sdcc-3.4.0-strndup.patch
+/sdcc-3.5.0-libiberty.patch
+/binutils-2.25-bfd.patch
+/sdcc-src-3.5.0.tar.bz2
diff --git a/sdcc.spec b/sdcc.spec
index b97602c..7010a30 100644
--- a/sdcc.spec
+++ b/sdcc.spec
@@ -1,15 +1,14 @@
 Name:           sdcc
-Version:        3.4.0
-Release:        7%{?dist}
+Version:        3.5.0
+Release:        1%{?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:         binutils-2.24-bfd.patch
+Patch0:         binutils-2.25-bfd.patch
 Patch1:		sdcc-%{version}-libiberty.patch
-Patch2:		sdcc-%{version}-strndup.patch
 
 BuildRequires:  bison
 BuildRequires:  boost-devel
@@ -55,11 +54,8 @@ Emacs extensions for SDCC.
 
 %prep
 %setup -q
-pushd support/sdbinutils
 %patch0 -p1
-popd
 %patch1 -p1
-%patch2 -p1
 find -name '*.{c,h,cc}' -exec chmod -x '{}' \;
 
 # Disable brp-strip-static-archive for now because it errors trying to
@@ -71,7 +67,7 @@ find -name '*.{c,h,cc}' -exec chmod -x '{}' \;
 # Preset PDFOPT to /bin/cp
 OPTS='PDFOPT="/bin/cp"'
 
-%configure --enable-doc STRIP=: ${OPTS}
+%configure --enable-doc --disable-non-free STRIP=: ${OPTS}
 %{__make} Q= QUIET=
 
 
@@ -84,8 +80,6 @@ mv $RPM_BUILD_ROOT%{_bindir}/*.el $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp
 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
-# remove non-free component
-rm -rf $RPM_BUILD_ROOT%{_datadir}/%{name}/non-free
 
 
 # Create launch scripts in _bindir
@@ -124,6 +118,10 @@ popd
 
 
 %changelog
+* Sat Jul 04 2015 Roy Rankin <rrankin@ihug.com.au> - 3.5.0-1
+- Update to upstream release 3.5.0
+- Use new --disable-non-free flag in configure
+
 * Mon Jun 29 2015 Jaromir Capik <jcapik@redhat.com> - 3.4.0-7
 - Adapting the brp-strip-static-archive hack to work on epel7 too
 
diff --git a/sources b/sources
index 9a7da7f..dd58d4d 100644
--- a/sources
+++ b/sources
@@ -1,3 +1 @@
-92db2ea2526f6cef412547bb1e759a48  sdcc-src-3.4.0.tar.bz2
-40ac3e0ed7033016dc83656e638bdfa7  sdcc-3.4.0-libiberty.patch
-5165f2cc79eb5e996e0cf11b8a0573cd  sdcc-3.4.0-strndup.patch
+e0a1df72747c481cdedbbd328b0fceae  sdcc-src-3.5.0.tar.bz2