From 90a284a1b8d78d7ea04baa7761dbdb810c8343e3 Mon Sep 17 00:00:00 2001
From: Orion Poplawski <orion@nwra.com>
Date: Sun, 16 Jun 2019 20:45:16 -0600
Subject: [PATCH] Rebuild for octave 5.1

---
 pfstools-octave5.1.patch | 75 ++++++++++++++++++++++++++++++++++++++++
 pfstools.spec            | 10 ++++--
 2 files changed, 83 insertions(+), 2 deletions(-)
 create mode 100644 pfstools-octave5.1.patch

diff --git a/pfstools-octave5.1.patch b/pfstools-octave5.1.patch
new file mode 100644
index 0000000..bfefb9b
--- /dev/null
+++ b/pfstools-octave5.1.patch
@@ -0,0 +1,75 @@
+diff --git a/src/octave/pfsget.cpp b/src/octave/pfsget.cpp
+index 2c0853b..29e5e2d 100644
+--- a/src/octave/pfsget.cpp
++++ b/src/octave/pfsget.cpp
+@@ -155,9 +155,7 @@ DEFUN_DLD( pfsget, args, , helpString)
+   }
+   catch( pfs::Exception ex )
+   {
+-    char error_message[100];
+-    sprintf( error_message, "%s: %s", SCRIPT_NAME, ex.getMessage() );
+-    error( error_message );      
++    error( "%s: %s", SCRIPT_NAME, ex.getMessage() );
+   }
+ //    if( fh != stdin ) fclose( fh );    
+     
+diff --git a/src/octave/pfsput.cpp b/src/octave/pfsput.cpp
+index 97fd94a..8c043c9 100644
+--- a/src/octave/pfsput.cpp
++++ b/src/octave/pfsput.cpp
+@@ -191,9 +191,7 @@ DEFUN_DLD( pfsput, args, , helpString)
+   }
+   catch( pfs::Exception ex )
+   {
+-    char error_message[100];
+-    sprintf( error_message, "%s: %s", SCRIPT_NAME, ex.getMessage() );
+-    error( error_message );      
++    error( "%s: %s", SCRIPT_NAME, ex.getMessage() );
+   }    
+     
+   return retval;
+diff --git a/src/octave/pfsread.cpp b/src/octave/pfsread.cpp
+index 137d1c6..f393136 100644
+--- a/src/octave/pfsread.cpp
++++ b/src/octave/pfsread.cpp
+@@ -105,9 +105,7 @@ DEFUN_DLD( pfsread, args, , helpString)
+     }
+     catch( pfs::Exception ex )
+     {
+-        char error_message[100];
+-        sprintf( error_message, "%s: %s", SCRIPT_NAME, ex.getMessage() );
+-        error( error_message );      
++        error( "%s: %s", SCRIPT_NAME, ex.getMessage() );
+     }
+ 
+     if( fh != stdin ) fclose( fh );    
+diff --git a/src/octave/pfstransform_colorspace.cpp b/src/octave/pfstransform_colorspace.cpp
+index 64b7e42..fd8413b 100644
+--- a/src/octave/pfstransform_colorspace.cpp
++++ b/src/octave/pfstransform_colorspace.cpp
+@@ -86,9 +86,7 @@ DEFUN_DLD( pfstransform_colorspace, args, , helpString)
+     }
+     catch( pfs::Exception ex )
+     {
+-        char error_message[100];
+-        sprintf( error_message, "%s: %s", SCRIPT_NAME, ex.getMessage() );
+-        error( error_message );      
++        error( "%s: %s", SCRIPT_NAME, ex.getMessage() );
+     }
+     
+     return retval;
+diff --git a/src/octave/pfswrite.cpp b/src/octave/pfswrite.cpp
+index 8475c3b..bc15a28 100644
+--- a/src/octave/pfswrite.cpp
++++ b/src/octave/pfswrite.cpp
+@@ -109,9 +109,7 @@ DEFUN_DLD( pfswrite, args, , helpString)
+     }
+     catch( pfs::Exception ex )
+     {
+-        char error_message[100];
+-        sprintf( error_message, "%s: %s", SCRIPT_NAME, ex.getMessage() );
+-        error( error_message );      
++        error( "%s: %s", SCRIPT_NAME, ex.getMessage() );
+     }
+ 
+     if( fh != stdout ) fclose( fh );
diff --git a/pfstools.spec b/pfstools.spec
index 4e757e3..fbce64b 100644
--- a/pfstools.spec
+++ b/pfstools.spec
@@ -1,11 +1,14 @@
 Name:		pfstools
 Version:	2.1.0
-Release:	5%{?dist}
+Release:	6%{?dist}
 Summary:	Programs for handling high-dynamic range images
 
 License:	GPLv2+
 URL:		http://pfstools.sourceforge.net/
 Source0:	http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tgz
+# Fix build with octave 5.1
+# https://sourceforge.net/p/pfstools/git/merge-requests/1/
+Patch0:         pfstools-octave5.1.patch
 
 BuildRequires:	cmake
 BuildRequires:	libtiff-devel
@@ -121,7 +124,7 @@ etc., for developing programs which can handle HDR graphics files.
 
 
 %prep
-%setup -q
+%autosetup -p1
 
 %build
 %{?el7:export CXXFLAGS="%{optflags} -std=gnu++11"}
@@ -293,6 +296,9 @@ make
 %{_includedir}/pfs
 
 %changelog
+* Sun Jun 16 2019 Orion Poplawski <orion@nwra.com> - 2.1.0-6
+- Rebuild for octave 5.1
+
 * Thu Apr 11 2019 Richard Shaw <hobbes1069@gmail.com> - 2.1.0-5
 - Rebuild for OpenEXR 2.3.0.