[svxlink] new upstream release

Mon Nov 21 19:42:17 UTC 2011

commit 87d89b669bb57d6e552b4a6e3209d2f95ce9978d
Author: Lucian Langa <lucilanga at gnome.org>
Date:   Mon Nov 21 20:42:13 2011 +0100

    new upstream release

 .gitignore                       |    2 +
 sources                          |    4 +-
 svxlink-090426-gcc44.patch       |  110 --------------------------------------
 svxlink-090426-implicitdso.patch |   91 -------------------------------
 svxlink.spec                     |   55 ++++++++++---------
 5 files changed, 34 insertions(+), 228 deletions(-)
---

diff --git a/.gitignore b/.gitignore
index ee1a953..36c8aff 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,4 @@
 svxlink-090426.tar.gz
 sounds-090426.tar.gz
+/svxlink-11.11.tar.gz
+/sounds-en_US-heather-11.11.tar.bz2
diff --git a/sources b/sources
index 5642b2d..6b5aab7 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-98c2f1afdaac19961f89aca0d9bc72b8  svxlink-090426.tar.gz
-d7b72ba3899e4935f72368431c1b9e36  sounds-090426.tar.gz
+45b056c743aba4c680bef183eea7660a  svxlink-11.11.tar.gz
+771cf2a46bd41b9b2522ed41a1a96cd7  sounds-en_US-heather-11.11.tar.bz2
diff --git a/svxlink.spec b/svxlink.spec
index 3564ed3..383b2bc 100644
--- a/svxlink.spec
+++ b/svxlink.spec
@@ -1,7 +1,7 @@
-%define main_version 090426
+%define main_version 11.11
 Name:		svxlink
 Version:	%{main_version}
-Release:	6%{?dist}
+Release:	1%{?dist}
 Summary:	Repeater controller and EchoLink (simplex or repeater)
 
 Group:		Applications/Internet
@@ -10,13 +10,11 @@ Group:		Applications/Internet
 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-%{main_version}-gcc44.patch
-Patch1:		svxlink-%{main_version}-implicitdso.patch
+Source1:	http://downloads.sourceforge.net/%{name}/sounds-en_US-heather-%{version}.tar.bz2
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:	libsigc++-devel, libmng-devel, tcl-devel, qt3-devel, gsm-devel
-BuildRequires:	libXi-devel, popt-devel, speex-devel
+BuildRequires:	libsigc++-devel, libmng-devel, tcl-devel, qt-devel, gsm-devel
+BuildRequires:	libXi-devel, popt-devel, speex-devel, alsa-lib-devel
 BuildRequires:	doxygen, desktop-file-utils, libgcrypt-devel
 Requires (preun): chkconfig
 Requires (preun): initscripts
@@ -31,7 +29,7 @@ Also, the SvxLink server can act as a repeater controller.
 %package -n libasync
 Summary: Svxlink async libs
 Group: Development/Libraries
-Version: 0.17.0
+Version: 0.18.1
 
 %description -n libasync
 The Async library is a programming framework that is used to write event driven
@@ -53,8 +51,8 @@ audio i/o, filtering, mixing, audio codecs etc.
 %package -n libasync-devel
 Summary: Svxlink async development files
 Group: Development/Libraries
-Version: 0.17.0
-Requires: libasync = 0.17.0
+Version: 0.18.1
+Requires: libasync = 0.18.1
 Obsoletes:	svxlink-server-devel < 0.11.1-2
 
 %description -n libasync-devel
@@ -63,7 +61,7 @@ The async library development files
 %package -n echolib
 Summary: EchoLink communications library
 Group: Development/Libraries
-Version: 0.13.1
+Version: 0.14.1
 
 %description -n echolib
 EchoLib is a library that is used as a base for writing EchoLink applications.
@@ -74,8 +72,8 @@ Internet.
 %package -n echolib-devel
 Summary: Development files for the EchoLink communications library
 Group: Development/Libraries
-Version: 0.13.1
-Requires: echolib = 0.13.1
+Version: 0.14.1
+Requires: echolib = 0.14.1
 Obsoletes:	svxlink-server-devel < 0.11.1-2
 
 %description -n echolib-devel
@@ -84,7 +82,7 @@ Development files for the EchoLink communications library
 %package -n qtel
 Summary: The Qt EchoLink Client
 Group: Applications/Communications
-Version: 0.11.2
+Version: 0.12.0
 
 %description -n qtel
 This package contains Qtel, the Qt EchoLink client. It is an implementation of
@@ -94,7 +92,7 @@ you want, install the svxlink-server package.
 
 %package -n svxlink-server
 Summary: SvxLink - A general purpose voice services system
