- Upstream upgrade to 3.11.6
- Remove fldigi-gcc44.patch (applied upstream) - Man pages added upstream
This commit is contained in:
Randall 'Randy' Berry
parent
e4ec754c27
commit
f67f6991a2
|
|
@ -1 +1 @@
|
|||
fldigi-3.10.tar.gz
|
||||
fldigi-3.11.6.tar.gz
|
||||
|
|
|
|||
|
|
@ -1,92 +0,0 @@
|
|||
--- src/dialogs/font_browser.cxx.orig 2009-04-25 00:03:42.000000000 +0200
|
||||
+++ src/dialogs/font_browser.cxx 2009-04-25 00:03:49.000000000 +0200
|
||||
@@ -32,6 +32,7 @@
|
||||
#include <string>
|
||||
#include <cstdlib>
|
||||
#include <cstring>
|
||||
+#include <cstdio>
|
||||
|
||||
#include "font_browser.h"
|
||||
|
||||
--- src/misc/qrzlib.cxx.orig 2009-04-25 00:11:54.000000000 +0200
|
||||
+++ src/misc/qrzlib.cxx 2009-04-25 00:13:06.000000000 +0200
|
||||
@@ -775,44 +775,44 @@
|
||||
|
||||
if( found == 1 ) {
|
||||
Qcall = recbuffer;
|
||||
- comma = strchr( Qcall, ',' );
|
||||
+ comma = (char *) strchr( Qcall, ',' );
|
||||
*comma = 0;
|
||||
Qlname = comma + 1;
|
||||
- comma = strchr( Qlname, ',' );
|
||||
+ comma = (char *) strchr( Qlname, ',' );
|
||||
*comma = 0;
|
||||
Qfname = comma + 1;
|
||||
- comma = strchr( Qfname, ',' );
|
||||
+ comma = (char *) strchr( Qfname, ',' );
|
||||
Qfname = comma + 1; // skip JR field
|
||||
- comma = strchr( Qfname, ',' );
|
||||
+ comma = (char *) strchr( Qfname, ',' );
|
||||
*comma = 0;
|
||||
Qdob = comma + 1;
|
||||
- comma = strchr( Qdob, ',' );
|
||||
+ comma = (char *) strchr( Qdob, ',' );
|
||||
Qdob = comma + 1; // skip MI field
|
||||
- comma = strchr( Qdob, ',' );
|
||||
+ comma = (char *) strchr( Qdob, ',' );
|
||||
*comma = 0;
|
||||
Qefdate = comma + 1;
|
||||
- comma = strchr( Qefdate, ',' );
|
||||
+ comma = (char *) strchr( Qefdate, ',' );
|
||||
*comma = 0;
|
||||
Qexpdate = comma + 1;
|
||||
- comma = strchr( Qexpdate, ',' );
|
||||
+ comma = (char *) strchr( Qexpdate, ',' );
|
||||
*comma = 0;
|
||||
Qmail_str = comma + 1;
|
||||
- comma = strchr( Qmail_str, ',' );
|
||||
+ comma = (char *) strchr( Qmail_str, ',' );
|
||||
*comma = 0;
|
||||
Qmail_city = comma + 1;
|
||||
- comma = strchr( Qmail_city, ',' );
|
||||
+ comma = (char *) strchr( Qmail_city, ',' );
|
||||
*comma = 0;
|
||||
Qmail_st = comma + 1;
|
||||
- comma = strchr( Qmail_st, ',' );
|
||||
+ comma = (char *) strchr( Qmail_st, ',' );
|
||||
*comma = 0;
|
||||
Qmail_zip = comma + 1;
|
||||
- comma = strchr( Qmail_zip, ',' );
|
||||
+ comma = (char *) strchr( Qmail_zip, ',' );
|
||||
*comma = 0;
|
||||
Qopclass = comma + 1;
|
||||
- comma = strchr( Qopclass, ',' );
|
||||
+ comma = (char *) strchr( Qopclass, ',' );
|
||||
*comma = 0;
|
||||
Qp_call = comma + 1;
|
||||
- comma = strchr( Qp_call, ',' );
|
||||
+ comma = (char *) strchr( Qp_call, ',' );
|
||||
*comma = 0;
|
||||
Qp_class = comma + 1;
|
||||
//Qp_class[1] = 0;
|
||||
--- src/widgets/picture.cxx.orig 2009-04-25 00:17:36.000000000 +0200
|
||||
+++ src/widgets/picture.cxx 2009-04-25 00:17:51.000000000 +0200
|
||||
@@ -384,7 +384,7 @@
|
||||
if (strstr(text, "file://"))
|
||||
text += strlen("file://");
|
||||
char* p;
|
||||
- if ((p = strchr(text, '\r')))
|
||||
+ if ((p = (char *) strchr(text, '\r')))
|
||||
*p = '\0';
|
||||
|
||||
struct stat st;
|
||||
--- src/misc/socket.cxx.orig 2009-04-25 00:13:57.000000000 +0200
|
||||
+++ src/misc/socket.cxx 2009-04-25 00:19:03.000000000 +0200
|
||||
@@ -39,6 +39,7 @@
|
||||
#include <cstring>
|
||||
#include <cstdlib>
|
||||
#include <cmath>
|
||||
+#include <stdio.h>
|
||||
|
||||
#ifndef NDEBUG
|
||||
#include "debug.h"
|
||||
37
fldigi.spec
37
fldigi.spec
|
|
@ -1,18 +1,26 @@
|
|||
Name: fldigi
|
||||
Version: 3.10
|
||||
Release: 3%{?dist}
|
||||
Version: 3.11.6
|
||||
Release: 1%{?dist}
|
||||
Summary: Digital modem program for Linux
|
||||
|
||||
Group: Applications/Communications
|
||||
License: GPLv2+
|
||||
URL: http://www.w1hkj.com/fldigi-distro/
|
||||
Source0: http://www.w1hkj.com/fldigi-distro/%{name}-%{version}.tar.gz
|
||||
|
||||
# The package should be updated to current, patch re-diffed and send upstream!
|
||||
Patch0: %{name}-gcc44.patch
|
||||
# Commented out 07-16-2009 patch applied upstream 3.11.6
|
||||
# Patch0: %{name}-gcc44.patch
|
||||
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||
|
||||
BuildRequires: hamlib-devel, fltk-devel, libjpeg-devel, libpng-devel
|
||||
BuildRequires: portaudio-devel >= 19-4, libsndfile-devel , desktop-file-utils
|
||||
BuildRequires: hamlib-devel
|
||||
BuildRequires: fltk-devel
|
||||
BuildRequires: libjpeg-devel
|
||||
BuildRequires: libpng-devel
|
||||
BuildRequires: portaudio-devel >= 19-4
|
||||
BuildRequires: libsndfile-devel
|
||||
BuildRequires: desktop-file-utils
|
||||
BuildRequires: libsamplerate-devel
|
||||
|
||||
%description
|
||||
|
|
@ -24,7 +32,17 @@ GUI.
|
|||
|
||||
%prep
|
||||
%setup -q
|
||||
%patch0
|
||||
# %patch0
|
||||
# Remove executeable tag to quiet rpmlint
|
||||
chmod -x src/include/jalocha/pj_struc.h
|
||||
chmod -x src/include/jalocha/pj_fifo.h
|
||||
chmod -x src/include/jalocha/pj_cmpx.h
|
||||
chmod -x src/include/jalocha/pj_fft.h
|
||||
chmod -x src/include/jalocha/pj_gray.h
|
||||
chmod -x src/include/jalocha/pj_lowpass3.h
|
||||
chmod -x src/include/jalocha/pj_fht.h
|
||||
chmod -x src/olivia/olivia.cxx
|
||||
chmod -x src/include/jalocha/pj_mfsk.h
|
||||
|
||||
%build
|
||||
%configure
|
||||
|
|
@ -48,15 +66,18 @@ rm -rf $RPM_BUILD_ROOT
|
|||
%doc AUTHORS ChangeLog COPYING README
|
||||
%{_bindir}/*
|
||||
%{_datadir}/pixmaps/*
|
||||
%{_mandir}/man1/%{name}.1.gz
|
||||
%attr(0644,root,root) %{_datadir}/applications/%{name}.desktop
|
||||
|
||||
%changelog
|
||||
* Thu Jul 16 2009 Randall J. Berry <dp67@fedoraproject.com> 3.11.6-1
|
||||
- Upstream upgrade to 3.11.6
|
||||
- Remove fldigi-gcc44.patch (applied upstream)
|
||||
- Man pages added upstream
|
||||
* Sat Apr 25 2009 Milos Jakubicek <xjakub@fi.muni.cz> - 3.10-3
|
||||
- Fix FTBFS: added fldigi-gcc44.patch
|
||||
|
||||
* Tue Feb 24 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.10-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
|
||||
|
||||
* Mon Jan 19 2009 Randall J Berry 'Dp67' <dp67@fedoraproject.org> 3.10-1
|
||||
- New upstream release
|
||||
* Thu Dec 14 2008 Sindre Pedersen Bjørdal <sindrepb@fedoraproject.org> 3.03-1
|
||||
|
|
|
|||
|
|
@ -1 +1,2 @@
|
|||
fldigi-3_10-1_fc10:HEAD:fldigi-3.10-1.fc10.src.rpm:1232416769
|
||||
fldigi-3_11_6-1_fc11:HEAD:fldigi-3.11.6-1.fc11.src.rpm:1247727524
|
||||
|
|
|
|||
Loading…
Reference in New Issue