[fldigi/f17: 6/6] Update to latest bugfix release.

[Richard Shaw]

commit a872e38704550f6fe0902cd19ac69e98f1cfc5a5
Merge: f64b75f e30c9dd
Author: Richard M. Shaw <hobbes1069 at gmail.com>
Date:   Thu Mar 14 08:12:26 2013 -0500

    Update to latest bugfix release.

 .gitignore  |    7 +++++++
 fldigi.spec |   56 ++++++++++++++++++++++++++++++++++++++++++++------------
 sources     |    3 ++-
 3 files changed, 53 insertions(+), 13 deletions(-)
---
diff --cc .gitignore
index 434ac55,3e37cae..0bcc389
--- a/.gitignore
+++ b/.gitignore
@@@ -11,4 -11,7 +11,11 @@@ fldigi-3.20.20.tar.g
  /fldigi-3.21.34.tar.gz
  /fldigi-3.21.35.tar.gz
  /fldigi-3.21.37.tar.gz
++<<<<<<< HEAD
 +/fldigi-3.21.49.tar.gz
++=======
+ /fldigi-3.21.41.tar.gz
+ /fldigi-3.21.49.tar.gz
+ /fldigi-3.21.68.tar.gz
+ /fldigi.pdf
++>>>>>>> master
diff --cc fldigi.spec
index 1d713f6,57cf429..963c929
--- a/fldigi.spec
+++ b/fldigi.spec
@@@ -1,12 -1,13 +1,21 @@@
  Name:		fldigi
++<<<<<<< HEAD
 +Version:	3.21.49
++=======
+ Version:	3.21.68
++>>>>>>> master
  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/downloads/%{name}/%{name}-%{version}.tar.gz
++<<<<<<< HEAD
 +BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
++=======
+ Source1:        http://www.w1hkj.com/downloads/fldigi/fldigi.pdf
++>>>>>>> master
  
  BuildRequires:	hamlib-devel
  BuildRequires:	fltk-devel
@@@ -89,12 -107,15 +115,15 @@@ install -pm 0644 %{SOURCE1} 
  * Mon May 14 2012 Randall J. Berry, N3LRX <dp67 at fedoraproject.org> - 3.21.41-1
  - Upstream upddate to 3.21.41
  - Fix deps for F18/Rawhide
+ 
++* Sat Jan 28 2012 Randall J. Berry, N3LRX <dp67 at fedoraproject.org> - 3.21.37-1
++- Upstream upddate to 3.21.37
++
  * Sat Jan 28 2012 Randall J. Berry, N3LRX <dp67 at fedoraproject.org> - 3.21.37-2
  - Upstream upddate to 3.21.37
  - Remove patches fixed upstream
  - Correct source URL
- * Sat Jan 28 2012 Randall J. Berry, N3LRX <dp67 at fedoraproject.org> - 3.21.37-1
- - Upstream upddate to 3.21.37
+ 
 -* Sat Jan 28 2012 Randall J. Berry, N3LRX <dp67 at fedoraproject.org> - 3.21.37-1
 -- Upstream upddate to 3.21.37
 -
  * Sun Jan 15 2012 Randall J. Berry, N3LRX <dp67 at fedoraproject.org> - 3.21.35-2
  - Add patches for testing error correction
  - Update rawhide builds