From 29f4864ab75327ff27cc6ac74c0807219d43cf30 Mon Sep 17 00:00:00 2001 From: Lucian Langa Date: May 09 2009 19:36:43 +0000 Subject: - update BR - drop svxlink-devel package - updated descriptions - remove dtmf_plot - drop patch0,1,2,3 as were fixed upstream - new upstream release --- diff --git a/.cvsignore b/.cvsignore index 7e9d981..ee1a953 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,2 +1,2 @@ -svxlink-080730.tar.gz -sounds-080730.tar.gz +svxlink-090426.tar.gz +sounds-090426.tar.gz diff --git a/sources b/sources index 9ffe014..5642b2d 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -aadbba0afd8ab34d7419aa7816bcb2a3 svxlink-080730.tar.gz -b030db62a080c7c35a5210a994ce5efa sounds-080730.tar.gz +98c2f1afdaac19961f89aca0d9bc72b8 svxlink-090426.tar.gz +d7b72ba3899e4935f72368431c1b9e36 sounds-090426.tar.gz diff --git a/svxlink-080730-gcc44.patch b/svxlink-080730-gcc44.patch deleted file mode 100644 index b9a094c..0000000 --- a/svxlink-080730-gcc44.patch +++ /dev/null @@ -1,77 +0,0 @@ -diff -Naur svxlink-080730/async/audio/AsyncAudioDevice.h svxlink-080730-mod/async/audio/AsyncAudioDevice.h ---- svxlink-080730/async/audio/AsyncAudioDevice.h 2008-06-02 22:57:02.000000000 +0300 -+++ svxlink-080730-mod/async/audio/AsyncAudioDevice.h 2009-02-26 21:33:26.000000000 +0200 -@@ -37,6 +37,7 @@ - * - ****************************************************************************/ - -+#include - #include - - #include -diff -Naur svxlink-080730/async/core/AsyncSerialDevice.cpp svxlink-080730-mod/async/core/AsyncSerialDevice.cpp ---- svxlink-080730/async/core/AsyncSerialDevice.cpp 2006-11-07 22:44:20.000000000 +0200 -+++ svxlink-080730-mod/async/core/AsyncSerialDevice.cpp 2009-02-26 20:24:11.000000000 +0200 -@@ -35,6 +35,7 @@ - * - ****************************************************************************/ - -+#include - #include - #include - #include -diff -Naur svxlink-080730/async/cpp/AsyncCppDnsLookupWorker.cpp svxlink-080730-mod/async/cpp/AsyncCppDnsLookupWorker.cpp ---- svxlink-080730/async/cpp/AsyncCppDnsLookupWorker.cpp 2009-02-26 21:23:34.000000000 +0200 -+++ svxlink-080730-mod/async/cpp/AsyncCppDnsLookupWorker.cpp 2009-02-26 21:23:47.000000000 +0200 -@@ -38,6 +38,7 @@ - * - ****************************************************************************/ - -+#include - #include - #include - #include -diff -Naur svxlink-080730/async/demo/AsyncSerial_demo.cpp svxlink-080730-mod/async/demo/AsyncSerial_demo.cpp ---- svxlink-080730/async/demo/AsyncSerial_demo.cpp 2008-05-13 21:57:54.000000000 +0300 -+++ svxlink-080730-mod/async/demo/AsyncSerial_demo.cpp 2009-02-26 21:39:11.000000000 +0200 -@@ -1,3 +1,4 @@ -+#include - #include - #include - -diff -Naur svxlink-080730/echolib/EchoLinkStationData.cpp svxlink-080730-mod/echolib/EchoLinkStationData.cpp ---- svxlink-080730/echolib/EchoLinkStationData.cpp 2007-11-26 23:18:27.000000000 +0200 -+++ svxlink-080730-mod/echolib/EchoLinkStationData.cpp 2009-02-26 21:44:43.000000000 +0200 -@@ -201,7 +201,7 @@ - m_status = STAT_UNKNOWN; - } - -- char *space = strchr(end_desc, ' '); -+ char *space = strchr((char *)end_desc, ' '); - if (space != 0) - { - strncpy(str, space+1, 5); -diff -Naur svxlink-080730/svxlink/remotetrx/remotetrx.cpp svxlink-080730-mod/svxlink/remotetrx/remotetrx.cpp ---- svxlink-080730/svxlink/remotetrx/remotetrx.cpp 2008-05-13 21:57:54.000000000 +0300 -+++ svxlink-080730-mod/svxlink/remotetrx/remotetrx.cpp 2009-02-26 21:56:43.000000000 +0200 -@@ -619,7 +619,7 @@ - } - - int write_len = 0; -- char *nl = strchr(ptr, '\n'); -+ char *nl = strchr((char *)ptr, '\n'); - if (nl != 0) - { - write_len = nl-ptr+1; -diff -Naur svxlink-080730/svxlink/svxlink/svxlink.cpp svxlink-080730-mod/svxlink/svxlink/svxlink.cpp ---- svxlink-080730/svxlink/svxlink/svxlink.cpp 2008-05-13 21:57:54.000000000 +0300 -+++ svxlink-080730-mod/svxlink/svxlink/svxlink.cpp 2009-02-26 21:48:43.000000000 +0200 -@@ -609,7 +609,7 @@ - } - - int write_len = 0; -- char *nl = strchr(ptr, '\n'); -+ char *nl = strchr((char *)ptr, '\n'); - if (nl != 0) - { - write_len = nl-ptr+1; diff --git a/svxlink-080730-libs.patch b/svxlink-080730-libs.patch deleted file mode 100644 index d7144f9..0000000 --- a/svxlink-080730-libs.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- svxlink-080730/echolib/Makefile.default 2006-11-07 22:44:20.000000000 +0200 -+++ svxlink-0807300-mod/echolib/Makefile.default 2008-11-21 12:51:11.000000000 +0200 -@@ -76,7 +76,7 @@ - EchoLinkDispatcher.cpp EchoLinkStationData.cpp - - # Which libs are used by the DYNAMIC lib generated. --LIB_LIBS = -lc -lasynccore -lgsm -+LIB_LIBS = -lc -lasynccore -lgsm -lasyncaudio - - # Which STATIC libs should be included in the generated STATIC lib. - # These libs must be in the $(LIB) directory. Only the name of the diff --git a/svxlink-080730-spandsp-0.5.patch b/svxlink-080730-spandsp-0.5.patch deleted file mode 100644 index e61071b..0000000 --- a/svxlink-080730-spandsp-0.5.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- svxlink-080730-orig/svxlink/trx/SpanDtmfDecoder.cpp 2008-04-12 13:58:51.000000000 +0300 -+++ svxlink-080730/svxlink/trx/SpanDtmfDecoder.cpp 2008-08-12 08:19:48.000000000 +0300 -@@ -166,7 +166,8 @@ - } - - dtmf_rx_init(&p->rx_state, NULL, this); -- dtmf_rx_parms(&p->rx_state, FALSE, max_fwd_twist, max_rev_twist); -+//added reverse twist since spandsp > 0.0.5 (< 0 leaves unchanged) -+ dtmf_rx_parms(&p->rx_state, FALSE, max_fwd_twist, max_rev_twist, -99); - dtmf_rx_set_realtime_callback(&p->rx_state, SpanDtmfDecoder::toneReportCb, - this); - diff --git a/svxlink-080730-tcl.patch b/svxlink-080730-tcl.patch deleted file mode 100644 index 7ed4428..0000000 --- a/svxlink-080730-tcl.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- svxlink-080730-orig/create_config.sh 2008-07-30 13:15:04.000000000 +0300 -+++ svxlink-080730/create_config.sh 2008-08-12 07:49:58.000000000 +0300 -@@ -144,9 +144,15 @@ - info "${TCL_VERSION}\n" - output "TCL_LIBS=-ltcl${TCL_VERSION}" - else -+if [ -r /usr/lib64/tclConfig.sh ]; then -+ . /usr/lib64/tclConfig.sh -+ info "${TCL_VERSION}\n" -+ output "TCL_LIBS=-ltcl${TCL_VERSION}" -+else - info "no\n" - exit 1 - fi -+fi - - exit 0 - diff --git a/svxlink-080730-x86_64.patch b/svxlink-080730-x86_64.patch deleted file mode 100644 index b5c9fa5..0000000 --- a/svxlink-080730-x86_64.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- svxlink-080730/makefile.inc 2008-07-30 14:27:51.000000000 +0300 -+++ svxlink-080730-mod/makefile.inc 2008-08-20 16:21:44.000000000 +0300 -@@ -106,11 +106,11 @@ - # Compiler warnings - CWARNINGS = -Wstrict-prototypes -Wpointer-arith \ - -DNeedVarargsPrototypes -fstrength-reduce \ -- -fpcc-struct-return -fno-common -Wall -+ -fno-common -Wall - - CXXWARNINGS = -Wpointer-arith \ - -DNeedVarargsPrototypes -fstrength-reduce \ -- -fpcc-struct-return -fno-common -Wall -+ -fno-common -Wall - - - # Bash-script to find out the relative path from a given directory diff --git a/svxlink-090426-gcc44.patch b/svxlink-090426-gcc44.patch new file mode 100644 index 0000000..8837fb7 --- /dev/null +++ b/svxlink-090426-gcc44.patch @@ -0,0 +1,110 @@ +diff -Naur svxlink-090426/async/audio/AsyncAudioDecoderS16.cpp svxlink-090426-mod/async/audio/AsyncAudioDecoderS16.cpp +--- svxlink-090426/async/audio/AsyncAudioDecoderS16.cpp 2009-04-09 13:42:34.000000000 +0300 ++++ svxlink-090426-mod/async/audio/AsyncAudioDecoderS16.cpp 2009-05-09 17:41:49.000000000 +0300 +@@ -48,6 +48,7 @@ + * + ****************************************************************************/ + ++#include + #include "AsyncAudioDecoderS16.h" + + +diff -Naur svxlink-090426/async/audio/AsyncAudioDevice.h svxlink-090426-mod/async/audio/AsyncAudioDevice.h +--- svxlink-090426/async/audio/AsyncAudioDevice.h 2009-03-04 00:30:40.000000000 +0200 ++++ svxlink-090426-mod/async/audio/AsyncAudioDevice.h 2009-05-09 17:40:06.000000000 +0300 +@@ -37,6 +37,7 @@ + * + ****************************************************************************/ + ++#include + #include + + #include +diff -Naur svxlink-090426/async/audio/AsyncAudioRecorder.h svxlink-090426-mod/async/audio/AsyncAudioRecorder.h +--- svxlink-090426/async/audio/AsyncAudioRecorder.h 2009-04-26 12:17:53.000000000 +0300 ++++ svxlink-090426-mod/async/audio/AsyncAudioRecorder.h 2009-05-09 17:42:09.000000000 +0300 +@@ -34,6 +34,7 @@ + * + ****************************************************************************/ + ++#include + #include + #include + +diff -Naur svxlink-090426/async/core/AsyncSerialDevice.cpp svxlink-090426-mod/async/core/AsyncSerialDevice.cpp +--- svxlink-090426/async/core/AsyncSerialDevice.cpp 2006-11-07 22:44:20.000000000 +0200 ++++ svxlink-090426-mod/async/core/AsyncSerialDevice.cpp 2009-05-09 17:40:06.000000000 +0300 +@@ -35,6 +35,7 @@ + * + ****************************************************************************/ + ++#include + #include + #include + #include +diff -Naur svxlink-090426/async/cpp/AsyncCppDnsLookupWorker.cpp svxlink-090426-mod/async/cpp/AsyncCppDnsLookupWorker.cpp +--- svxlink-090426/async/cpp/AsyncCppDnsLookupWorker.cpp 2009-04-26 12:17:53.000000000 +0300 ++++ svxlink-090426-mod/async/cpp/AsyncCppDnsLookupWorker.cpp 2009-05-09 17:40:06.000000000 +0300 +@@ -38,6 +38,7 @@ + * + ****************************************************************************/ + ++#include + #include + #include + #include +diff -Naur svxlink-090426/async/demo/AsyncSerial_demo.cpp svxlink-090426-mod/async/demo/AsyncSerial_demo.cpp +--- svxlink-090426/async/demo/AsyncSerial_demo.cpp 2008-05-13 21:57:54.000000000 +0300 ++++ svxlink-090426-mod/async/demo/AsyncSerial_demo.cpp 2009-05-09 17:40:06.000000000 +0300 +@@ -1,3 +1,4 @@ ++#include + #include + #include + +diff -Naur svxlink-090426/echolib/EchoLinkStationData.cpp svxlink-090426-mod/echolib/EchoLinkStationData.cpp +--- svxlink-090426/echolib/EchoLinkStationData.cpp 2007-11-26 23:18:27.000000000 +0200 ++++ svxlink-090426-mod/echolib/EchoLinkStationData.cpp 2009-05-09 17:40:06.000000000 +0300 +@@ -201,7 +201,7 @@ + m_status = STAT_UNKNOWN; + } + +- char *space = strchr(end_desc, ' '); ++ char *space = strchr((char *)end_desc, ' '); + if (space != 0) + { + strncpy(str, space+1, 5); +diff -Naur svxlink-090426/svxlink/remotetrx/remotetrx.cpp svxlink-090426-mod/svxlink/remotetrx/remotetrx.cpp +--- svxlink-090426/svxlink/remotetrx/remotetrx.cpp 2009-04-26 12:17:53.000000000 +0300 ++++ svxlink-090426-mod/svxlink/remotetrx/remotetrx.cpp 2009-05-09 17:40:06.000000000 +0300 +@@ -678,7 +678,7 @@ + } + + int write_len = 0; +- char *nl = strchr(ptr, '\n'); ++ char *nl = strchr((char *)ptr, '\n'); + if (nl != 0) + { + write_len = nl-ptr+1; +diff -Naur svxlink-090426/svxlink/svxlink/MsgHandler.cpp svxlink-090426-mod/svxlink/svxlink/MsgHandler.cpp +--- svxlink-090426/svxlink/svxlink/MsgHandler.cpp 2009-02-08 14:56:13.000000000 +0200 ++++ svxlink-090426-mod/svxlink/svxlink/MsgHandler.cpp 2009-05-09 17:43:36.000000000 +0300 +@@ -34,6 +34,7 @@ + * + ****************************************************************************/ + ++#include + #include + #include + #include +diff -Naur svxlink-090426/svxlink/svxlink/svxlink.cpp svxlink-090426-mod/svxlink/svxlink/svxlink.cpp +--- svxlink-090426/svxlink/svxlink/svxlink.cpp 2009-04-26 12:17:53.000000000 +0300 ++++ svxlink-090426-mod/svxlink/svxlink/svxlink.cpp 2009-05-09 17:40:06.000000000 +0300 +@@ -661,7 +661,7 @@ + } + + int write_len = 0; +- char *nl = strchr(ptr, '\n'); ++ char *nl = strchr((char *)ptr, '\n'); + if (nl != 0) + { + write_len = nl-ptr+1; diff --git a/svxlink.spec b/svxlink.spec index b0a6cba..56bcfb7 100644 --- a/svxlink.spec +++ b/svxlink.spec @@ -1,7 +1,7 @@ -%define main_version 080730 +%define main_version 090426 Name: svxlink Version: %{main_version} -Release: 8%{?dist} +Release: 1%{?dist} Summary: Repeater controller and EchoLink (simplex or repeater) Group: Applications/Internet @@ -11,17 +11,12 @@ License: GPLv2 and GPLv2+ URL: http://svxlink.sourceforge.net Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz Source1: http://downloads.sourceforge.net/%{name}/sounds-%{version}.tar.gz -Patch0: svxlink-080730-tcl.patch -Patch1: svxlink-080730-spandsp-0.5.patch -Patch2: svxlink-080730-x86_64.patch -#aparently echolib is not correctly linked against libasync -Patch3: svxlink-080730-libs.patch -Patch4: svxlink-080730-gcc44.patch +Patch0: svxlink-%{main_version}-gcc44.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libsigc++-devel, libmng-devel, tcl-devel, qt3-devel, gsm-devel BuildRequires: spandsp-devel, libXi-devel, libtiff-devel, popt-devel -BuildRequires: doxygen, desktop-file-utils +BuildRequires: doxygen, desktop-file-utils libgcrypt-devel Requires (preun): chkconfig Requires (preun): initscripts Requires (post): chkconfig @@ -35,16 +30,30 @@ Also, the SvxLink server can act as a repeater controller. %package -n libasync Summary: Svxlink async libs Group: Development/Libraries -Version: 0.16.1 +Version: 0.17.0 %description -n libasync -The Async library files. +The Async library is a programming framework that is used to write event driven +applications. It provides abstractions for file descriptor watches, timers, +network communications, serial port communications and config file reading. + +Async is written in such a way that it can support other frameworks. Right now +there are two basic frameworks, a simple "select" based implementation and a Qt +implementation. The idea is that advanced libraries can be implemented in such +a way that they only depend on Async. That means that these libraries can be +used in both Qt and pure console applications and in any future frameworks +supported by Async (e.g. Gtk, wxWidgets etc). + +Another big part of Async is the audio pipe framework. It is an audio handling +framework that is geared towards single channel (mono) audio applications. The +framework consists of a large number of audio handling classes such as +audio i/o, filtering, mixing, audio codecs etc. %package -n libasync-devel Summary: Svxlink async development files Group: Development/Libraries -Version: 0.16.1 -Requires: libasync = 0.16.1 +Version: 0.17.0 +Requires: libasync = 0.17.0 %description -n libasync-devel The async library development files @@ -52,16 +61,19 @@ The async library development files %package -n echolib Summary: EchoLink communications library Group: Development/Libraries -Version: 0.13.0 +Version: 0.13.1 %description -n echolib -EchoLink communications library +EchoLib is a library that is used as a base for writing EchoLink applications. +It implements the directory server protocol as well as the station to station +protocol. EchoLink is used to link ham radio stations together over the +Internet. %package -n echolib-devel Summary: Development files for the EchoLink communications library Group: Development/Libraries -Version: 0.13.0 -Requires: echolib = 0.13.0 +Version: 0.13.1 +Requires: echolib = 0.13.1 %description -n echolib-devel Development files for the EchoLink communications library @@ -69,7 +81,7 @@ Development files for the EchoLink communications library %package -n qtel Summary: The Qt EchoLink Client Group: Applications/Communications -Version: 0.11.1 +Version: 0.11.2 %description -n qtel This package contains Qtel, the Qt EchoLink client. It is an implementation of @@ -79,7 +91,7 @@ you want, install the svxlink-server package. %package -n svxlink-server Summary: SvxLink - A general purpose voice services system -Version: 0.10.1 +Version: 0.11.1 Group: Applications/Communications Requires: udev Requires (pre): shadow-utils @@ -88,28 +100,17 @@ Requires (pre): shadow-utils The SvxLink server is a general purpose voice services system for ham radio use. Each voice service is implemented as a plugin called a module. Some examples of voice services are: Help system, Simplex repeater, -EchoLink connection. +EchoLink communications and voice mail. The core of the system handle the radio interface and is quite flexible -as well. It can act both as a simplex node and as a repeater controller. - -%package -n svxlink-server-devel -Summary: SvxLink - A general purpose voice services system -Summary: Development files for the SvxLink server -Version: 0.10.1 -Group: Applications/Communications - -%description -n svxlink-server-devel -Development files for the SvxLink server +as well. It can act both as a simplex node and as a repeater controller. It is +also possible to link multiple receivers in via TCP/IP. The best receiver is +chosen using a software voter. %prep %setup -q -n %{name}-%{main_version} %setup -q -D -T -a 1 -n %{name}-%{main_version} -%patch0 -p1 -b .tcl -%patch1 -p1 -b .spandsp -%patch2 -p1 -b .x86_64 -%patch3 -p1 -b .libs -%patch4 -p1 -b .gcc44 +%patch0 -p1 -b .gcc44 #sed -i -e "s/.SILENT://g" Makefile #sed -i -e "s/.SILENT://g" makefile.sub #make realclean @@ -217,7 +218,6 @@ rm -rf %{buildroot} %defattr(-,root,root,-) %doc svxlink/ChangeLog %{_bindir}/svxlink -%{_bindir}/dtmf_plot %{_bindir}/remotetrx %{_bindir}/siglevdetcal %dir %{_libdir}/svxlink @@ -244,12 +244,15 @@ rm -rf %{buildroot} %defattr(644,root,root) %ghost /var/log/* -%files -n svxlink-server-devel -%defattr(-,root,root,-) -%doc svxlink/ChangeLog -%{_includedir}/svxlink - %changelog +* Tue Apr 28 2009 Lucian Langa - 090426-1 +- update BR +- drop svxlink-devel package +- updated descriptions +- remove dtmf_plot +- drop patch0,1,2,3 as were fixed upstream +- new upstream release + * Thu Feb 26 2009 Lucian Langa - 080730-8 - patch to fix gcc44 issues