[linpsk] Fixed FTBFS by compile-fix patch Resolves: rhbz#715960 Minor cosmetic changes

[Jaroslav Škarvada]

commit 99ea446214ea586967569e228c832938d9bd4483
Author: Jaroslav Škarvada <jskarvad at redhat.com>
Date:   Wed Jan 11 15:49:45 2012 +0100

    Fixed FTBFS by compile-fix patch
    Resolves: rhbz#715960
    Minor cosmetic changes

 linpsk-1.1-compile-fix.patch |   21 +++++++++++++++++++
 linpsk.spec                  |   45 ++++++++++++++++++++++++-----------------
 2 files changed, 47 insertions(+), 19 deletions(-)
---
diff --git a/linpsk-1.1-compile-fix.patch b/linpsk-1.1-compile-fix.patch
new file mode 100644
index 0000000..7165e9d
--- /dev/null
+++ b/linpsk-1.1-compile-fix.patch
@@ -0,0 +1,21 @@
+diff -up linpsk/src/linpsk.cpp.orig linpsk/src/linpsk.cpp
+--- linpsk/src/linpsk.cpp.orig	2010-02-20 12:43:02.000000000 +0100
++++ linpsk/src/linpsk.cpp	2012-01-11 15:20:45.623719186 +0100
+@@ -680,6 +680,7 @@ void LinPSK::setRxMode()
+   QString Info;
+   ModeMenu Menu ;
+   ExtraParameter *Param;
++  ExtraParameter TempParam;
+   Param = ( ExtraParameter * ) settings.ActChannel->getParameter ( Extra );
+   if ( Param != 0 )
+     Menu.setParameter ( *Param );
+@@ -690,7 +691,8 @@ void LinPSK::setRxMode()
+     RxDisplay->RxFreq->setAfcDisplayMode ( settings.ActChannel->AfcProperties() );
+     RxDisplay->RxFreq->setAfcMode ( settings.ActChannel->getAfcMode() );
+     Control->Display->setPhasePointer ( settings.ActChannel->getPhasePointer() );
+-    settings.ActChannel->setParameter ( Extra, &Menu.getParameter() );
++    TempParam = Menu.getParameter();
++    settings.ActChannel->setParameter ( Extra, &TempParam );
+   }
+   if ( settings.ActChannel != 0 )
+     switch ( settings.ActChannel->getModulationType() )
diff --git a/linpsk.spec b/linpsk.spec
index 5dba4c9..e01dba4 100644
--- a/linpsk.spec
+++ b/linpsk.spec
@@ -1,28 +1,29 @@
-Name:		linpsk
-Version:	1.1
-Release:	5%{?dist}
-Summary:	Psk31 and RTTY program for Linux
-
-Group:		Applications/Communications
-License:	GPLv2+
-URL:		http://linpsk.sourceforge.net/
-Source0:	http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tgz
+Name:           linpsk
+Version:        1.1
+Release:        6%{?dist}
+Summary:        Psk31 and RTTY program for Linux
+
+Group:          Applications/Communications
+License:        GPLv2+
+URL:            http://linpsk.sourceforge.net/
+Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tgz
 # Add .desktop file
-Source1:	%{name}.desktop
+Source1:        %{name}.desktop
 # Icon
-Source2:	%{name}.png
+Source2:        %{name}.png
 # Install wrapper
-Source3:	%{name}.sh.in
+Source3:        %{name}.sh.in
 
 # Patch asoundrc file for default sound card (device 0)
-Patch0:		%{name}-%{version}-3.sound.conf.patch
+Patch0:         %{name}-%{version}-3.sound.conf.patch
+Patch1:         %{name}-%{version}-compile-fix.patch
 
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:	fftw-devel
-BuildRequires:	qt-devel
-BuildRequires:	alsa-lib-devel
-BuildRequires:	desktop-file-utils
+BuildRequires:  fftw-devel
+BuildRequires:  qt-devel
+BuildRequires:  alsa-lib-devel
+BuildRequires:  desktop-file-utils
 
 #Requires:
 
@@ -48,7 +49,8 @@ At the Moment RTTY only supports 45 baud and 1.5 stop-bits.
 #fix permissions for debuginfo files
 chmod 0644 $RPM_BUILD_DIR/%{name}/src/{rttydemodulator.cpp,cpskdemodulator.cpp,cpskdemodulator.h,rttydemodulator.h}
 
-%patch0 -p1 -b %{name}-%{version}-3.sound.conf.patch
+%patch0 -p1 -b 3.sound.conf
+%patch1 -p1 -b .compile.fix
 
 %build
 qmake-qt4 -unix -o Makefile %{name}.pro
@@ -94,6 +96,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_libexecdir}/%{name}-bin
 
 %changelog
+* Wed Jan 11 2012 Jaroslav Škarvada <jskarvad at redhat.com> - 1.1-6
+- Fixed FTBFS by compile-fix patch
+  Resolves: rhbz#715960
+- Minor cosmetic changes
+
 * Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild