[linpsk] New version

[Jaroslav Škarvada]

commit 088d97f66bd4d820bf759c13bc64e8f4e646924b
Author: Jaroslav Škarvada <jskarvad at redhat.com>
Date:   Fri Jan 3 14:33:45 2014 +0100

    New version
    
      Resolves: rhbz#1046658
    - Dropped compile-fix patch (not needed)
    - Various minor fixes

 .gitignore                   |    1 +
 linpsk-1.1-compile-fix.patch |   21 --------------------
 linpsk.spec                  |   44 ++++++++++++++++++++++-------------------
 sources                      |    2 +-
 4 files changed, 26 insertions(+), 42 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 888eadd..52b6d38 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 linpsk-1.1.tgz
+/linpsk-1.2.tgz
diff --git a/linpsk.spec b/linpsk.spec
index f8384c5..08e77ce 100644
--- a/linpsk.spec
+++ b/linpsk.spec
@@ -1,6 +1,6 @@
 Name:           linpsk
-Version:        1.1
-Release:        10%{?dist}
+Version:        1.2
+Release:        1%{?dist}
 Summary:        Psk31 and RTTY program for Linux
 
 Group:          Applications/Communications
@@ -15,8 +15,7 @@ Source2:        %{name}.png
 Source3:        %{name}.sh.in
 
 # Patch asoundrc file for default sound card (device 0)
-Patch0:         %{name}-%{version}-3.sound.conf.patch
-Patch1:         %{name}-%{version}-compile-fix.patch
+Patch0:         linpsk-1.1-3.sound.conf.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -34,57 +33,56 @@ LinPsk supports BPSK, QPSK and RTTY at the moment.
 Main features are:
 * the simultaneous decoding of up to four channels.
 * The different digital modes may be mixed
-* You can define a trigger on each channel to be notified if a text of your 
+* You can define a trigger on each channel to be notified if a text of your
   choice is detected.
 * You can log each received channel at a file.
-* For easy qso'ing you can define macros and for larger texts to be send you 
+* For easy qso'ing you can define macros and for larger texts to be send you
   can use two files.
-* You can view the signal as spectrum or in a waterfall display. Both are 
+* You can view the signal as spectrum or in a waterfall display. Both are
   scale-able in the frequency domain.
-At the Moment RTTY only supports 45 baud and 1.5 stop-bits. 
+At the Moment RTTY only supports 45 baud and 1.5 stop-bits.
 
 %prep
-%setup -q -n %{name}
+%setup -q
 
 #fix permissions for debuginfo files
-chmod 0644 $RPM_BUILD_DIR/%{name}/src/{rttydemodulator.cpp,cpskdemodulator.cpp,cpskdemodulator.h,rttydemodulator.h}
+chmod 0644 src/{rttydemodulator.cpp,rttydemodulator.h}
 
 %patch0 -p1 -b 3.sound.conf
-%patch1 -p1 -b .compile.fix
 
 %build
 qmake-qt4 -unix -o Makefile %{name}.pro
 make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS"
 
 %install
-rm -rf $RPM_BUILD_ROOT
-mkdir -p $RPM_BUILD_ROOT%{_bindir}
+rm -rf %{buildroot}
+mkdir -p %{buildroot}%{_bindir}
 
 # Move original binary to libexecdir
 mkdir -p %{buildroot}/%{_libexecdir}/
-install -m 755 bin/%{name} $RPM_BUILD_ROOT%{_libexecdir}/%{name}-bin
+install -m 755 bin/%{name} %{buildroot}%{_libexecdir}/%{name}-bin
 
 # Install wrapper script 
 install -p -D -m 0755 %{SOURCE3} %{buildroot}/%{_bindir}/%{name}
 
 # Install default sound configuration file
 mkdir -p %{buildroot}/%{_sysconfdir}/skel/.%{name}/
-install -p -D -m 0644 $RPM_BUILD_DIR/%{name}/asoundrc %{buildroot}/%{_sysconfdir}/skel/.%{name}/asoundrc
+install -p -D -m 0644 asoundrc %{buildroot}/%{_sysconfdir}/skel/.%{name}/asoundrc
 
 # Install provided icon
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps/
-cp %{SOURCE2} ${RPM_BUILD_ROOT}%{_datadir}/pixmaps/%{name}.png
+mkdir -p %{buildroot}%{_datadir}/pixmaps/
+cp %{SOURCE2} %{buildroot}%{_datadir}/pixmaps/%{name}.png
 # no upstream .desktop
 desktop-file-install \
-        --dir=${RPM_BUILD_ROOT}%{_datadir}/applications %{SOURCE1}
+        --dir=%{buildroot}%{_datadir}/applications %{SOURCE1}
 # --vendor obsolete per new guidlines but leaving it in because
 # this is an existing package with vendor previously installed
 
 #Remove development files
-find $RPM_BUILD_ROOT -type f -name "*.a" -exec rm -f {} ';'
+find %{buildroot} -type f -name "*.a" -exec rm -f {} ';'
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root,-)
@@ -96,6 +94,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_libexecdir}/%{name}-bin
 
 %changelog
+* Fri Jan  3 2014 Jaroslav Škarvada <jskarvad at redhat.com> - 1.2-1
+- New version
+  Resolves: rhbz#1046658
+- Dropped compile-fix patch (not needed)
+- Various minor fixes
+
 * Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1-10
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
 
diff --git a/sources b/sources
index f864147..18919f2 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-9a5bad0a86ef34d33a38bfad73fe3f4c  linpsk-1.1.tgz
+674c783fd772a532a7b8a107ae69ec1e  linpsk-1.2.tgz