[fldigi] Apply upstream update

Sun Jun 12 04:45:24 UTC 2011

commit 9f95415aa9f0a1f0bd90c5aedee183b01d023158
Author: dp67 <dp67 at fedoraproject.org>
Date:   Sun Jun 12 00:45:11 2011 -0400

    Apply upstream update

 .gitignore                      |    1 +
 fldigi-3.21.11-global.cxx.patch |   15 +++++++++++++++
 fldigi.spec                     |   39 ++++++++++++++++++++++++++++++++-------
 sources                         |    2 +-
 4 files changed, 49 insertions(+), 8 deletions(-)
---

diff --git a/.gitignore b/.gitignore
index 699331a..42e37b5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@ fldigi-3.20.20.tar.gz
 /fldigi-3.20.34.tar.gz
 /fldigi-3.21.7.tar.gz
 /fldigi-3.21.9.tar.gz
+/fldigi-3.21.11.tar.gz
diff --git a/fldigi-3.21.11-global.cxx.patch b/fldigi-3.21.11-global.cxx.patch
new file mode 100644
index 0000000..cc75955
--- /dev/null
+++ b/fldigi-3.21.11-global.cxx.patch
@@ -0,0 +1,15 @@
+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 e4b8ded..c8362e3 100755
--- a/fldigi.spec
+++ b/fldigi.spec
@@ -1,12 +1,14 @@
 Name:		fldigi
-Version:	3.21.9
-Release:	2%{?dist}
+Version:	3.21.11
+Release:	3%{?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
+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
@@ -21,9 +23,10 @@ BuildRequires:	xmlrpc-c-devel
 BuildRequires:	gettext
 BuildRequires:	libXinerama-devel
 
+Provides:	flarq
+Provides:	%{name}-shell
 
 %description
-# Spelling errors are intentional ignore rpmlint warnings.
 Fldigi is a modem program which supports most of the digital modes used by 
 ham radio operators today. You can also use the program for calibrating your 
 sound card to WWV or doing a frequency measurement test. The program also comes 
@@ -43,11 +46,11 @@ 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
-make -k %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" LIBS="-lm -lX11 -lpthread -lXinerama
-"
+make -k %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" LIBS="-lm -lX11 -lpthread"
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -70,7 +73,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING README
+%doc AUTHORS ChangeLog COPYING README NEWS
 %{_bindir}/*
 %{_datadir}/pixmaps/%{name}.xpm
 %{_datadir}/pixmaps/flarq.xpm 
@@ -81,6 +84,28 @@ rm -rf $RPM_BUILD_ROOT
 %attr(0644,root,root) %{_datadir}/applications/flarq.desktop
 
 %changelog
+* Sun Jun 12 2011 Randall J. Berry <dp67 at fedoraproject.org> - 3.21.11-3
+- Removed --disable-nls temporary fix
+- Apply Patch0 by Kamal Mostafa, KA6MAL
+- Fixes crash when started (bug #708696)
+- Added provides fldigi-shell, flarq
+* Sat Jun 11 2011 Randall J. Berry <dp67 at fedoraproject.org> - 3.21.11-2
+- Upload source to git (F15)
+- Build for F15
+* Sat Jun 11 2011 Randall J. Berry <dp67 at fedoraproject.org> - 3.21.11-1
+- Upstream update (alpha)
+- Build with --disable-nls as a temporary measure to prevent crash on startup (bug #708696)
+- Temporary disable of i18n (bug #708696)
+* Sat Jun 4 2011 Randall J. Berry <dp67 at fedoraproject.org> - 3.21.10-3
+- Successful local build F14
+- Test build on koji F14
+* Sat Jun 4 2011 Randall J. Berry <dp67 at fedoraproject.org> - 3.21.10-2
+- Removed patches 
+- Test build for Rawhide
+* Sat Jun 4 2011 Randall J. Berry <dp67 at fedoraproject.org> - 3.21.10-1
+- Apply upstream patches dup_defines.diff
+* Thu May 26 2011 Randall J. Berry <dp67 at fedoraproject.org> - 3.21.9-3
+- Added Panel.cxx patch1 to fix int error.
 * Thu May 26 2011 Randall J. Berry <dp67 at fedoraproject.org> - 3.21.9-2
 - Added BuildRequires:	libXinerama-devel
 * Thu May 26 2011 Randall J. Berry <dp67 at fedoraproject.org> - 3.21.9-1
diff --git a/sources b/sources
index 126c874..45bc871 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-9e15ee21d7de48511c6e18b1fcef261f  fldigi-3.21.9.tar.gz
+863cbac80a829a8c5287fb536f635f4b  fldigi-3.21.11.tar.gz
