diff --git a/.gitignore b/.gitignore index 0e0ce5d..07bf524 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ pfstools-1.8.1.tar.gz /pfstools-2.0.4.tgz /pfstools-2.0.5.tgz /pfstools-2.0.6.tgz +/pfstools-2.1.0.tgz diff --git a/pfstools.spec b/pfstools.spec index e7ae13d..25e833d 100644 --- a/pfstools.spec +++ b/pfstools.spec @@ -1,6 +1,6 @@ Name: pfstools -Version: 2.0.6 -Release: 9%{?dist} +Version: 2.1.0 +Release: 1%{?dist} Summary: Programs for handling high-dynamic range images Group: Applications/Multimedia @@ -17,7 +17,7 @@ BuildRequires: ImageMagick-devel BuildRequires: freeglut-devel BuildRequires: ImageMagick-c++-devel BuildRequires: perl-generators -BuildRequires: qt4-devel +BuildRequires: pkgconfig(Qt5) BuildRequires: libXi-devel BuildRequires: netpbm-devel BuildRequires: texlive-latex @@ -76,7 +76,7 @@ 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. @@ -134,11 +134,12 @@ etc., for developing programs which can handle HDR graphics files. %setup -q %build +%{?el7:export CXXFLAGS="%{optflags} -std=gnu++11"} %{cmake} -DBUILD_SHARED_LIBS=ON -DLIB_DIR=%{_lib} -DWITH_OpenCV=OFF make %install -make install DESTDIR=$RPM_BUILD_ROOT +%make_install # XXX Nuke unpackaged files { cd ${RPM_BUILD_ROOT} @@ -171,12 +172,14 @@ make install DESTDIR=$RPM_BUILD_ROOT %{_bindir}/pfsinppm %{_bindir}/pfsinrgbe %{_bindir}/pfsintiff +%{_bindir}/pfsinyuv %{_bindir}/pfsout %{_bindir}/pfsouthdrhtml %{_bindir}/pfsoutpfm %{_bindir}/pfsoutppm %{_bindir}/pfsoutrgbe %{_bindir}/pfsouttiff +%{_bindir}/pfsoutyuv %{_bindir}/pfspad %{_bindir}/pfspanoramic %{_bindir}/pfsrotate @@ -208,12 +211,14 @@ make install DESTDIR=$RPM_BUILD_ROOT %{_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/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 @@ -301,6 +306,11 @@ make install DESTDIR=$RPM_BUILD_ROOT %{_includedir}/pfs %changelog +* Sun Nov 11 2018 Orion Poplawski - 2.1.0-1 +- Update to 2.1.0 +- Switch to Qt5 +- Rebuild for octave 4.4 + * Tue Aug 28 2018 Michael Cronenworth - 2.0.6-9 - Rebuild for ImageMagick 6.9.10 diff --git a/sources b/sources index 4a4d9e3..bf98ab2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (pfstools-2.0.6.tgz) = 228294bc985dd549e0741fc3bbbafd2de3ea8cfd7165d689e8d56f0cf687ec8d085dcb2ff2285ca2af6692c10b54f567c7627a13a9ae600f8e5c030ec7a73ae1 +SHA512 (pfstools-2.1.0.tgz) = 2117d638a807ec803fec0e8a2d1478f2771cc39fb349b582ab2727762379dc52c9b2a50c276d123c2c7456cdc7518ae60bdaa6d2e3ff179f9f43df63f2b57012