Fix failure to build on rawhide

This commit is contained in:
dp67 2012-01-16 10:26:39 -05:00
parent b2f10ce6bb
commit db151ced6e
7 changed files with 65 additions and 4 deletions

1
.gitignore vendored
View File

@ -9,3 +9,4 @@ fldigi-3.20.20.tar.gz
/fldigi-3.21.11.tar.gz
/fldigi-3.21.16.tar.gz
/fldigi-3.21.34.tar.gz
/fldigi-3.21.35.tar.gz

12
flarq.cxx-unistd.patch Normal file
View File

@ -0,0 +1,12 @@
diff -up ./src/flarq-src/flarq.cxx.orig ./src/flarq-src/flarq.cxx
--- ./src/flarq-src/flarq.cxx.orig 2012-01-12 10:53:53.000000000 -0500
+++ ./src/flarq-src/flarq.cxx 2012-01-16 08:00:41.755770552 -0500
@@ -21,7 +21,7 @@
// ----------------------------------------------------------------------------
#include <config.h>
-
+#include <unistd.h>
#include <stdlib.h>
#include <iostream>
#include <fstream>

11
fldigi-rx_extract.patch Normal file
View File

@ -0,0 +1,11 @@
diff -up ./src/logger/rx_extract.cxx.bac ./src/logger/rx_extract.cxx
--- ./src/logger/rx_extract.cxx.bac 2012-01-12 10:53:53.000000000 -0500
+++ ./src/logger/rx_extract.cxx 2012-01-16 09:31:48.289795449 -0500
@@ -21,6 +21,7 @@
#include <config.h>
+#include <unistd.h>
#include <iostream>
#include <fstream>
#include <string>

13
fldigi-wefax-pic.patch Normal file
View File

@ -0,0 +1,13 @@
diff -up ./src/wefax/wefax-pic.cxx.old ./src/wefax/wefax-pic.cxx
--- ./src/wefax/wefax-pic.cxx.old 2012-01-12 10:53:53.000000000 -0500
+++ ./src/wefax/wefax-pic.cxx 2012-01-16 10:06:56.351312369 -0500
@@ -30,7 +30,9 @@
#include <sstream>
#include <iomanip>
+
#include <time.h>
+#include <unistd.h>
#include <FL/Fl_Widget.H>
#include <FL/Fl_Button.H>

11
fldigi-wefax.patch Normal file
View File

@ -0,0 +1,11 @@
diff -up ./src/wefax/wefax.cxx.diff ./src/wefax/wefax.cxx
--- ./src/wefax/wefax.cxx.diff 2012-01-12 10:53:53.000000000 -0500
+++ ./src/wefax/wefax.cxx 2012-01-16 09:41:59.159764618 -0500
@@ -25,6 +25,7 @@
#include <config.h>
+#include <unistd.h>
#include <cstdlib>
#include <sstream>
#include <iostream>

View File

@ -1,11 +1,15 @@
Name: fldigi
Version: 3.21.34
Release: 3%{?dist}
Version: 3.21.35
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/alpha/%{name}/%{name}-%{version}.tar.gz
Patch0: flarq.cxx-unistd.patch
Patch1: fldigi-rx_extract.patch
Patch2: fldigi-wefax.patch
Patch3: fldigi-wefax-pic.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: hamlib-devel
@ -41,6 +45,10 @@ exported by fldigi, and also defines some useful commands of its own.
%prep
%setup -q -n %{name}-%{version}
%patch0 -p1 -b flarq.cxx-unistd.patch
%patch1 -p1 -b fldigi-rx_extract.patch
%patch2 -p1 -b fldigi-wefax.patch
%patch3 -p1 -b fldigi-wefax-pic.patch
# Fix spurious executeable
chmod 644 ./src/olivia/olivia.cxx
@ -82,9 +90,14 @@ rm -rf $RPM_BUILD_ROOT
%attr(0644,root,root) %{_datadir}/applications/flarq.desktop
%changelog
* Sun Jan 15 2012 Randall J. Berry, N3LRX <dp67@fedoraproject.org> - 3.21.35-2
- Add patches for testing error correction
- Update rawhide builds
* Sun Jan 15 2012 Randall J. Berry, N3LRX <dp67@fedoraproject.org> - 3.21.35-1
- Upstream upddate to 3.21.35
- Rebuild against gcc 4.7
* Fri Jan 13 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.21.34-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
* Mon Jan 2 2012 Randall J. Berry, N3LRX <dp67@fedoraproject.org> - 3.21.34-2
- Test Build Against FLTK 1.3
* Thu Dec 28 2011 Randall J. Berry <dp67@fedoraproject.org> - 3.21.34-1

View File

@ -1 +1 @@
a10705cd68c3f0a58f73bab3fc2492fb fldigi-3.21.34.tar.gz
301a3459affe5229260df27df2f0ab5c fldigi-3.21.35.tar.gz