-Version: 0.11.1
+Version: 0.13.0
 Group: Applications/Communications
 Requires: udev
 Requires (pre): shadow-utils
@@ -113,8 +111,6 @@ 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 .gcc44
-%patch1 -p1 -b .implicitdso
 #enable for verbose building
 #sed -i -e "s/.SILENT://g" Makefile
 #sed -i -e "s/.SILENT://g" makefile.sub
@@ -130,11 +126,11 @@ doxygen doxygen.echolib
 
 %install
 rm -rf %{buildroot}
-make INSTALL_ROOT=$RPM_BUILD_ROOT NO_CHOWN=1 LIB_INSTALL_DIR=%{_libdir} \
+make DESTDIR=%{buildroot} NO_CHOWN=1 LIB_INSTALL_DIR=%{_libdir} \
 	INC_INSTALL_DIR=%{_includedir}/svxlink BIN_INSTALL_DIR=%{_bindir} \
 	SBIN_INSTALL_DIR=%{_sbindir} PLUGIN_INSTALL_DIR=%{_libdir}/svxlink install
 mkdir -p %{buildroot}%{_datadir}/svxlink
-cp -a sounds %{buildroot}%{_datadir}/svxlink/
+cp -a en_US-heather %{buildroot}%{_datadir}/svxlink/
 mkdir -p %{buildroot}%{_localstatedir}/log
 touch %{buildroot}%{_localstatedir}/log/svxlink
 touch %{buildroot}%{_localstatedir}/log/svxlink.{1,2,3,4}
@@ -146,6 +142,7 @@ sed -i -e "s/subsys\/\$PROG/subsys\/remotetrx/g" %{buildroot}%{_sysconfdir}/init
 #remove static libs
 rm -f %{buildroot}%{_libdir}/libasync*.a
 rm -f %{buildroot}%{_libdir}/libecholib.a
+rm -f %{buildroot}%{_libdir}/liblocationinfo.a
 rm -f %{buildroot}%{_libdir}/libtrx.a
 
 %post -n libasync -p /sbin/ldconfig
@@ -194,6 +191,7 @@ rm -rf %{buildroot}
 %{_libdir}/libasynccpp.so
 %{_libdir}/libasyncqt.so
 %dir %{_includedir}/svxlink
+%{_includedir}/svxlink/common.h
 %{_includedir}/svxlink/Async*
 %{_includedir}/svxlink/SigCAudio*.h
 
@@ -227,14 +225,16 @@ rm -rf %{buildroot}
 %{_bindir}/siglevdetcal
 %dir %{_libdir}/svxlink
 %{_libdir}/svxlink/Module*.so
-%dir %{_sysconfdir}/svxlink.d
+%dir %{_sysconfdir}/%{name}/svxlink.d
 %{_datadir}/svxlink
 %defattr(644,root,root)
-%config(noreplace) %{_sysconfdir}/svxlink.conf
-%config(noreplace) %{_sysconfdir}/svxlink.d/*
-%config(noreplace) %{_sysconfdir}/TclVoiceMail.conf
+%config(noreplace) %{_sysconfdir}/%{name}/svxlink.conf
+%config(noreplace) %{_sysconfdir}/%{name}/.procmailrc
+%config(noreplace) %{_sysconfdir}/%{name}/svxlink.d/*
+%config(noreplace) %{_sysconfdir}/%{name}/TclVoiceMail.conf
 %config(noreplace) %{_sysconfdir}/logrotate.d/svxlink-server
-%config(noreplace) %{_sysconfdir}/remotetrx.conf
+%config(noreplace) %{_sysconfdir}/logrotate.d/remotetrx
+%config(noreplace) %{_sysconfdir}/%{name}/remotetrx.conf
 %config(noreplace) %{_sysconfdir}/sysconfig/svxlink
 %config(noreplace) %{_sysconfdir}/sysconfig/remotetrx
 %config(noreplace) %{_sysconfdir}/security/console.perms.d/90-svxlink.perms
@@ -243,13 +243,18 @@ rm -rf %{buildroot}
 %attr(755,svxlink,daemon) %dir %{_localstatedir}/spool/svxlink
 %attr(755,svxlink,daemon) %dir %{_localstatedir}/spool/svxlink/voice_mail
 %defattr(755,root,root)
-%{_datadir}/svxlink/event_test.tcl
 %{_sysconfdir}/init.d/svxlink
 %{_sysconfdir}/init.d/remotetrx
 %defattr(644,root,root)
 %ghost /var/log/*
 
 %changelog
+* Mon Nov 21 2011 Lucian Langa <cooly at gnome.eu.org> - 11.11-1
+- update versions
+- update BR
+- drop all patches - fixed upstream
+- new upstream release
+
 * Wed Feb 09 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 090426-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 
