[fldigi/f15] Apply patch to fix F15 crash
Randall 'Randy' Berry
dp67 at fedoraproject.org
Sun Jun 12 22:39:54 UTC 2011
commit a7e4f0f5c890fc7e1eff9f9cb5ea214a8db2c68f
Author: dp67 <dp67 at fedoraproject.org>
Date: Sun Jun 12 18:39:36 2011 -0400
Apply patch to fix F15 crash
.gitignore | 2 +-
fldigi.spec | 27 +++++++++++++++------------
2 files changed, 16 insertions(+), 13 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index f28d702..42e37b5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,5 +5,5 @@ fldigi-3.20.20.tar.gz
/fldigi-3.20.32.tar.gz
/fldigi-3.20.34.tar.gz
/fldigi-3.21.7.tar.gz
-/fldigi-3.21.10.tar.gz
+/fldigi-3.21.9.tar.gz
/fldigi-3.21.11.tar.gz
diff --git a/fldigi.spec b/fldigi.spec
index 4e249b2..c8362e3 100755
--- a/fldigi.spec
+++ b/fldigi.spec
@@ -1,14 +1,14 @@
Name: fldigi
Version: 3.21.11
-Release: 2%{?dist}
+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/alpha/%{name}/%{name}-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-# Patch1: %{name}-%{version}-Panel.patch
+# 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
@@ -23,6 +23,8 @@ BuildRequires: xmlrpc-c-devel
BuildRequires: gettext
BuildRequires: libXinerama-devel
+Provides: flarq
+Provides: %{name}-shell
%description
Fldigi is a modem program which supports most of the digital modes used by
@@ -44,11 +46,10 @@ exported by fldigi, and also defines some useful commands of its own.
# Fix spurious executeable
chmod 644 ./src/olivia/olivia.cxx
-# %patch1 -p1 -b %{name}-%{version}-Panel.patch
+%patch0 -p1 -b %{name}-%{version}-global.cxx.patch
%build
-# Temporarily disable i18n to fix startup failure on F15 (bug #708696)
-%configure --disable-nls
+%configure
make -k %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" LIBS="-lm -lX11 -lpthread"
%install
@@ -62,8 +63,7 @@ $RPM_BUILD_ROOT%{_datadir}/applications/flarq.desktop
# this is an existing package with vendor previously installed
# fldigi-shell is cli no .desktop needed
-# Temporarily disable i18n to fix startup failure on F15 (bug #708696)
-# %%find_lang %%{name}
+%find_lang %{name}
# Remove INSTALL file has no relevance to Fedora package install.
rm INSTALL
@@ -71,11 +71,9 @@ rm INSTALL
%clean
rm -rf $RPM_BUILD_ROOT
-# Temporarily disable i18n to fix startup failure on F15 (bug #708696)
-# %%files -f %%{name}.lang
-%files
+%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
@@ -86,6 +84,11 @@ 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
More information about the scm-commits
mailing list