[fldigi/f15] Update with --disable-nls temporary fix for #708696

Randall 'Randy' Berry dp67 at fedoraproject.org
Sat Jun 11 18:37:58 UTC 2011


commit ad52d293963df564e5005675136d05f444260b54
Author: dp67 <dp67 at fedoraproject.org>
Date:   Sat Jun 11 14:37:46 2011 -0400

    Update with --disable-nls temporary fix for #708696

 .gitignore  |    1 +
 fldigi.spec |   23 +++++++++++++++++------
 sources     |    2 +-
 3 files changed, 19 insertions(+), 7 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 6665116..f28d702 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.10.tar.gz
+/fldigi-3.21.11.tar.gz
diff --git a/fldigi.spec b/fldigi.spec
index 2642452..4e249b2 100755
--- a/fldigi.spec
+++ b/fldigi.spec
@@ -1,11 +1,11 @@
 Name:		fldigi
-Version:	3.21.10
-Release:	3%{?dist}
+Version:	3.21.11
+Release:	2%{?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)
 
 # Patch1:		%{name}-%{version}-Panel.patch
@@ -47,7 +47,8 @@ chmod 644 ./src/olivia/olivia.cxx
 # %patch1 -p1 -b %{name}-%{version}-Panel.patch
 
 %build
-%configure
+# Temporarily disable i18n to fix startup failure on F15 (bug #708696)
+%configure --disable-nls
 make -k %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" LIBS="-lm -lX11 -lpthread"
 
 %install
@@ -61,7 +62,8 @@ $RPM_BUILD_ROOT%{_datadir}/applications/flarq.desktop
 # this is an existing package with vendor previously installed
 # fldigi-shell is cli no .desktop needed
 
-%find_lang %{name}
+# Temporarily disable i18n to fix startup failure on F15 (bug #708696)
+# %%find_lang %%{name}
 
 # Remove INSTALL file has no relevance to Fedora package install.
 rm INSTALL
@@ -69,7 +71,9 @@ rm INSTALL
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%files -f %{name}.lang
+# Temporarily disable i18n to fix startup failure on F15 (bug #708696)
+# %%files -f %%{name}.lang
+%files
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING README
 %{_bindir}/*
@@ -82,6 +86,13 @@ rm -rf $RPM_BUILD_ROOT
 %attr(0644,root,root) %{_datadir}/applications/flarq.desktop
 
 %changelog
+* 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
diff --git a/sources b/sources
index f0fd818..45bc871 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-7ea153edccc7cefd04dd2b44979def7b  fldigi-3.21.10.tar.gz
+863cbac80a829a8c5287fb536f635f4b  fldigi-3.21.11.tar.gz


More information about the scm-commits mailing list