From 48fdc5f13c3ec932f1d9ffa25121484d2a1ab88a Mon Sep 17 00:00:00 2001
From: dp67 <dp67@fedoraproject.org>
Date: Sep 09 2011 06:19:26 +0000
Subject: Upstream update to 3.21.14


---

diff --git a/.gitignore b/.gitignore
index 42e37b5..0ea5009 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.14.tar.gz
diff --git a/fldigi-3.21.11-global.cxx.patch b/fldigi-3.21.11-global.cxx.patch
deleted file mode 100644
index cc75955..0000000
--- a/fldigi-3.21.11-global.cxx.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -up ./src/globals/globals.cxx.old ./src/globals/globals.cxx
---- ./src/globals/globals.cxx.old	2011-06-09 17:12:59.000000000 -0400
-+++ ./src/globals/globals.cxx	2011-06-12 00:20:44.546248229 -0400
-@@ -112,7 +112,10 @@ const struct mode_info_t mode_info[NUM_M
- 
- 	{ MODE_SSB, &ssb_modem, "SSB", "SSB", "", "SSB", "" },
- 	{ MODE_WWV, &wwv_modem, "WWV", "WWV", "", "", "" },
--        { MODE_ANALYSIS, &anal_modem, "ANALYSIS", _("Freq Analysis"), "", "", "" }
-+	// N.B. it is not valid to use an _("NLS") string in this table!!
-+	// ... doing so will break the Fl_menu_item table 'menu_'.  -Kamal
-+	// { MODE_ANALYSIS, &anal_modem, "ANALYSIS", _("Freq Analysis"), "", "", "" }
-+        { MODE_ANALYSIS, &anal_modem, "ANALYSIS", "Freq Analysis", "", "", "" }
- };
- 
- std::ostream& operator<<(std::ostream& s, const qrg_mode_t& m)
diff --git a/fldigi.spec b/fldigi.spec
index 2007d89..5b13bc6 100755
--- a/fldigi.spec
+++ b/fldigi.spec
@@ -1,14 +1,12 @@
 Name:		fldigi
-Version:	3.21.11
-Release:	5%{?dist}
+Version:	3.21.14
+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)
-# Patch By Kamal Mostafa, KA6MAL Fixes #708696 "Fldigi crashes when started" reported upstream.
-Patch0:		%{name}-%{version}-global.cxx.patch
 
 BuildRequires:	hamlib-devel
 BuildRequires:	fltk-devel
@@ -46,7 +44,6 @@ 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
 
 %build
 %configure
@@ -84,6 +81,9 @@ rm -rf $RPM_BUILD_ROOT
 %attr(0644,root,root) %{_datadir}/applications/flarq.desktop
 
 %changelog
+* Fri Sep 9 2011 Randall J. Berry <dp67@fedoraproject.org> - 3.21.14-1
+- Upstream update to 3.21.14
+- Remove patch applied upstream
 * Sun Jun 12 2011 Randall J. Berry <dp67@fedoraproject.org> - 3.21.11-4
 - Correct my mistake in update request.
 * Sun Jun 12 2011 Randall J. Berry <dp67@fedoraproject.org> - 3.21.11-4
diff --git a/sources b/sources
index 45bc871..f9f0ce3 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-863cbac80a829a8c5287fb536f635f4b  fldigi-3.21.11.tar.gz
+cc1e190db19886df89155d013312467f  fldigi-3.21.14.tar.gz