Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>

.gitignore

@@ -1,3 +1,8 @@
 pfstools-1.8.1.tar.gz
 /pfstools-1.8.3.tar.gz
 /pfstools-1.8.5.tar.gz
+/pfstools-2.0.4.tgz
+/pfstools-2.0.5.tgz
+/pfstools-2.0.6.tgz
+/pfstools-2.1.0.tgz
+/pfstools-2.2.0.tgz

0001-Prefer-upstream-CMake-Config-Mode-files-for-OpenEXR.patch

@@ -0,0 +1,35 @@
+From 95c5e87b8fe19cc6d067e1c2ce6239a5ba413a1c Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Stefan=20Br=C3=BCns?= <stefan.bruens@rwth-aachen.de>
+Date: Mon, 3 Jan 2022 06:09:25 +0100
+Subject: [PATCH] Prefer upstream CMake Config Mode files for OpenEXR
+
+The bundled FindOpenEXR.cmake Find Module is quite outdated, import
+the OpenEXR target from its upstream definition.
+---
+ CMakeLists.txt | 10 +++++++++-
+ 1 file changed, 9 insertions(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index b2923cf..a33293b 100755
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -106,7 +106,15 @@ OPTION(WITH_OpenEXR "Compile with OpenEXR library" ON)
+ 
+ if( WITH_OpenEXR )
+ 
+-find_package (OpenEXR)
++find_package (OpenEXR NO_MODULE)
++if( TARGET OpenEXR::OpenEXR )
++  set( OPENEXR_FOUND TRUE )
++  set( OPENEXR_LIBRARIES OpenEXR::OpenEXR )
++  get_target_property( OPENEXR_INCLUDE_DIR OpenEXR::OpenEXR INTERFACE_INCLUDE_DIRECTORIES )
++else ()
++  find_package (OpenEXR MODULE)
++endif ()
++
+ if( NOT OPENEXR_FOUND )
+ MESSAGE( STATUS "OpenEXR not found. The following command will not be
+ compiled: pfsinexr pfsoutexr. " )
+-- 
+2.34.1
+

pfstools-1.7-strcmp.patch

@@ -1,11 +0,0 @@
---- pfstools-1.7.0/src/pfsglview/picture_io.cpp-d	2009-05-10 02:08:04.185662227 -0700
-+++ pfstools-1.7.0/src/pfsglview/picture_io.cpp	2009-05-10 02:09:51.029678179 -0700
-@@ -87,7 +87,7 @@ void PictureIO::setFrame(pfs::Frame *fra
- 		return;
- 
- 	// only XYZ channels are taken into consideration
--	if( channel != "XYZ" &&  channel != "X00" && channel != "0Y0" && channel != "00Z" ) {
-+	if(strcmp(channel, "XYZ") != 0 && strcmp(channel, "X00") != 0 && strcmp(channel, "0Y0") != 0 && strcmp(channel, "00Z") != 0 ) {
- 		if(verbose)
- 			fprintf( stderr, "WARNING: wrong channel (PictureIO::setFrame())\n");
- 		return;

pfstools-1.7.0-bf1.patch

@@ -1,12 +0,0 @@
-diff -up pfstools-1.7.0/src/fileformat/Makefile.am-old pfstools-1.7.0/src/fileformat/Makefile.am
---- pfstools-1.7.0/src/fileformat/Makefile.am-old	2009-01-02 13:17:32.000000000 -0800
-+++ pfstools-1.7.0/src/fileformat/Makefile.am	2009-01-02 13:18:14.000000000 -0800
-@@ -96,6 +96,7 @@ endif
- 
- if GDAL_SUPPORT
- pfsingdal_SOURCES = pfsingdal.cpp
-+pfsingdal_CXXFLAGS = $(shell /usr/bin/gdal-config --cflags)
- pfsingdal_LDADD = $(GDAL_LIBS)
- endif
- 
-diff -up pfstools-1.7.0/src/fileformat/pfsingdal.cpp-old pfstools-1.7.0/src/fileformat/pfsingdal.cpp

pfstools-1.7.0-debuginfo.patch

@@ -1,12 +0,0 @@
-diff -up pfstools-1.7.0/configure.ac~ pfstools-1.7.0/configure.ac
---- pfstools-1.7.0/configure.ac~	2008-10-15 01:38:00.000000000 +0300
-+++ pfstools-1.7.0/configure.ac	2009-05-08 22:55:28.000000000 +0300
-@@ -29,8 +29,6 @@ AC_ARG_ENABLE(debug,
- 		     AC_DEFINE([DEBUG])
- 		  fi],
-                   [enable_debug="no"
--                     temp_CXXFLAGS=`echo $CXXFLAGS | sed "s/-O./ /; s/-g//"`
--   	             CXXFLAGS="-O3 $temp_CXXFLAGS"
-                      AC_DEFINE(NDEBUG, 1, [Disable assertion checks])
-                   ])
- 

pfstools-1.7.0-gcc44.patch

@@ -1,11 +0,0 @@
---- pfstools-1.7.0/src/filter/pfspanoramic.cpp.orig	2009-03-23 17:23:39.000000000 -0700
-+++ pfstools-1.7.0/src/filter/pfspanoramic.cpp	2009-03-23 17:27:34.000000000 -0700
-@@ -195,7 +195,7 @@
-     {
-       char *opts;
-       
--      if(opts = strchr(name, '/'))
-+      if(opts = strchr((char *)name, '/'))
-       {
-         *opts++ = '\0';
-       }

pfstools-1.8.5-wformat.patch

@@ -1,12 +0,0 @@
-diff -up pfstools-1.8.5/src/pfs/pfs.cpp.wformat pfstools-1.8.5/src/pfs/pfs.cpp
---- pfstools-1.8.5/src/pfs/pfs.cpp.wformat	2013-12-06 12:46:04.196939099 +0100
-+++ pfstools-1.8.5/src/pfs/pfs.cpp	2013-12-06 12:47:58.167480681 +0100
-@@ -525,7 +525,7 @@ static void writeTags( const TagContaine
-   TagList::const_iterator it;
-   fprintf( out, "%d" PFSEOL, tags->getSize() );
-   for( it = tags->tagsBegin(); it != tags->tagsEnd(); it++ ) {
--    fprintf( out, (const char*)(it->c_str()) );
-+    fprintf( out, "%s", (const char*)(it->c_str()) );
-     fprintf( out, PFSEOL );
-   }
- }

pfstools-ImageMagick7.patch

@@ -0,0 +1,56 @@
+diff --git a/src/fileformat/pfsinimgmagick.cpp b/src/fileformat/pfsinimgmagick.cpp
+index 5dab440..f4358ce 100644
+--- a/src/fileformat/pfsinimgmagick.cpp
++++ b/src/fileformat/pfsinimgmagick.cpp
+@@ -35,6 +35,7 @@
+ 
+ #define PROG_NAME "pfsinimgmagick"
+ 
++using namespace Magick;
+ 
+ class QuietException 
+ {
+@@ -114,7 +115,11 @@ void readFrames( int argc, char* argv[] )
+     Magick::Image imImage( ff.fileName );
+ 
+     VERBOSE_STR << "input image gamma:  " << imImage.gamma() << std::endl;
++#if MagickLibVersion >= 0x700
++    bool hasAlpha = imImage.alpha();
++#else
+     bool hasAlpha = imImage.matte();
++#endif
+     if( hasAlpha )
+       VERBOSE_STR << "alpha channel found" << std::endl;    
+     
+@@ -129,17 +134,30 @@ void readFrames( int argc, char* argv[] )
+     
+     // Copy line by line to pfs::Frame
+     int pixInd = 0;
+-    const float maxValue = (float)(1<<QuantumDepth) - 1;
++    const float maxValue = (float)QuantumRange;
+     for( int r = 0; r < imImage.rows(); r++ ) {
++#if MagickLibVersion >= 0x700
++      const Magick::Quantum *pixels =
++#else
+       const Magick::PixelPacket *pixels =
++#endif
+         imImage.getConstPixels( 0, r, imImage.columns(), 1 );
+ 
+       for( int c = 0; c < imImage.columns(); c++ ) {
++#if MagickLibVersion >= 0x700
++        (*X)(pixInd) = (float)MagickCore::GetPixelRed(imImage.image(), pixels) / maxValue;
++        (*Y)(pixInd) = (float)MagickCore::GetPixelGreen(imImage.image(), pixels) / maxValue;
++        (*Z)(pixInd) = (float)MagickCore::GetPixelBlue(imImage.image(), pixels) / maxValue;
++        if( alpha != NULL )
++          (*alpha)(pixInd) = (float)MagickCore::GetPixelAlpha(imImage.image(), pixels) / maxValue;
++	pixels += MagickCore::GetPixelChannels(imImage.image());
++#else
+         (*X)(pixInd) = (float)pixels[c].red / maxValue;
+         (*Y)(pixInd) = (float)pixels[c].green / maxValue;
+         (*Z)(pixInd) = (float)pixels[c].blue / maxValue;
+         if( alpha != NULL )
+           (*alpha)(pixInd) = (float)pixels[c].opacity / maxValue;
++#endif
+         pixInd++;
+       } 
+     }    

pfstools-freeglut.patch

@@ -0,0 +1,68 @@
+--- a/src/pfsglview/CMakeLists.txt~	2017-11-13 11:38:26.000000000 -0600
++++ a/src/pfsglview/CMakeLists.txt	2019-09-19 10:07:11.350642598 -0500
+@@ -1,5 +1,5 @@
+ 
+-include_directories ("${PROJECT_BINARY_DIR}/" "${PROJECT_SOURCE_DIR}/src/pfs" ${OPENGL_INCLUDE_DIRS}  ${GLUT_INCLUDE_DIRS})
++include_directories ("${PROJECT_BINARY_DIR}/" "${PROJECT_SOURCE_DIR}/src/pfs" ${OPENGL_INCLUDE_DIRS} ${FreeGLUT_INCLUDE_DIRS})
+ if( NOT HAS_GETOPT )
+ 	include_directories ("${GETOPT_INCLUDE}")
+ endif( NOT HAS_GETOPT )
+@@ -11,8 +11,8 @@
+ 
+ add_executable(pfsglview pfsglview.cpp picture_io.cpp module.cpp m_histogram.cpp m_status.cpp m_on_screen_display.cpp)
+ 
+-# TODO: Use ${GLUT_LIBRARY} instead.
+-target_link_libraries(pfsglview ${OPENGL_LIBRARIES} ${GLUT_glut_LIBRARY} pfs)
++# TODO: Use ${FreeGLUT_LIBRARY} instead.
++target_link_libraries(pfsglview ${OPENGL_LIBRARIES} -lglut pfs)
+ 
+ install (TARGETS pfsglview DESTINATION bin)
+ install (FILES pfsglview.1 DESTINATION ${MAN_DIR})
+--- a/src/CMakeLists.txt~	2017-11-13 11:38:28.000000000 -0600
++++ a/src/CMakeLists.txt	2019-09-19 10:19:30.051372391 -0500
+@@ -18,9 +18,9 @@
+     add_subdirectory (matlab)
+ endif( MATLAB_FOUND )
+ 
+-if( OPENGL_FOUND AND GLUT_FOUND )
++if( OPENGL_FOUND AND FreeGLUT_FOUND )
+     add_subdirectory (pfsglview)
+-endif( OPENGL_FOUND AND GLUT_FOUND )
++endif( OPENGL_FOUND AND FreeGLUT_FOUND )
+ 
+ if( WITH_HDRVC )
+ 	add_subdirectory (hdrvc)
+--- a/CMakeLists.txt~	2017-11-13 11:38:18.000000000 -0600
++++ a/CMakeLists.txt	2019-09-19 10:36:27.025771833 -0500
+@@ -221,17 +221,17 @@
+ find_path(OPENGL_INCLUDE_DIR GL/gl.h )
+ 
+ find_package(OpenGL )
+-find_package(GLUT )
++find_package(FreeGLUT )
+ 
+ if( NOT OPENGL_FOUND )
+ 	MESSAGE( STATUS "OpenGL not found. The following command will not be
+ compiled: pfsglview. " )
+ endif( NOT OPENGL_FOUND )
+ 
+-if( NOT GLUT_FOUND )
++if( NOT FreeGLUT_FOUND )
+ 	MESSAGE( STATUS "GLUT not found. The following command will not be
+ compiled: pfsglview. " )
+-endif( NOT GLUT_FOUND )
++endif( NOT FreeGLUT_FOUND )
+ 
+ endif( WITH_pfsglview )
+ 
+--- a/src/pfsglview/glenv.h~	2017-11-13 11:38:26.000000000 -0600
++++ a/src/pfsglview/glenv.h	2019-09-19 10:43:41.179049107 -0500
+@@ -11,7 +11,7 @@
+  #if defined(_WIN32) || defined(_WIN64) || defined(__CYGWIN__)
+    #include <windef.h>
+  #endif
+-#include "GL/glut.h"
++#include "GL/freeglut.h"
+ #include "GL/gl.h"
+ #include "GL/glu.h"
+ #include "GL/glext.h"

pfstools-mDATA.patch

@@ -1,11 +0,0 @@
---- pfstools-1.6.5/src/octave/Makefile.am-old	2008-10-12 09:57:46.000000000 -0700
-+++ pfstools-1.6.5/src/octave/Makefile.am	2008-10-12 09:57:58.000000000 -0700
-@@ -15,7 +15,7 @@
- help_h_files = $(help_files:.help=_help.h) 
- 
- oct_SCRIPTS = $(linked_oct_files) 
--m_SCRIPTS = $(m_oct_files)
-+m_DATA = $(m_oct_files)
- 
- bin_SCRIPTS = pfsoctavelum pfsoctavergb pfsstat
- man_MANS = pfsoctavelum.1 pfsoctavergb.1 pfsstat.1

pfstools.spec

@@ -1,34 +1,33 @@
 Name:		pfstools
-Version:	1.8.5
+Version:	2.2.0
-Release:	23%{?dist}
+Release:	16%{?dist}
 Summary:	Programs for handling high-dynamic range images
 
-Group:		Applications/Multimedia
+License:	GPL-2.0-or-later
-License:	GPLv2+
 URL:		http://pfstools.sourceforge.net/
-Source0:	http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
+Source0:	http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tgz
-Patch1:		pfstools-mDATA.patch
+Patch0:		pfstools-freeglut.patch
-Patch2:		pfstools-1.7.0-bf1.patch
+# From https://sourceforge.net/p/pfstools/bugs/54
-Patch3:		pfstools-1.7.0-gcc44.patch
+Patch1:		0001-Prefer-upstream-CMake-Config-Mode-files-for-OpenEXR.patch
-Patch4:		pfstools-1.7-strcmp.patch
+# From openSUSE
-Patch5:		pfstools-1.7.0-debuginfo.patch
+Patch2:		pfstools-ImageMagick7.patch
-Patch6:		pfstools-1.8.5-wformat.patch
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:	automake
+BuildRequires:  make
-BuildRequires:	libtool
+BuildRequires:	cmake
 BuildRequires:	libtiff-devel
-BuildRequires:	openexr-devel
+BuildRequires:	cmake(OpenEXR)
 BuildRequires:	octave-devel
 BuildRequires:	libGL-devel
 BuildRequires:	ImageMagick-devel
 BuildRequires:	freeglut-devel
 BuildRequires:	ImageMagick-c++-devel
-BuildRequires:	qt4-devel
+BuildRequires:	perl-generators
+BuildRequires:	pkgconfig(Qt5)
 BuildRequires:	libXi-devel
 BuildRequires:	netpbm-devel
 BuildRequires:	texlive-latex
-BuildRequires:	gdal-devel
+BuildRequires:	gsl-devel
+BuildRequires:	fftw-devel
 Requires:	%{name}-libs%{?_isa} = %{version}-%{release}
 
 %description
@@ -39,9 +38,33 @@ pipes and a simple generic HDR image format (pfs). The concept of the
 pfstools is similar to netpbm package for low-dynamic range images.
 
 
+%package -n pfscalibration
+Summary:	Scripts and programs for photometric calibration
+Requires:	%{name}-libs%{?_isa} = %{version}-%{release}
+Requires:	perl-interpreter
+Requires:	dcraw
+Requires:	jhead
+
+%description -n pfscalibration
+PFScalibration package provides an implementation of the Robertson et al. 2003
+method for the photometric calibration of cameras, Mitsunaga and Nayar's
+algorithm "Radiometric Self Calibration", and for the recovery of high dynamic
+range (HDR) images from the set of low dynamic range (LDR) exposures.
+
+
+%package -n pfstmo
+Summary:	PFS tone mapping operators
+Requires:	%{name}-libs%{?_isa} = %{version}-%{release}
+
+%description -n pfstmo
+The pfstmo package contains the implementation of state-of-the-art tone
+mapping operators. The motivation here is to provide an implementation of
+tone mapping operators suitable for convenient processing of both static
+images and animations.
+
+
 %package libs
 Summary:	Libraries for HDR processing
-Group:		System Environment/Libraries
 License:	LGPLv2+
 
 %description libs
@@ -51,17 +74,15 @@ handling HDR graphics files.
 
 %package qt
 Summary:	Qt-based viewer for HDR files
-Group:		Applications/Multimedia
 Requires:	%{name}-libs%{?_isa} = %{version}-%{release}
 
 %description qt
-The pfstools-qt package contains viewer programs based on qt4 for
+The pfstools-qt package contains viewer programs based on Qt5 for
 viewing HDR graphics files.
 
 
 %package glview
 Summary:	GL-based viewer for HDR files
-Group:		Applications/Multimedia
 Requires:	%{name}-libs%{?_isa} = %{version}-%{release}
 
 %description glview
@@ -71,7 +92,6 @@ viewing HDR graphics files.
 
 %package exr
 Summary:	EXR file import for PFS tools
-Group:		Applications/Multimedia
 Requires:	%{name}-libs%{?_isa} = %{version}-%{release}
 
 %description exr
@@ -81,7 +101,6 @@ to and from the HDR graphics file format used in pfstools.
 
 %package imgmagick
 Summary:	ImageMagick file import for PFS tools
-Group:		Applications/Multimedia
 Requires:	%{name}-libs%{?_isa} = %{version}-%{release}
 
 %description imgmagick
@@ -91,7 +110,6 @@ ImageMagick to and from the HDR graphics file format used in pfstools.
 
 %package octave
 Summary:	Octave interaction with PFS tools
-Group:		Applications/Multimedia
 Requires:	octave(api) = %{octave_api}
 
 %description octave
@@ -99,18 +117,8 @@ The pfstools-octave package contains programs to process red, green and blue
 channels or luminance channels in pfs stream using Octave.
 
 
-%package gdal
-Summary:	PFS Tools using the GDAL library to handle GIS information
-Group:		Applications/Multimedia
-
-%description gdal
-The pfstools-gdal package contains programs which can handle GIS information
-using the GDAL library.
-
-
 %package devel
 Summary:	Files for development with PFS tools
-Group:		Development/Libraries
 Requires:	%{name}-libs%{?_isa} = %{version}-%{release}
 
 %description devel
@@ -119,27 +127,20 @@ etc., for developing programs which can handle HDR graphics files.
 
 
 %prep
-%setup -q
+%autosetup -p1
-%patch1 -p1 -b .mDATA
-%patch2 -p1 -b .bf1
-%patch3 -p1 -b .gcc44
-%patch4 -p1 -b .strcmp
-%patch5 -p1 -b .debuginfo
-%patch6 -p1 -b .wformat
-# Remove the following once the patches for configure.ac and Makefile.am
-# are not necessary anymore.
-autoreconf -ifv
-
 
 %build
-%configure --disable-static --disable-dependency-tracking
+%{?el7:export CXXFLAGS="%{optflags} -std=gnu++11"}
-make %{?_smp_mflags}
+%if 0%{?fedora} >= 33
-
+export CXXFLAGS="%{optflags} -std=gnu++11"
+%endif
+%{cmake} -DBUILD_SHARED_LIBS=ON -DLIB_DIR=%{_lib} -DWITH_OpenCV=OFF
+# Not parallel build safe
+%global _smp_build_ncpus 1
+%{cmake_build}
 
 %install
-rm -rf $RPM_BUILD_ROOT
+%{cmake_install}
-mkdir -p ${RPM_BUILD_ROOT}%{_prefix}
-make DESTDIR=$RPM_BUILD_ROOT "INSTALL=install -p" install
 
 # XXX Nuke unpackaged files
 { cd ${RPM_BUILD_ROOT}
@@ -149,18 +150,12 @@ make DESTDIR=$RPM_BUILD_ROOT "INSTALL=install -p" install
 }
 
 
-%clean
-rm -rf $RPM_BUILD_ROOT
 
-
+%ldconfig_scriptlets libs
-%post libs -p /sbin/ldconfig
-
-
-%postun libs -p /sbin/ldconfig
 
 
 %files
-%doc README TODO doc/faq.txt
+%doc README
 %{_bindir}/pfsabsolute
 %{_bindir}/pfscat
 %{_bindir}/pfsclamp
@@ -171,23 +166,27 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/pfsgamma
 %{_bindir}/pfsin
 %{_bindir}/pfsindcraw
-%{_bindir}/pfsinmulti
 %{_bindir}/pfsinpfm
 %{_bindir}/pfsinppm
 %{_bindir}/pfsinrgbe
 %{_bindir}/pfsintiff
+%{_bindir}/pfsinyuv
 %{_bindir}/pfsout
-%{_bindir}/pfsoutffmpeg
 %{_bindir}/pfsouthdrhtml
 %{_bindir}/pfsoutpfm
 %{_bindir}/pfsoutppm
 %{_bindir}/pfsoutrgbe
 %{_bindir}/pfsouttiff
+%{_bindir}/pfsoutyuv
 %{_bindir}/pfspad
 %{_bindir}/pfspanoramic
 %{_bindir}/pfsrotate
 %{_bindir}/pfssize
 %{_bindir}/pfstag
+%{_bindir}/pfscolortransform
+%{_bindir}/pfsretime
+%{_bindir}/pfs_automerge
+%{_bindir}/pfs_split_exposures.py
 %{_datadir}/pfstools/hdrhtml_c_b2.csv
 %{_datadir}/pfstools/hdrhtml_c_b3.csv
 %{_datadir}/pfstools/hdrhtml_c_b4.csv
@@ -208,33 +207,71 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/pfsgamma.1.gz
 %{_mandir}/man1/pfsin.1.gz
 %{_mandir}/man1/pfsindcraw.1.gz
-%{_mandir}/man1/pfsinmulti.1.gz
 %{_mandir}/man1/pfsinpfm.1.gz
 %{_mandir}/man1/pfsinppm.1.gz
 %{_mandir}/man1/pfsinrgbe.1.gz
 %{_mandir}/man1/pfsintiff.1.gz
+%{_mandir}/man1/pfsinyuv.1.gz
 %{_mandir}/man1/pfsout.1.gz
-%{_mandir}/man1/pfsoutffmpeg.1.gz
 %{_mandir}/man1/pfsouthdrhtml.1.gz
 %{_mandir}/man1/pfsoutpfm.1.gz
 %{_mandir}/man1/pfsoutppm.1.gz
 %{_mandir}/man1/pfsoutrgbe.1.gz
 %{_mandir}/man1/pfsouttiff.1.gz
+%{_mandir}/man1/pfsoutyuv.1.gz
 %{_mandir}/man1/pfspad.1.gz
 %{_mandir}/man1/pfspanoramic.1.gz
 %{_mandir}/man1/pfsrotate.1.gz
 %{_mandir}/man1/pfssize.1.gz
 %{_mandir}/man1/pfstag.1.gz
+%{_mandir}/man1/pfscolortransform.1.gz
+%{_mandir}/man1/pfsretime.1.gz
+%{_mandir}/man1/pfs_automerge.1.gz
 %doc
 
+%files -n pfscalibration
+%{_bindir}/dcraw2hdrgen
+%{_bindir}/jpeg2hdrgen
+%{_bindir}/pfshdrcalibrate
+%{_bindir}/pfsinhdrgen
+%{_bindir}/pfsinme
+%{_bindir}/pfsplotresponse
+%{_mandir}/man1/dcraw2hdrgen.1.gz
+%{_mandir}/man1/jpeg2hdrgen.1.gz
+%{_mandir}/man1/pfshdrcalibrate.1.gz
+%{_mandir}/man1/pfsinhdrgen.1.gz
+%{_mandir}/man1/pfsinme.1.gz
+%{_mandir}/man1/pfsplotresponse.1.gz
+
+%files -n pfstmo
+%{_bindir}/pfstmo_reinhard05
+%{_bindir}/pfstmo_pattanaik00
+%{_bindir}/pfstmo_mantiuk06
+%{_bindir}/pfstmo_fattal02
+%{_bindir}/pfstmo_drago03
+%{_bindir}/pfstmo_reinhard02
+%{_bindir}/pfstmo_durand02
+%{_bindir}/pfstmo_mantiuk08
+%{_bindir}/pfstmo_ferradans11
+%{_bindir}/pfstmo_mai11
+%{_mandir}/man1/pfstmo_reinhard05.1.gz
+%{_mandir}/man1/pfstmo_pattanaik00.1.gz
+%{_mandir}/man1/pfstmo_mantiuk06.1.gz
+%{_mandir}/man1/pfstmo_fattal02.1.gz
+%{_mandir}/man1/pfstmo_drago03.1.gz
+%{_mandir}/man1/pfstmo_reinhard02.1.gz
+%{_mandir}/man1/pfstmo_durand02.1.gz
+%{_mandir}/man1/pfstmo_mantiuk08.1.gz
+%{_mandir}/man1/pfstmo_ferradans11.1.gz
+%{_mandir}/man1/pfstmo_mai11.1.gz
+
 %files libs
-%{_libdir}/libpfs-1.2.so.0
+%{_libdir}/libpfs.so.2.0.0
-%{_libdir}/libpfs-1.2.so.0.0.0
+%{_libdir}/libpfs.so.2
 
 %files qt
 %{_bindir}/pfsv
 %{_bindir}/pfsview
-%{_mandir}/man1/pfsv.1.gz
 %{_mandir}/man1/pfsview.1.gz
 
 %files glview
@@ -263,17 +300,176 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/pfsoctavergb.1.gz
 %{_mandir}/man1/pfsstat.1.gz
 
-%files gdal
-%{_bindir}/pfsingdal
-%{_mandir}/man1/pfsingdal.1.gz
-
 %files devel
-%doc doc/pfs_format_spec.pdf
+#%doc doc/pfs_format_spec.pdf
-%{_libdir}/libpfs-1.2.so
+%{_libdir}/libpfs.so
 %{_libdir}/pkgconfig/pfs.pc
-%{_includedir}/pfs-1.2
+%{_includedir}/pfs
 
 %changelog
+* Fri Jul 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.2.0-16
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
+
+* Wed Apr 24 2024 Benjamin A. Beasley <code@musicinmybrain.net> - 2.2.0-15
+- Rebuilt for openexr 3.2.4
+
+* Thu Jan 25 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.2.0-14
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Sun Jan 21 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.2.0-13
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Fri Jul 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.2.0-12
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
+* Sat Apr 08 2023 Orion Poplawski <orion@nwra.com> - 2.2.0-11
+- Rebuild with octave 8.1.0
+
+* Fri Mar 31 2023 Tomas Smetana <tsmetana@redhat.com> - 2.2.0-10
+- Use SPDX tag for license
+
+* Fri Jan 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.2.0-9
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
+* Thu Jan 05 2023 Neal Gompa <ngompa@fedoraproject.org> - 2.2.0-8
+- Rebuild for ImageMagick 7
+
+* Sun Dec 04 2022 Neal Gompa <ngompa@fedoraproject.org> - 2.2.0-7
+- Add patches for upgraded dependency compatibility
+  + Add patch for ImageMagick 7 compatibility
+  + Add patch for OpenEXR 3+ compatibility
+
+* Tue Aug 23 2022 Mamoru TASAKA <mtasaka@fedoraproject.org> - 2.2.0-6
+- Rebuild for gsl-2.7.1
+
+* Fri Jul 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.2.0-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
+* Wed Jun 01 2022 Orion Poplawski <orion@nwra.com> - 2.2.0-4
+- Rebuild for octave 7.1
+
+* Thu May 12 2022 Orion Poplawski <orion@nwra.com> - 2.2.0-3
+- Use current cmake macros (Fix FTBFS)
+
+* Fri Jan 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.2.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
+* Wed Oct 20 2021 Tomas Smetana <tsmetana@redhat.com> - 2.2.0-1
+- Rebase to upstream 2.2.0 verison, drop upstreamed patches
+
+* Wed Aug 11 2021 Orion Poplawski <orion@nwra.com> - 2.1.0-20
+- Rebuild for octave 6.3.0
+
+* Sun Aug 01 2021 Richard Shaw <hobbes1069@gmail.com> - 2.1.0-19
+- Move to openexr2 compat package.
+
+* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.1.0-18
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
+* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.1.0-17
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Tue Jan 12 2021 Mamoru TASAKA <mtasaka@fedoraproject.org> - 2.1.0-16
+- rebuild against New OpenEXR again
+
+* Fri Jan 01 2021 Richard Shaw <hobbes1069@gmail.com> - 2.1.0-15
+- Rebuild for OpenEXR 2.5.3.
+
+* Tue Aug 18 2020 Jeff Law <law@redhat.com> - 2.1.0-14
+- Force C++11 as this code is not C++17 ready
+
+* Thu Aug 06 2020 Tomas Smetana <tsmetana@redhat.com> - 2.1.0-13
+- Fix #1865214: Update spec for new cmake
+
+* Sat Aug 01 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.1.0-12
+- Second attempt - Rebuilt for
+  https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.1.0-11
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Thu Jan 30 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.1.0-10
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Tue Sep 17 2019 Gwyn Ciesla <gwync@protonmail.com> - 2.1.0-9
+- Rebuilt for new freeglut
+
+* Tue Aug 20 2019 Susi Lehtola <jussilehtola@fedoraproject.org> - 2.1.0-8
+- Rebuilt for GSL 2.6.
+
+* Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.1.0-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* 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.
+
+* Wed Feb 13 2019 Tomas Smetana <tsmetana@redhat.com> - 2.1.0-4
+- Bump release
+
+* Wed Feb 13 2019 Tomas Smetana <tsmetana@redhat.com> - 2.1.0-3
+- Rebuild (FTBFS with new cmake)
+
+* Sat Feb 02 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.1.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Sun Nov 11 2018 Orion Poplawski <orion@cora.nwra.com> - 2.1.0-1
+- Update to 2.1.0
+- Switch to Qt5
+- Rebuild for octave 4.4
+
+* Tue Aug 28 2018 Michael Cronenworth <mike@cchtml.com> - 2.0.6-9
+- Rebuild for ImageMagick 6.9.10
+
+* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.6-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
+* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.6-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
+
+* Fri Sep 08 2017 Tomas Smetana <tsmetana@redhat.com> - 2.0.6-6
+- Rebuild for new ImageMagick
+
+* Tue Aug 29 2017 Tomas Smetana <tsmetana@redhat.com> - 2.0.6-5
+- Rebuild for new ImageMagick
+
+* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.6-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
+
+* Sun Jul 30 2017 Kevin Fenzi <kevin@scrye.com> - 2.0.6-3
+- Rebuild for new ImageMagick
+
+* Sun Jul 30 2017 Florian Weimer <fweimer@redhat.com> - 2.0.6-2
+- Rebuild with binutils fix for ppc64le (#1475636)
+
+* Wed Jul 26 2017 Tomas Smetana <tsmetana@redhat.com> - 2.0.6-1
+- New upstream bugfix-only release
+
+* Thu Jul 13 2017 Petr Pisar <ppisar@redhat.com> - 2.0.5-4
+- perl dependency renamed to perl-interpreter
+  <https://fedoraproject.org/wiki/Changes/perl_Package_to_Install_Core_Modules>
+
+* Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.5-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
+
+* Wed Dec 07 2016 Orion Poplawski <orion@cora.nwra.com> - 2.0.5-2
+- Rebuild for octave 4.2
+
+* Wed Jun 08 2016 Tomas Smetana <tsmetana@redhat.com> - 2.0.5-1
+- Update to new upstream version, drop upstreamed patches
+
+* Mon Feb 22 2016 Orion Poplawski <orion@cora.nwra.com> - 2.0.4-3
+- Rebuild for gsl 2.1
+
+* Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.4-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
+
+* Mon Jul 20 2015 Tomas Smetana <tsmetana@redhat.com> - 2.0.4-1
+- Update to new upstream version
+- pfscalibration and pfstools are now part of pfstools
+
 * Tue Jul 07 2015 Orion Poplawski <orion@cora.nwra.com> - 1.8.5-23
 - Rebuild for octave 4.0
 

sources

@@ -1 +1 @@
-80dac70bfb6359a6749453477e74b112  pfstools-1.8.5.tar.gz
+SHA512 (pfstools-2.2.0.tgz) = 3a82fa44f6f67ba45203db9c5108df78176f1ad375042fe14e9108f4c9b5d46798e4a1544d842b50e4e326c1063808e095b46d35f374cb5ee5fb2fa1d93bcf8c