[qsstv] Update to latest upstream release.

Wed Aug 8 00:39:06 UTC 2012

commit aefa375e8f8cc0224417043aa81c93ef63178847
Author: Richard M. Shaw <hobbes1069 at gmail.com>
Date:   Tue Aug 7 19:38:55 2012 -0500

    Update to latest upstream release.

 .gitignore                    |    1 +
 qsstv-fix-html-doc-path.patch |   24 +++++++++++++++
 qsstv-fix-target-path.patch   |   14 +++++++++
 qsstv-gcc47_unistd.patch      |   20 ++++++++++++
 qsstv.1                       |   21 +++++++++++++
 qsstv.png                     |  Bin 3707 -> 0 bytes
 qsstv.spec                    |   65 +++++++++++++++++++++++++----------------
 sources                       |    2 +-
 8 files changed, 121 insertions(+), 26 deletions(-)
---

diff --git a/.gitignore b/.gitignore
index 1d3ad58..4523787 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 qsstv-5.3c.tar.gz
+/qsstv_7.1.7.tgz
diff --git a/qsstv-fix-html-doc-path.patch b/qsstv-fix-html-doc-path.patch
new file mode 100644
index 0000000..5b58e2b
--- /dev/null
+++ b/qsstv-fix-html-doc-path.patch
@@ -0,0 +1,24 @@
+diff -Naur qsstv_7.1.7.orig/src/configdialog.cpp qsstv_7.1.7/src/configdialog.cpp
+--- qsstv_7.1.7.orig/src/configdialog.cpp	2011-12-29 05:06:12.000000000 -0600
++++ qsstv_7.1.7/src/configdialog.cpp	2012-08-06 13:40:42.420234818 -0500
+@@ -100,7 +100,7 @@
+ 	txImagesPath=qSettings.value("txImagesPath",QString(getenv("HOME"))+"/").toString();
+ 	templatesPath=qSettings.value("templatesPath",QString(getenv("HOME"))+"/").toString();
+ 	audioPath=qSettings.value("audioPath",QString(getenv("HOME"))+"/").toString();
+-	docPath  =qSettings.value("docPath",QString("/usr/share/doc/qsstv/")).toString();
++	docPath  =qSettings.value("docPath",QString("/usr/share/doc/qsstv/html/")).toString();
+ 	defaultImageFormat=qSettings.value("defaultImageFormat","png").toString();
+ 	samplingrate=qSettings.value("samplingrate",11025).toInt();
+ 	rxClock=qSettings.value("rxclock",11025.).toDouble();
+diff -Naur qsstv_7.1.7.orig/src/src.pro qsstv_7.1.7/src/src.pro
+--- qsstv_7.1.7.orig/src/src.pro	2012-01-04 15:11:46.000000000 -0600
++++ qsstv_7.1.7/src/src.pro	2012-08-06 13:38:58.357540295 -0500
+@@ -180,7 +180,7 @@
+ QMAKE_EXTRA_TARGETS   +=   dox
+ message(dox will be generated)
+ }
+-dox.path=/usr/share/doc/$$TARGET
++dox.path=/usr/share/doc/$$TARGET/html
+ dox.files= $$PWD/documentation/html/*
+ 
+  LIBS += -L/usr/lib64 \
diff --git a/qsstv-fix-target-path.patch b/qsstv-fix-target-path.patch
new file mode 100644
index 0000000..e4d1ee6
--- /dev/null
+++ b/qsstv-fix-target-path.patch
@@ -0,0 +1,14 @@
+Change target.path from /usr/local/bin to /usr/bin so that it complies with
+our file system standard.
+
+--- a/src/src.pro
++++ b/src/src.pro
+@@ -190,7 +190,7 @@
+   -lasound \
+   -lhamlib
+ 
+-target.path=/usr/local/bin
++target.path=/usr/bin
+ target.extra = strip $(TARGET); cp -f $(TARGET) $${PREFIX}/bin/$(TARGET)
+ INSTALLS +=target
+ INSTALLS +=dox
diff --git a/qsstv-gcc47_unistd.patch b/qsstv-gcc47_unistd.patch
new file mode 100644
index 0000000..0d4f75a
--- /dev/null
+++ b/qsstv-gcc47_unistd.patch
@@ -0,0 +1,20 @@
+Description: Fix FTBFS with GCC 4.7
+ This patch fixes wavio.cpp:285:33: error: 'lseek' was not declared in this
+ scope which resulted from the upgrade to GCC 4.7. This erro was detected
+ during a QA rebuild of all packages in sid.
+ .
+Author: Martijn van Brummelen <martijn at brumit.nl>
+Bug-Debian: http://bugs.debian.org/672079
+Forwarded: no
+Last-Update: 2012-05-08
+
+--- qsstv-7.1.7.orig/src/wavio.cpp
++++ qsstv-7.1.7/src/wavio.cpp
+@@ -34,6 +34,7 @@
+ #include <qfiledialog.h>
+ #include "configparams.h"
+ #include "supportfunctions.h"
++#include <unistd.h>
+ 
+ //#include "qfilterdesignglobal.h"
+ 
diff --git a/qsstv.1 b/qsstv.1
new file mode 100644
index 0000000..f9c465e
--- /dev/null
+++ b/qsstv.1
@@ -0,0 +1,21 @@
+.TH QSSTV 1 
+
+.SH NAME
+qsstv \- Qt based slow scan television and fax
+
+.SH SYNOPSIS
+.B qsstv
+
+.SH DESCRIPTION
+.B qsstv
+is a program for sending and receiving slow-scan TV and fax. 
+These are modes used by hamradio operators. 
+Qsstv uses a soundcard to send and receive images.
+
+.SH SEE ALSO
+The qsstv documentation in html format in
+/usr/share/doc/qsstv/html.
+
+.SH FILES
+Settings for qsstv are saved in
+.I $HOME/qsstv.conf
diff --git a/qsstv.spec b/qsstv.spec
index 237e952..312fb5d 100644
--- a/qsstv.spec
+++ b/qsstv.spec
@@ -1,20 +1,25 @@
 Name:           qsstv
-Version:        5.3c
-Release:        10%{?dist}
+Version:        7.1.7
+Release:        1%{?dist}
 Summary:        Qt-based slow-scan TV and fax
 
 Group:          Applications/Communications
 License:        GPLv2+
 URL:            http://users.telenet.be/on4qz/qsstv/
-Source0:        http://users.telenet.be/on4qz/qsstv/download/qsstv-%{version}.tar.gz
+Source0:        http://users.telenet.be/on4qz/qsstv/downloads/qsstv_%{version}.tgz
 Source1:        qsstv.desktop
-Source2:        qsstv.png
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Source2:        qsstv.1
+
+Patch0:         qsstv-fix-html-doc-path.patch
+Patch1:         qsstv-fix-target-path.patch
+Patch2:         qsstv-gcc47_unistd.patch
 
-BuildRequires:  qt3-devel
-BuildRequires:  doxygen
 BuildRequires:  desktop-file-utils
-#Requires:       
+BuildRequires:  fftw-devel
+BuildRequires:  qt-devel
+BuildRequires:  hamlib-devel
+BuildRequires:  alsa-lib-devel
+
 
 %description
 Qsstv is a program for receiving slow-scan television and fax. These are
@@ -22,49 +27,59 @@ modes used by hamradio operators. Qsstv uses a soundcard to send and
 receive images.
 
 %prep
-%setup -q -n %{name}-%{version}
+%setup -q -n %{name}_%{version}
+
+%patch0 -p1 -b .docpath
+%patch1 -p1 -b .targetpath
+%patch2 -p1 -b .gcc47
+
+# Don't strip the executable so debuginfo package can be built.
+sed -i 's| strip $(TARGET);||g' src/src.pro
 
-#for debuginfo
-chmod 0644 qsstv/icons/*.xpm
 
-%build
-%configure
+%build 
+qmake-qt4 PREFIX=%{buildroot}%{_prefix}
 make %{?_smp_mflags}
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
+INSTALL_ROOT=%{buildroot}; export INSTALL_ROOT
+make install 
+
+# Install icon
 mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/pixmaps/
-cp %{SOURCE2} ${RPM_BUILD_ROOT}%{_datadir}/pixmaps/%{name}.png
+cp src/icons/qsstv.png ${RPM_BUILD_ROOT}%{_datadir}/pixmaps/
 desktop-file-install \
         --dir=${RPM_BUILD_ROOT}%{_datadir}/applications %{SOURCE1}
 
-
-%clean
-rm -rf $RPM_BUILD_ROOT
+# Install man page borrowed from Debian
+mkdir -p %{buildroot}%{_mandir}/man1
+install -pm 0644 %{SOURCE2} %{buildroot}%{_mandir}/man1/
 
 
 %files
-%defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING README TODO
+%doc COPYING 
+%{_docdir}/%{name}/
 %{_bindir}/* 
-%{_datadir}/qsstv
 %{_datadir}/pixmaps/%{name}.png
 %{_datadir}/applications/*%{name}.desktop
+%{_mandir}/man1/%{name}.1*
 
 
 %changelog
-* Sat Jul 21 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 5.3c-10
+* Sun Aug 05 2012 Richard Shaw <hobbes1069 at gmail.com> - 7.1.7-1
+- Update to latest upstream release.
+
+* Sat Jul 21 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> 
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
 
-* Sat Jan 14 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 5.3c-9
+* Sat Jan 14 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> 
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
 
 * Tue Dec 06 2011 Adam Jackson <ajax at redhat.com> - 5.3c-8
 - Rebuild for new libpng
 
-* Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 5.3c-7
+* Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> 
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 
 * Fri Nov 27 2009 Lucian Langa <cooly at gnome.eu.org> - 5.3c-6
diff --git a/sources b/sources
index 1459064..66373d6 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-100ddd94beb190c1b3f365896dd716eb  qsstv-5.3c.tar.gz
+23835761ca333d31facf033dcf9e1efb  qsstv_7.1.7.tgz
