diff --git a/srecord-1.46-gcc44.patch b/srecord-1.46-gcc44.patch new file mode 100644 index 0000000..fc8c541 --- /dev/null +++ b/srecord-1.46-gcc44.patch @@ -0,0 +1,113 @@ +diff -up srecord-1.46/lib/arglex.cc.BAD srecord-1.46/lib/arglex.cc +--- srecord-1.46/lib/arglex.cc.BAD 2009-02-16 13:36:42.000000000 -0500 ++++ srecord-1.46/lib/arglex.cc 2009-02-16 13:36:51.000000000 -0500 +@@ -18,6 +18,7 @@ + + #include + #include ++#include + #include + #include + #include +diff -up srecord-1.46/lib/interval.cc.BAD srecord-1.46/lib/interval.cc +--- srecord-1.46/lib/interval.cc.BAD 2009-02-16 13:37:03.000000000 -0500 ++++ srecord-1.46/lib/interval.cc 2009-02-16 13:37:20.000000000 -0500 +@@ -18,7 +18,7 @@ + // + + #include +- ++#include + #include + + +diff -up srecord-1.46/lib/pretty_size.cc.BAD srecord-1.46/lib/pretty_size.cc +--- srecord-1.46/lib/pretty_size.cc.BAD 2009-02-16 13:37:31.000000000 -0500 ++++ srecord-1.46/lib/pretty_size.cc 2009-02-16 13:37:38.000000000 -0500 +@@ -18,7 +18,7 @@ + // + + #include +- ++#include + + std::string + pretty_size(long long x, int width) +diff -up srecord-1.46/lib/quit/normal.cc.BAD srecord-1.46/lib/quit/normal.cc +--- srecord-1.46/lib/quit/normal.cc.BAD 2009-02-16 13:37:48.000000000 -0500 ++++ srecord-1.46/lib/quit/normal.cc 2009-02-16 13:37:58.000000000 -0500 +@@ -18,6 +18,7 @@ + // + + #include ++#include + #include + #include + #include +diff -up srecord-1.46/lib/srec/input/file.cc.BAD srecord-1.46/lib/srec/input/file.cc +--- srecord-1.46/lib/srec/input/file.cc.BAD 2009-02-16 13:38:18.000000000 -0500 ++++ srecord-1.46/lib/srec/input/file.cc 2009-02-16 13:38:25.000000000 -0500 +@@ -19,6 +19,7 @@ + + #include + #include ++#include + #include + + #include +diff -up srecord-1.46/lib/srec/input/generator/constant.cc.BAD srecord-1.46/lib/srec/input/generator/constant.cc +--- srecord-1.46/lib/srec/input/generator/constant.cc.BAD 2009-02-16 13:39:41.000000000 -0500 ++++ srecord-1.46/lib/srec/input/generator/constant.cc 2009-02-16 13:39:48.000000000 -0500 +@@ -18,7 +18,7 @@ + // + + #include +- ++#include + + srec_input_generator_constant::~srec_input_generator_constant() + { +diff -up srecord-1.46/lib/srec/output.cc.BAD srecord-1.46/lib/srec/output.cc +--- srecord-1.46/lib/srec/output.cc.BAD 2009-02-16 13:40:03.000000000 -0500 ++++ srecord-1.46/lib/srec/output.cc 2009-02-16 13:40:14.000000000 -0500 +@@ -18,6 +18,7 @@ + // + + #include ++#include + #include + + #include +diff -up srecord-1.46/lib/srec/output/file/asm.cc.BAD srecord-1.46/lib/srec/output/file/asm.cc +--- srecord-1.46/lib/srec/output/file/asm.cc.BAD 2009-02-16 13:40:54.000000000 -0500 ++++ srecord-1.46/lib/srec/output/file/asm.cc 2009-02-16 13:41:02.000000000 -0500 +@@ -17,6 +17,7 @@ + // . + // + ++#include + #include + + #include +diff -up srecord-1.46/lib/srec/output/file/basic.cc.BAD srecord-1.46/lib/srec/output/file/basic.cc +--- srecord-1.46/lib/srec/output/file/basic.cc.BAD 2009-02-16 13:41:13.000000000 -0500 ++++ srecord-1.46/lib/srec/output/file/basic.cc 2009-02-16 13:41:21.000000000 -0500 +@@ -17,6 +17,7 @@ + // . + // + ++#include + #include + + #include +diff -up srecord-1.46/lib/srec/output/file.cc.BAD srecord-1.46/lib/srec/output/file.cc +--- srecord-1.46/lib/srec/output/file.cc.BAD 2009-02-16 13:40:33.000000000 -0500 ++++ srecord-1.46/lib/srec/output/file.cc 2009-02-16 13:40:41.000000000 -0500 +@@ -18,6 +18,7 @@ + // + + #include ++#include + #include + #include + #include diff --git a/srecord.spec b/srecord.spec index 0af0742..0399157 100644 --- a/srecord.spec +++ b/srecord.spec @@ -1,12 +1,15 @@ Name: srecord Version: 1.46 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Manipulate EPROM load files Group: Development/Tools License: GPLv3+ URL: http://srecord.sourceforge.net/ -Source: http://downloads.sourceforge.net/srecord/srecord-%{version}.tar.gz +Source0: http://downloads.sourceforge.net/srecord/srecord-%{version}.tar.gz +# Sent upstream +# https://sourceforge.net/tracker/index.php?func=detail&aid=2606533&group_id=72866&atid=535950 +Patch0: srecord-1.46-gcc44.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: diffutils, sharutils, groff, boost-devel @@ -37,6 +40,7 @@ file formats. %prep %setup -q +%patch0 -p1 -b .gcc44 %build %configure @@ -64,6 +68,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Mon Feb 16 2009 Tom "spot" Callaway - 1.46-2 +- fix gcc 4.4 compile issues (cstdio) + * Tue Jan 13 2009 Tom "spot" Callaway - 1.46-1 - update to 1.46