From 9da5886a48cd504152ed3cd6b6b204bfa441914a Mon Sep 17 00:00:00 2001
From: Orion Poplawski <orion@cora.nwra.com>
Date: Tue, 10 May 2011 23:35:20 -0600
Subject: [PATCH] Update to upstream release 1.8.3 pfsview now uses qt4 Rebuild
 for octave 3.4.0

---
 .gitignore    |  1 +
 pfstools.spec | 19 ++++++++++++-------
 sources       |  2 +-
 3 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/.gitignore b/.gitignore
index fa0b092..7762fa8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 pfstools-1.8.1.tar.gz
+/pfstools-1.8.3.tar.gz
diff --git a/pfstools.spec b/pfstools.spec
index 26112d6..b34fc16 100644
--- a/pfstools.spec
+++ b/pfstools.spec
@@ -1,6 +1,6 @@
 Name:		pfstools
-Version:	1.8.1
-Release:	4%{?dist}
+Version:	1.8.3
+Release:	1%{?dist}
 Summary:	Programs for handling high-dynamic range images
 
 Group:		Applications/Multimedia
@@ -23,7 +23,7 @@ BuildRequires:	libGL-devel
 BuildRequires:	ImageMagick-devel
 BuildRequires:	freeglut-devel
 BuildRequires:	ImageMagick-c++-devel
-BuildRequires:	qt3-devel
+BuildRequires:	qt-devel
 BuildRequires:	libXi-devel
 BuildRequires:	netpbm-devel
 BuildRequires:	texlive-latex
@@ -54,7 +54,7 @@ Group:		Applications/Multimedia
 Requires:	pfstools-libs = %{version}-%{release}
 
 %description qt
-The pfstools-qt package contains viewer programs based on qt3 for
+The pfstools-qt package contains viewer programs based on qt4 for
 viewing HDR graphics files.
 
 
@@ -190,8 +190,8 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/pfstools/hdrhtml_c_b3.csv
 %{_datadir}/pfstools/hdrhtml_c_b4.csv
 %{_datadir}/pfstools/hdrhtml_c_b5.csv
-%{_datadir}/pfstools/hdrhtml_image_templ.html
-%{_datadir}/pfstools/hdrhtml_page_templ.html
+%{_datadir}/pfstools/hdrhtml_default_templ/
+%{_datadir}/pfstools/hdrhtml_hdrlabs_templ/
 %{_datadir}/pfstools/hdrhtml_t_b2.csv
 %{_datadir}/pfstools/hdrhtml_t_b3.csv
 %{_datadir}/pfstools/hdrhtml_t_b4.csv
@@ -261,7 +261,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/pfsoctavelum
 %{_bindir}/pfsoctavergb
 %{_bindir}/pfsstat
-%{_libexecdir}/octave/*/site/oct/*/pfstools
+%{_libdir}/octave/*/site/oct/pfstools
 %{_datadir}/octave/*/site/m/pfstools
 %{_mandir}/man1/pfsoctavelum.1.gz
 %{_mandir}/man1/pfsoctavergb.1.gz
@@ -280,6 +280,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/pfs-1.2
 
 %changelog
+* Tue May 10 2011 Orion Poplawski <orion@cora.nwra.com> - 1.8.3-1
+- Update to upstream release 1.8.3
+- pfsview now uses qt4
+- Rebuild for octave 3.4.0
+
 * Wed Feb 09 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.8.1-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 
diff --git a/sources b/sources
index e466c81..4960d61 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-485507fd077c153accd8522f2a7d0612  pfstools-1.8.1.tar.gz
+ef6bc9358058fb37ab580267c6aac500  pfstools-1.8.3.tar.gz