[fldigi] Update to 3.21.16 and cleanup spec file

[Peter Robinson]

commit 1f85975db35dfc309b6a69e33a0cd3fe25096495
Author: Peter Robinson <pbrobinson at gmail.com>
Date:   Tue Oct 11 13:10:31 2011 +0100

    Update to 3.21.16 and cleanup spec file

 .gitignore  |    1 +
 fldigi.spec |   20 +++++---------------
 sources     |    2 +-
 3 files changed, 7 insertions(+), 16 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 42e37b5..158cd94 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,4 @@ fldigi-3.20.20.tar.gz
 /fldigi-3.21.7.tar.gz
 /fldigi-3.21.9.tar.gz
 /fldigi-3.21.11.tar.gz
+/fldigi-3.21.16.tar.gz
diff --git a/fldigi.spec b/fldigi.spec
index a29922e..f79785d 100755
--- a/fldigi.spec
+++ b/fldigi.spec
@@ -1,17 +1,11 @@
 Name:		fldigi
-Version:	3.21.11
-Release:	6%{?dist}
+Version:	3.21.16
+Release:	1%{?dist}
 Summary:	Digital modem program for Linux
 Group:		Applications/Communications
 License:	GPLv3+	
 URL:		http://www.w1hkj.com/Fldigi.html
-Source0:	http://www.w1hkj.com/alpha/%{name}/%{name}-%{version}.tar.gz
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-# Patch0 By Kamal Mostafa, KA6MAL Fixes #708696 "Fldigi crashes when started" reported upstream.
-Patch0:		%{name}-%{version}-global.cxx.patch
-# Patch1 recomended by Dave Feese, W1HKJ
-Patch1:		%{name}-%{version}-panel.cxx.patch
+Source0:	http://www.w1hkj.com/downloads/%{name}/%{name}-%{version}.tar.gz
 
 BuildRequires:	hamlib-devel
 BuildRequires:	fltk-devel
@@ -49,15 +43,12 @@ exported by fldigi, and also defines some useful commands of its own.
 
 # Fix spurious executeable
 chmod 644 ./src/olivia/olivia.cxx
-%patch0 -p1 -b %{name}-%{version}-global.cxx.patch
-%patch1 -p1 -b %{name}-%{version}-panel.cxx.patch
 
 %build
 %configure
 make -k %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" LIBS="-lm -lX11 -lpthread"
 
 %install
-rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 desktop-file-install --vendor="" \
 	--dir=${RPM_BUILD_ROOT}%{_datadir}/applications \
@@ -72,9 +63,6 @@ $RPM_BUILD_ROOT%{_datadir}/applications/flarq.desktop
 # Remove INSTALL file has no relevance to Fedora package install.
 rm INSTALL
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING README NEWS
@@ -88,6 +76,8 @@ rm -rf $RPM_BUILD_ROOT
 %attr(0644,root,root) %{_datadir}/applications/flarq.desktop
 
 %changelog
+* Tue Oct 11 2011 Peter Robinson <pbrobinson at fedoraproject.org> - 3.21.16-1
+- Update to 3.21.16 and cleanup spec file
 * Sun Jun 12 2011 Randall J. Berry <dp67 at fedoraproject.org> - 3.21.11-4
 - Correct my mistake in update request.
 * Sun Jun 12 2011 Randall J. Berry <dp67 at fedoraproject.org> - 3.21.11-4
diff --git a/sources b/sources
index 45bc871..aff042f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-863cbac80a829a8c5287fb536f635f4b  fldigi-3.21.11.tar.gz
+9af31f9ea08dd3ad7267b72c968965f8  fldigi-3.21.16.tar.gz