[xdemorse] New upstream release

[Richard Hughes]

commit e9d78416e19f517b1ccadfc06abdfe1ade73eeb0
Author: Richard Hughes <richard at hughsie.com>
Date:   Tue May 6 17:41:05 2014 +0100

    New upstream release
    
    All this just to fix the URL, but it seemed like the right thing to do...

 .gitignore                     |    1 +
 sources                        |    2 +-
 xdemorse-2.1-implicitdso.patch |   10 ---------
 xdemorse.desktop               |   10 ---------
 xdemorse.png                   |  Bin 3707 -> 0 bytes
 xdemorse.spec                  |   44 +++++++++++++--------------------------
 6 files changed, 17 insertions(+), 50 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 5c64cc7..2c7fc00 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 xdemorse-1.3.tar.gz
 /xdemorse-2.1.tar.bz2
+/xdemorse-2.7.tar.bz2
diff --git a/sources b/sources
index 90a8464..e1a3b27 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-3ffc43bb5b01e5febaf58240af3ecd36  xdemorse-2.1.tar.bz2
+108fd5264473648943e297463825332b  xdemorse-2.7.tar.bz2
diff --git a/xdemorse.spec b/xdemorse.spec
index e500c50..a29efd2 100644
--- a/xdemorse.spec
+++ b/xdemorse.spec
@@ -1,20 +1,14 @@
 Name:           xdemorse
-Version:        2.1
-Release:        4%{?dist}
+Version:        2.7
+Release:        1%{?dist}
 Summary:        GTK based application for decoding and displaying Morse code signals
 
 Group:          Applications/Communications
 License:        GPLv2+
-URL:            http://5b4az.chronos.org.uk/pages/morse.html
-Source0:        http://5b4az.chronos.org.uk/pkg/morse/%{name}/%{name}-%{version}.tar.bz2
-#add .desktop file
-Source1:        %{name}.desktop
-#temporary Icon
-Source2:        %{name}.png
+URL:            http://www.qsl.net/5b4az/pkg/morse/xdemorse/xdemorse.html
+Source0:        http://www.qsl.net/5/5b4az//pkg/morse/%{name}/%{name}-%{version}.tar.bz2
 #Wrapper script for user config
 Source3:        xdemorse.sh.in
-Patch0:		xdemorse-2.1-implicitdso.patch
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  autoconf, automake, gtk2-devel, desktop-file-utils, alsa-lib-devel
 #Requires:       
@@ -30,22 +24,21 @@ CAT for the FT-847 and this can be used to net the receiver's frequency
 to the incoming signal, by clicking near its trace in the waterfall display.
 
 %prep
-%setup -qn %{name}
-%patch0 -p1 -b .implicitdso
-
+%setup -q
 
 %build
-./autogen.sh
 %configure
 make %{?_smp_mflags}
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
+mkdir -p $RPM_BUILD_ROOT/usr/share/applications/
+mkdir -p $RPM_BUILD_ROOT/usr/share/pixmaps/
+mkdir -p $RPM_BUILD_ROOT/usr/share/doc/xdemorse/examples/
 make install DESTDIR=$RPM_BUILD_ROOT
 
 #install default user configuration file
-install -p -D -m 0644 $RPM_BUILD_DIR/%{name}/default/.xdemorserc $RPM_BUILD_ROOT%{_datadir}/%{name}/xdemorserc
+#install -p -D -m 0644 $RPM_BUILD_DIR/%{name}/default/.xdemorserc $RPM_BUILD_ROOT%{_datadir}/%{name}/xdemorserc
 
 #move original binary to libexecdir
 mkdir -p $RPM_BUILD_ROOT%{_libexecdir}/
@@ -54,26 +47,19 @@ mv $RPM_BUILD_ROOT%{_bindir}/%{name} $RPM_BUILD_ROOT%{_libexecdir}/%{name}-bin
 #install wrapper script 
 install -p -D -m 0755 %{SOURCE3} $RPM_BUILD_ROOT%{_bindir}/xdemorse
 
-# no upstream .desktop or icon yet
-mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/pixmaps/
-cp %{SOURCE2} ${RPM_BUILD_ROOT}%{_datadir}/pixmaps/%{name}.png
-desktop-file-install \
-        --dir=${RPM_BUILD_ROOT}%{_datadir}/applications %{SOURCE1}
-
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog README doc/Morsecode.txt doc/xdemorse.html
 %{_bindir}/*
 %{_libexecdir}/*
-%{_datadir}/%{name}
-%{_datadir}/pixmaps/%{name}.png
-%{_datadir}/applications/*%{name}.desktop
+#%{_datadir}/%{name}
+%{_datadir}/pixmaps/%{name}.xpm
+%{_datadir}/applications/%{name}.desktop
 
 %changelog
+* Tue May 06 2014 Richard Hughes <richard at hughsie.com> - 2.7-1
+- New upstream release.
+
 * Sun Aug 04 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.1-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild