commit capisuite

Hello community, here is the log from the commit of package capisuite checked in at Mon Oct 2 14:56:37 CEST 2006. -------- --- capisuite/capisuite.changes 2006-01-25 21:34:51.000000000 +0100 +++ /mounts/work_src_done/STABLE/capisuite/capisuite.changes 2006-10-02 12:31:15.000000000 +0200 @@ -1,0 +2,6 @@ +Mon Oct 2 12:30:34 CEST 2006 - kkeil@suse.de + +- fixes for python 2.5 +- small cleanups, compile with RPM_OPT_FLAFGS + +------------------------------------------------------------------- New: ---- capisuite-0.4.5-python-v2.5.diff capisuite-0.4.5-warnings.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ capisuite.spec ++++++ --- /var/tmp/diff_new_pack.0aol79/_old 2006-10-02 14:56:09.000000000 +0200 +++ /var/tmp/diff_new_pack.0aol79/_new 2006-10-02 14:56:09.000000000 +0200 @@ -1,40 +1,40 @@ # # spec file for package capisuite (Version 0.4.5) # -# Copyright (c) 2005 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine # package are under the same license as the package itself. # -# Please submit bugfixes or comments via http://www.suse.de/feedback/ +# Please submit bugfixes or comments via http://bugs.opensuse.org/ # # norootforbuild Name: capisuite -BuildRequires: gcc-c++ libtiff-devel libxml2-devel python-devel sfftobmp capi4linux +BuildRequires: capi4linux gcc-c++ libtiff-devel libxml2-devel python-devel sfftobmp License: GPL Group: Hardware/ISDN Autoreqprov: on Version: 0.4.5 -Release: 6 +Release: 25 %define pyver %(python -c 'import sys; print sys.version[:3]') Requires: sfftobmp sox tiff ghostscript-library python >= %pyver, python < %{pyver}.99 -Summary: ISDN telecommunication suite providing fax and voice services +Summary: ISDN Telecommunication Suite Providing Fax and Voice Services Source0: capisuite-%{version}.tar.bz2 Patch0: capisuite-%{version}-capi4linux_v3.diff +Patch1: capisuite-%{version}-python-v2.5.diff +Patch2: capisuite-%{version}-warnings.diff URL: http://www.capisuite.de BuildRoot: %{_tmppath}/%{name}-%{version}-build PreReq: %insserv_prereq %description CapiSuite is an ISDN telecommunication suite providing easy to use -telecommunication functions which can be controlled from Python -scripts. +telecommunication functions that can be controlled from Python scripts. +It uses a CAPI-compatible driver for accessing the ISDN hardware, so +requires an AVM card with the appropriate driver. -It uses a CAPI-compatible driver for accessing the ISDN-hardware, so -you'll need an AVM card with the according driver. - -CapiSuite is distributed with two example scripts for call incoming +CapiSuite is distributed with two example scripts for incoming call handling and fax sending. See /usr/share/doc/packages/capisuite for further information. @@ -45,15 +45,17 @@ Gernot Hillier %prep -%setup +%setup -q %patch0 -p1 +%patch1 -p1 +%patch2 -p1 aclocal autoheader autoconf ./configure --prefix=/usr --mandir=%{_mandir} --sysconfdir=/etc --localstatedir=/var --with-docdir=%{_defaultdocdir}/capisuite %build -make +make CFLAGS="$RPM_OPT_FLAGS" CXXFLAGS="$RPM_OPT_FLAGS" %install make DESTDIR=$RPM_BUILD_ROOT install @@ -99,6 +101,9 @@ %doc %{_mandir}/man8/capisuite.8.gz %changelog -n capisuite +* Mon Oct 02 2006 - kkeil@suse.de +- fixes for python 2.5 +- small cleanups, compile with RPM_OPT_FLAFGS * Wed Jan 25 2006 - mls@suse.de - converted neededforbuild to BuildRequires * Thu Jun 02 2005 - ro@suse.de ++++++ capisuite-0.4.5-python-v2.5.diff ++++++ Index: capisuite-0.4.5/src/application/pythonscript.cpp =================================================================== --- capisuite-0.4.5.orig/src/application/pythonscript.cpp +++ capisuite-0.4.5/src/application/pythonscript.cpp @@ -99,14 +99,14 @@ PythonScript::run() throw (ApplicationEr if ( !(py_traceback=cStringIO->cgetvalue(catch_stderr)) ) throw ApplicationError("unable to get traceback","PythonScript::run()"); - int length; + Py_ssize_t length; char *traceback; if (PyString_AsStringAndSize(py_traceback, &traceback, &length)) throw ApplicationError("unable to convert traceback to char*","PythonScript::run()"); error << prefix() << "A python error occured. See traceback below." << endl; error << prefix(false) << "Python traceback: "; - for (int i=0;i(arg); instance->run(); pthread_cleanup_pop(1); // run the cleanup_handler and then deregister it + return NULL; } void idlescript_cleanup_handler(void* arg) Index: capisuite-0.4.5/src/application/incomingscript.cpp =================================================================== --- capisuite-0.4.5.orig/src/application/incomingscript.cpp +++ capisuite-0.4.5/src/application/incomingscript.cpp @@ -31,6 +31,7 @@ void* incomingscript_exec_handler(void* IncomingScript *instance=static_cast(arg); instance->run(); pthread_cleanup_pop(1); // run the cleanup_handler and then deregister it + return NULL; } void incomingscript_cleanup_handler(void* arg) Index: capisuite-0.4.5/src/backend/capi.cpp =================================================================== --- capisuite-0.4.5.orig/src/backend/capi.cpp +++ capisuite-0.4.5/src/backend/capi.cpp @@ -30,6 +30,7 @@ void* capi_exec_handler(void* arg) Capi *instance=static_cast(arg); instance->run(); + return NULL; } Capi::Capi (ostream& debug, unsigned short debug_level, ostream &error, unsigned short DDILength, unsigned short DDIBaseLength, vector<string> DDIStopNumbers, unsigned maxLogicalConnection, unsigned maxBDataBlocks,unsigned maxBDataLen) throw (CapiError, CapiMsgError) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org