rpms/svxlink/F-10 svxlink-090426-gcc44.patch, NONE, 1.1 svxlink.spec, 1.1, 1.2

Sat May 9 21:49:25 UTC 2009

Author: lucilanga

Update of /cvs/pkgs/rpms/svxlink/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2636

Modified Files:
	svxlink.spec 
Added Files:
	svxlink-090426-gcc44.patch 
Log Message:
* Tue Apr 28 2009 Lucian Langa <cooly at gnome.eu.org> - 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

svxlink-090426-gcc44.patch:

--- NEW FILE svxlink-090426-gcc44.patch ---
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 <stdint.h>
 #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 <stdint.h>
 #include <sigc++/sigc++.h>
 
 #include <string>
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 <stdint.h>
 #include <stdio.h>
 #include <sigc++/sigc++.h>
 
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 <stdio.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
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 <stdio.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
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 <stdio.h>
 #include <iostream>
 #include <cstdlib>
 
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 <stdint.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
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;


Index: svxlink.spec
===================================================================
RCS file: /cvs/pkgs/rpms/svxlink/F-10/svxlink.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- svxlink.spec	8 Dec 2008 06:21:56 -0000	1.1
+++ svxlink.spec	9 May 2009 21:48:55 -0000	1.2
@@ -1,7 +1,7 @@
-%define main_version 080730
+%define main_version 090426
 Name:		svxlink
 Version:	%{main_version}
-Release:	6%{?dist}
+Release:	1%{?dist}
 Summary:	Repeater controller and EchoLink (simplex or repeater)
 
 Group:		Applications/Internet
@@ -11,16 +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
+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:	libXi-devel, popt-devel, speex-devel
+BuildRequires:	doxygen, desktop-file-utils, libgcrypt-devel
 Requires (preun): chkconfig
 Requires (preun): initscripts
 Requires (post): chkconfig
@@ -34,16 +30,30 @@ Also, the SvxLink server can act as a re
 %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
@@ -51,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
@@ -68,7 +81,7 @@ Development files for the EchoLink commu
 %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
@@ -78,7 +91,7 @@ you want, install the svxlink-server pac
 
 %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
@@ -87,27 +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
+%patch0 -p1 -b .gcc44
 #sed -i -e "s/.SILENT://g" Makefile
 #sed -i -e "s/.SILENT://g" makefile.sub
 #make realclean
@@ -215,7 +218,6 @@ rm -rf %{buildroot}
 %defattr(-,root,root,-)
 %doc svxlink/ChangeLog
 %{_bindir}/svxlink
-%{_bindir}/dtmf_plot
 %{_bindir}/remotetrx
 %{_bindir}/siglevdetcal
 %dir %{_libdir}/svxlink
@@ -242,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 <cooly at gnome.eu.org> - 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
+
 * Sun Dec 07 2008 Lucian Langa <cooly at gnome.eu.org> - 080730-6
 - added udev dependency
 - fixed libs permissions


