Hello community, here is the log from the commit of package python-gammu checked in at Fri Nov 9 00:42:13 CET 2007. -------- --- python-gammu/python-gammu.changes 2007-09-25 12:22:26.000000000 +0200 +++ /mounts/work_src_done/STABLE/python-gammu/python-gammu.changes 2007-11-08 10:58:18.000000000 +0100 @@ -1,0 +2,6 @@ +Thu Nov 8 10:58:03 CET 2007 - prusnak@suse.cz + +- update to 0.23 + * compatibility with current gammu + +------------------------------------------------------------------- Old: ---- python-gammu-0.22.tar.bz2 New: ---- python-gammu-0.23.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-gammu.spec ++++++ --- /var/tmp/diff_new_pack.ns9843/_old 2007-11-09 00:40:07.000000000 +0100 +++ /var/tmp/diff_new_pack.ns9843/_new 2007-11-09 00:40:07.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package python-gammu (Version 0.22) +# spec file for package python-gammu (Version 0.23) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -11,9 +11,9 @@ # norootforbuild Name: python-gammu -BuildRequires: gammu-devel >= 1.11.91 +BuildRequires: gammu-devel >= 1.13.97 BuildRequires: python-devel -Version: 0.22 +Version: 0.23 Release: 1 Requires: python-gammu python-wxGTK AutoReqProv: on @@ -52,6 +52,9 @@ %defattr(-,root,root) %doc AUTHORS COPYING README NEWS examples %changelog +* Thu Nov 08 2007 - prusnak@suse.cz +- update to 0.23 + * compatibility with current gammu * Tue Sep 25 2007 - prusnak@suse.cz - update to 0.22 * complete support for managing calls ++++++ python-gammu-0.22.tar.bz2 -> python-gammu-0.23.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/python-gammu-0.22/convertors/backup.c new/python-gammu-0.23/convertors/backup.c --- old/python-gammu-0.22/convertors/backup.c 2007-05-29 14:35:55.000000000 +0200 +++ new/python-gammu-0.23/convertors/backup.c 2007-10-18 10:20:25.000000000 +0200 @@ -188,3 +188,29 @@ return 1; } + +int BackupFormatFromString(const char *s, GSM_BackupFormat *format) { + if (strcmp(s, "LMB") == 0) { + *format = GSM_Backup_LMB; + } else if (strcmp(s, "VCalendar") == 0) { + *format = GSM_Backup_VCalendar; + } else if (strcmp(s,"VCard") == 0) { + *format = GSM_Backup_VCard; + } else if (strcmp(s,"LDIF") == 0) { + *format = GSM_Backup_LDIF; + } else if (strcmp(s,"ICS") == 0) { + *format = GSM_Backup_ICS; + } else if (strcmp(s,"Gammu") == 0) { + *format = GSM_Backup_Gammu; + } else if (strcmp(s,"GammuUCS2") == 0) { + *format = GSM_Backup_GammuUCS2; + } else if (strcmp(s,"Auto") == 0) { + *format = GSM_Backup_Auto; + } else if (strcmp(s,"AutoUnicode") == 0) { + *format = GSM_Backup_AutoUnicode; + } else { + PyErr_Format(PyExc_ValueError, "Bad value for format: '%s'", s); + return 0; + } + return 1; +} diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/python-gammu-0.22/convertors/sms.c new/python-gammu-0.23/convertors/sms.c --- old/python-gammu-0.22/convertors/sms.c 2007-05-29 14:35:55.000000000 +0200 +++ new/python-gammu-0.23/convertors/sms.c 2007-10-31 07:55:24.000000000 +0100 @@ -1919,13 +1919,3 @@ return 1; } - -void FreeSMSBackup(GSM_SMS_Backup *sms) { - int i = 0; - - while (sms->SMS[i] != NULL) { - free(sms->SMS[i]); - sms->SMS[i] = NULL; - i++; - } -} diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/python-gammu-0.22/convertors.h new/python-gammu-0.23/convertors.h --- old/python-gammu-0.22/convertors.h 2007-07-16 15:49:02.000000000 +0200 +++ new/python-gammu-0.23/convertors.h 2007-10-31 07:55:24.000000000 +0100 @@ -262,11 +262,6 @@ int SMSBackupFromPython(PyObject *list, GSM_SMS_Backup *sms); /** - * Frees SMS Backup. - */ -void FreeSMSBackup(GSM_SMS_Backup *sms); - -/** * Converts Todo to Python object. */ PyObject *TodoToPython(const GSM_ToDoEntry *entry); @@ -352,6 +347,11 @@ int BackupFromPython(PyObject *dict, GSM_Backup *backup); /** + * Converts backup format from string to Gammu. + */ +int BackupFormatFromString(const char *s, GSM_BackupFormat *format); + +/** * Converts file to Python object. */ PyObject *FileToPython(GSM_File *file); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/python-gammu-0.22/errors.c new/python-gammu-0.23/errors.c --- old/python-gammu-0.22/errors.c 2007-08-07 06:33:08.000000000 +0200 +++ new/python-gammu-0.23/errors.c 2007-11-01 03:21:53.000000000 +0100 @@ -76,6 +76,12 @@ PyObject *PyERR_FOLDERNOTEMPTY; PyObject *PyERR_DATACONVERTED; PyObject *PyERR_UNCONFIGURED; +PyObject *PyERR_WRONGFOLDER; +PyObject *PyERR_PHONE_INTERNAL; +PyObject *PyERR_WRITING_FILE; +PyObject *PyERR_NONE_SECTION; +PyObject *PyERR_USING_DEFAULTS; +PyObject *PyERR_LAST_VALUE; int checkError(GSM_StateMachine *s, GSM_Error error, char *where) { PyObject *val; @@ -138,6 +144,12 @@ case ERR_FOLDERNOTEMPTY: err = PyERR_FOLDERNOTEMPTY; break; case ERR_DATACONVERTED: err = PyERR_DATACONVERTED; break; case ERR_UNCONFIGURED: err = PyERR_UNCONFIGURED; break; + case ERR_WRONGFOLDER: err = PyERR_WRONGFOLDER; break; + case ERR_PHONE_INTERNAL: err = PyERR_PHONE_INTERNAL; break; + case ERR_WRITING_FILE: err = PyERR_WRITING_FILE; break; + case ERR_NONE_SECTION: err = PyERR_NONE_SECTION; break; + case ERR_USING_DEFAULTS: err = PyERR_USING_DEFAULTS; break; + case ERR_LAST_VALUE: err = PyERR_LAST_VALUE; break; } msg = GSM_ErrorString(error); @@ -276,6 +288,12 @@ CREATE_ERROR(ERR_FOLDERNOTEMPTY) CREATE_ERROR(ERR_DATACONVERTED) CREATE_ERROR(ERR_UNCONFIGURED) + CREATE_ERROR(ERR_WRONGFOLDER) + CREATE_ERROR(ERR_PHONE_INTERNAL) + CREATE_ERROR(ERR_WRITING_FILE) + CREATE_ERROR(ERR_NONE_SECTION) + CREATE_ERROR(ERR_USING_DEFAULTS) + CREATE_ERROR(ERR_LAST_VALUE) PyDict_SetItemString(d, "Errors", error_list); Py_DECREF(error_list); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/python-gammu-0.22/examples/addfile.py new/python-gammu-0.23/examples/addfile.py --- old/python-gammu-0.22/examples/addfile.py 1970-01-01 01:00:00.000000000 +0100 +++ new/python-gammu-0.23/examples/addfile.py 2007-10-12 08:34:01.000000000 +0200 @@ -0,0 +1,37 @@ +#!/usr/bin/env python + +import gammu +import os +import datetime +import sys + +if len(sys.argv) != 3: + print 'This requires two parameters: file to upload and path!' + sys.exit(1) + +f = open(sys.argv[1] ,'r') +data = f.read() + +sm = gammu.StateMachine() +sm.ReadConfig() +sm.Init() + +# Check AddFilePart +print "\n\nExpection: Put cgi.jpg onto Memorycard on phone" +file_f = { +"ID_FullName": sys.argv[2], +"Name": os.path.basename(sys.argv[1]), +"Buffer": data, +"Protected": 0, +"ReadOnly": 0, +"Hidden": 0, +"System": 0, +'Finished': 0, +'Folder': 0, +'Level': 0, +'Type': 'Other', +"Pos": 0, +} +while (not file_f['Finished']): + file_f = sm.AddFilePart(file_f) + diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/python-gammu-0.22/gammu.c new/python-gammu-0.23/gammu.c --- old/python-gammu-0.22/gammu.c 2007-08-01 15:06:31.000000000 +0200 +++ new/python-gammu-0.23/gammu.c 2007-11-08 05:05:59.000000000 +0100 @@ -317,8 +317,8 @@ if (sm->IncomingCallQueue[0] != NULL) { event = CallToPython(sm->IncomingCallQueue[0]); if (event == NULL) { - PyErr_Clear(); - pyg_error("Discarding incoming event due to conversion error!\n"); + pyg_error("Discarding incoming call event due to conversion error!\n"); + PyErr_WriteUnraisable((PyObject *)sm); return; } @@ -335,8 +335,8 @@ } while (sm->IncomingCallQueue[i] != NULL && i < MAX_EVENTS); if (arglist == NULL) { - PyErr_Clear(); - pyg_error("Discarding incoming event due to conversion error!\n"); + pyg_error("Discarding incoming call event due to error while building params!\n"); + PyErr_WriteUnraisable((PyObject *)sm); return; } @@ -357,8 +357,8 @@ } else { event = SMSToPython(sm->IncomingSMSQueue[0]); if (event == NULL) { - PyErr_Clear(); - pyg_error("Discarding incoming event due to conversion error!\n"); + pyg_error("Discarding incoming SMS event due to conversion error!\n"); + PyErr_WriteUnraisable((PyObject *)sm); return; } } @@ -375,8 +375,8 @@ arglist = Py_BuildValue("(OsO)", sm, "SMS", event); Py_DECREF(event); if (arglist == NULL) { - PyErr_Clear(); - pyg_error("Discarding incoming event due to conversion error!\n"); + pyg_error("Discarding incoming SMS event due to error while building params!\n"); + PyErr_WriteUnraisable((PyObject *)sm); return; } @@ -388,8 +388,8 @@ if (sm->IncomingCBQueue[0] != NULL) { event = CBToPython(sm->IncomingCBQueue[0]); if (event == NULL) { - PyErr_Clear(); - pyg_error("Discarding incoming event due to conversion error!\n"); + pyg_error("Discarding incoming CB event due to conversion error!\n"); + PyErr_WriteUnraisable((PyObject *)sm); return; } @@ -406,8 +406,8 @@ } while (sm->IncomingCBQueue[i] != NULL && i < MAX_EVENTS); if (arglist == NULL) { - PyErr_Clear(); - pyg_error("Discarding incoming event due to conversion error!\n"); + pyg_error("Discarding incoming CB event due to error while building params!\n"); + PyErr_WriteUnraisable((PyObject *)sm); return; } @@ -419,8 +419,8 @@ if (sm->IncomingUSSDQueue[0] != NULL) { event = USSDToPython(sm->IncomingUSSDQueue[0]); if (event == NULL) { - PyErr_Clear(); - pyg_error("Discarding incoming event due to conversion error!\n"); + pyg_error("Discarding incoming USSD event due to conversion error!\n"); + PyErr_WriteUnraisable((PyObject *)sm); return; } @@ -437,8 +437,8 @@ } while (sm->IncomingUSSDQueue[i] != NULL && i < MAX_EVENTS); if (arglist == NULL) { - PyErr_Clear(); - pyg_error("Discarding incoming event due to conversion error!\n"); + pyg_error("Discarding incoming USSD event due to error while building params!\n"); + PyErr_WriteUnraisable((PyObject *)sm); return; } @@ -480,12 +480,12 @@ if (GSM_GetConfigNum(self->s) <= section) { PyErr_Format(PyExc_ValueError, - "Requested configuration not available (requested: %d, available: %d)", - section, + "Requested configuration not available (requested: %d, available: %d)", + section, GSM_GetConfigNum(self->s)); return NULL; } - + Config = GSM_GetConfig(self->s, section); if (Config == NULL) { PyErr_Format(PyExc_ValueError, "Requested configuration not available"); @@ -663,16 +663,16 @@ } error = GSM_FindGammuRC(&cfg); - if (!checkError(self->s, error, "ReadConfig")) + if (!checkError(self->s, error, "FindGammuRC via ReadConfig")) return NULL; if (cfg == NULL) { PyErr_SetString(PyExc_IOError, "Can not read gammurc"); return NULL; } - if (!GSM_ReadConfig(cfg, Config, section)) { + error = GSM_ReadConfig(cfg, Config, section); + if (!checkError(self->s, error, "ReadConfig")) { INI_Free(cfg); - PyErr_SetString(PyExc_IOError, "Can not read config"); return NULL; } Config->UseGlobalDebugFile = false; @@ -819,7 +819,7 @@ static PyObject * StateMachine_GetManufacturer(StateMachineObject *self, PyObject *args, PyObject *kwds) { GSM_Error error; - char value[100]; + char value[GSM_MAX_MANUFACTURER_LENGTH]; if (!PyArg_ParseTuple(args, "")) return NULL; @@ -847,7 +847,7 @@ static PyObject * StateMachine_GetModel(StateMachineObject *self, PyObject *args, PyObject *kwds) { GSM_Error error; - char value[100]; + char value[GSM_MAX_MODEL_LENGTH]; if (!PyArg_ParseTuple(args, "")) return NULL; @@ -875,8 +875,8 @@ static PyObject * StateMachine_GetFirmware(StateMachineObject *self, PyObject *args, PyObject *kwds) { GSM_Error error; - char firmware[100]; - char date[100]; + char firmware[GSM_MAX_VERSION_LENGTH]; + char date[GSM_MAX_VERSION_DATE_LENGTH]; double ver; if (!PyArg_ParseTuple(args, "")) @@ -908,7 +908,7 @@ static PyObject * StateMachine_GetIMEI(StateMachineObject *self, PyObject *args, PyObject *kwds) { GSM_Error error; - char value[100]; + char value[GSM_MAX_IMEI_LENGTH]; if (!PyArg_ParseTuple(args, "")) return NULL; @@ -1391,7 +1391,7 @@ char *key; static char *kwlist[] = {"Key", "Press", NULL}; GSM_KeyCode KeyCode[1]; - int Length; + size_t Length; if (!PyArg_ParseTupleAndKeywords(args, kwds, "s|i", kwlist, &key, &press)) @@ -1496,7 +1496,7 @@ static char StateMachine_EnterSecurityCode__doc__[] = "EnterSecurityCode(Type, Code)\n\n" "Entres security code.\n" -"@param Type: What code to enter, one of 'PIN', 'PUK', 'PIN2', 'PUK2'.\n" +"@param Type: What code to enter, one of 'PIN', 'PUK', 'PIN2', 'PUK2', 'Phone'.\n" "@type Type: string\n" "@param Code: Code value\n" "@type Code: string\n" @@ -1520,6 +1520,7 @@ else if (strcmp(s, "PUK") == 0) Code.Type = SEC_Puk; else if (strcmp(s, "PIN2") == 0) Code.Type = SEC_Pin2; else if (strcmp(s, "PUK2") == 0) Code.Type = SEC_Puk2; + else if (strcmp(s, "Phone") == 0) Code.Type = SEC_Phone; else { PyErr_Format(PyExc_ValueError, "Bad value for Type: '%s'", s); return NULL; @@ -1567,6 +1568,7 @@ case SEC_Pin2: return Py_BuildValue("s", "Pin2"); case SEC_Puk: return Py_BuildValue("s", "Puk"); case SEC_Puk2: return Py_BuildValue("s", "Puk2"); + case SEC_Phone: return Py_BuildValue("s", "Phone"); case SEC_None: Py_RETURN_NONE; } Py_RETURN_NONE; @@ -5033,7 +5035,7 @@ f = PyFile_AsFile(value); if (f == NULL) return NULL; self->DebugFile = value; - + error = GSM_SetDebugFileDescriptor(f, di); if (!checkError(NULL, error, "SetDebugFileDescriptor")) return NULL; } else if (PyString_Check(value)) { @@ -5748,14 +5750,14 @@ } static char gammu_SaveBackup__doc__[] = -"SaveBackup(Filename, Backup, UseUnicode)\n\n" +"SaveBackup(Filename, Backup, Format)\n\n" "Saves backup into file.\n\n" "@param Filename: Name of file to read backup from\n" "@type Filename: string\n" "@param Backup: Backup data, see L{ReadBackup} for description\n" "@type Backup: dict\n" -"@param UseUnicode: Whether to use unicode (UCS2-BE) for saving backup, default True\n" -"@type UseUnicode: bool\n" +"@param Format: File format to use (default is AutoUnicode)\n" +"@type Format: string (Auto, AutoUnicode, LMB, VCalendar, VCard, LDIF, ICS, Gammu, GammuUnicode)\n" "@return: None\n" "@rtype: None\n" ; @@ -5763,21 +5765,25 @@ static PyObject * gammu_SaveBackup(PyObject *self, PyObject *args, PyObject *kwds) { - static char *kwlist[] = {"Filename", "Backup", "UseUnicode", NULL}; + static char *kwlist[] = {"Filename", "Backup", "Format", NULL}; PyObject *value; char *filename; GSM_Backup backup; GSM_Error error; - int i = 1; - bool unicode; + GSM_BackupFormat format = GSM_Backup_AutoUnicode; + char *s = NULL; GSM_ClearBackup(&backup); - if (!PyArg_ParseTupleAndKeywords(args, kwds, "sO!|i", kwlist, - &filename, &PyDict_Type, &(value), &i)) + if (!PyArg_ParseTupleAndKeywords(args, kwds, "sO!|s", kwlist, + &filename, &PyDict_Type, &(value), &s)) return NULL; - unicode = i; + if (s != NULL) { + if (!BackupFormatFromString(s, &format)) { + return NULL; + } + } if (!BackupFromPython(value, &backup)) return NULL; @@ -5785,17 +5791,19 @@ GSM_GetCurrentDateTime(&backup.DateTime); backup.DateTimeAvailable = true; - error = GSM_SaveBackupFile(filename, &backup, unicode); + error = GSM_SaveBackupFile(filename, &backup, format); if (!checkError(NULL, error, "SaveBackup")) return NULL; Py_RETURN_NONE; } static char gammu_ReadBackup__doc__[] = -"ReadBackup(Filename)\n\n" +"ReadBackup(Filename, Format)\n\n" "Reads backup into file.\n\n" "@param Filename: Name of file where backup is stored\n" "@type Filename: string\n" +"@param Format: File format to use (default is AutoUnicode)\n" +"@type Format: string (Auto, AutoUnicode, LMB, VCalendar, VCard, LDIF, ICS, Gammu, GammuUnicode)\n" "@return: Dictionary of read entries, it contains following keys, each might be empty:\n" " - IMEI\n" " - Model\n" @@ -5811,18 +5819,26 @@ static PyObject * gammu_ReadBackup(PyObject *self, PyObject *args, PyObject *kwds) { - static char *kwlist[] = {"Filename", NULL}; + static char *kwlist[] = {"Filename", "Format", NULL}; char *filename; GSM_Backup backup; GSM_Error error; + GSM_BackupFormat format = GSM_Backup_AutoUnicode; + char *s = NULL; GSM_ClearBackup(&backup); - if (!PyArg_ParseTupleAndKeywords(args, kwds, "s", kwlist, + if (!PyArg_ParseTupleAndKeywords(args, kwds, "s|s", kwlist, &filename)) return NULL; - error = GSM_ReadBackupFile(filename, &backup); + if (s != NULL) { + if (!BackupFormatFromString(s, &format)) { + return NULL; + } + } + + error = GSM_ReadBackupFile(filename, &backup, format); if (!checkError(NULL, error, "ReadBackup")) return NULL; return BackupToPython(&backup); @@ -5859,7 +5875,7 @@ error = GSM_AddSMSBackupFile(filename, &backup); if (!checkError(NULL, error, "SaveSMSBackup")) return NULL; - FreeSMSBackup(&backup); + GSM_FreeSMSBackup(&backup); Py_RETURN_NONE; } @@ -5889,7 +5905,7 @@ if (!checkError(NULL, error, "ReadSMSBackup")) return NULL; result = SMSBackupToPython(&backup); - FreeSMSBackup(&backup); + GSM_FreeSMSBackup(&backup); return result; } @@ -5937,12 +5953,6 @@ int i; GSM_Debug_Info *di; - /* Check runtime Gammu version, in normal case soname would take care of this, but Gammu API is so unstable... */ - if (strcmp(GetGammuVersion(), VERSION) != 0) { - PyErr_Format(PyExc_SystemError, "Runtime libGammu version does not match compile time version (runtime: %s, compiletime: %s)", GetGammuVersion(), VERSION); - return; - } - /* Cleanup global array */ for (i = 0; i < MAX_STATEMACHINES + 1; i++) { AllStateMachines[i] = NULL; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/python-gammu-0.22/INSTALL new/python-gammu-0.23/INSTALL --- old/python-gammu-0.22/INSTALL 2007-05-21 09:19:41.000000000 +0200 +++ new/python-gammu-0.23/INSTALL 2007-09-26 06:09:40.000000000 +0200 @@ -5,36 +5,45 @@ UNIX systems - installation from sources ---------------------------------------- -First you need Gammu installed as shared library and with header files. +* Gammu library * + +First you need Gammu. Either only built as static library or installed +with header files. To do it from source you can follow instructions in +Gammu sources. Shortened version follows here: 1. Download recent Gammu sources from http://www.gammu.org/. 2. Unpack it: > tar xfj gammu-*.tar.bz2 3. Configure (you might want to tweak configure parameters): > cd gammu-* - > ./configure --prefix=/usr --enable-shared -4. Build as shared library: + > ./configure --prefix=/usr + Optionally you can make it shared library with --enable-shared t +4. Build: > make - > su -5. Install as shared library: - # make install +5. Install: + > sdo make install + +* Pkg-config * -For finding gammu libraries, pkg-config is used, so please install it also. +For finding gammu libraries, pkg-config is used, so please install it +also. -Then you can build and install python-gammu. It uses standard distutils, so: +* Building python-gammu * + +Then you can build and install python-gammu. It uses standard distutils, +so it contains from two simple steps:
python setup.py build -> su -# python setup.py install +> sudo python setup.py install
Custom installation place ------------------------- -You can override values acquired from pkg-config by passing parameters to -build target. This is useful when you don't have gammu installed, -you can pass path common directory in gammu sources as path to includes -and library: +You can override values acquired from pkg-config by passing parameters +to build target. This is useful when you don't have gammu installed, you +can pass path common directory in gammu sources as path to includes and +library: python setup.py build \ --gammu-libs=path_to_gammu_library \ @@ -45,7 +54,10 @@ python setup.py build \ --gammu-build=path_to_gammu_build_directory -See `python setup.py build --help` for more options. +See "python setup.py build --help" for more options. + +When running install later, you will probably need to add --skip-deps in +this case. Windows systems @@ -64,4 +76,4 @@ Alternatively there are be prebuilt modules on python-gammu web site. -# vim: expandtab sw=4 ts=4 sts=4: +# vim: et ts=4 sw=4 sts=4 tw=72 spell spelllang=en_us diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/python-gammu-0.22/NEWS new/python-gammu-0.23/NEWS --- old/python-gammu-0.22/NEWS 2007-08-25 14:59:24.000000000 +0200 +++ new/python-gammu-0.23/NEWS 2007-11-08 05:07:41.000000000 +0100 @@ -4,6 +4,11 @@ Major changes for each release are described here. Detailed changes between two versions can be retrieved from Subversion. +0.23 +==== (2007-11-08) + +* Compatibility with current gammu. + 0.22 ==== (2007-08-25) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/python-gammu-0.22/PKG-INFO new/python-gammu-0.23/PKG-INFO --- old/python-gammu-0.22/PKG-INFO 2007-08-25 15:41:02.000000000 +0200 +++ new/python-gammu-0.23/PKG-INFO 2007-11-08 05:09:37.000000000 +0100 @@ -1,6 +1,6 @@ Metadata-Version: 1.0 Name: python-gammu -Version: 0.22 +Version: 0.23 Summary: Gammu bindings Home-page: http://cihar.com/gammu/python Author: Michal Čihař diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/python-gammu-0.22/python-gammu.spec new/python-gammu-0.23/python-gammu.spec --- old/python-gammu-0.22/python-gammu.spec 2007-07-18 18:04:26.000000000 +0200 +++ new/python-gammu-0.23/python-gammu.spec 2007-11-01 03:21:53.000000000 +0100 @@ -15,7 +15,7 @@ %endif Packager: Michal Cihar <michal@cihar.com> Vendor: Michal Cihar <michal@cihar.com> -BuildRequires: gammu-devel >= 1.12.91 +BuildRequires: gammu-devel >= 1.13.97 Url: http://cihar.com/gammu/wammu Buildroot: %{_tmppath}/%name-%version-root %if %{_vendor} != redhat diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/python-gammu-0.22/README new/python-gammu-0.23/README --- old/python-gammu-0.22/README 2007-04-17 16:46:48.000000000 +0200 +++ new/python-gammu-0.23/README 2007-09-26 06:09:40.000000000 +0200 @@ -20,8 +20,8 @@
import gammu help(gammu)
-Alternatively you can use epydoc to generate browsable version, which is also -available online at http://cihar.com/gammu/python/docs. +Alternatively you can use epydoc to generate browsable version, which is +also available on-line at http://cihar.com/gammu/python/docs. Bug reporting ============= @@ -37,3 +37,5 @@ Anonymous Subversion is available using svn://svn.cihar.com/python-gammu, there is also web browser for it - http://viewsvn.cihar.com/python-gammu. + +# vim: et ts=4 sw=4 sts=4 tw=72 spell spelllang=en_us diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/python-gammu-0.22/setup.py new/python-gammu-0.23/setup.py --- old/python-gammu-0.22/setup.py 2007-08-01 14:18:25.000000000 +0200 +++ new/python-gammu-0.23/setup.py 2007-11-01 03:21:53.000000000 +0100 @@ -44,7 +44,7 @@ # some defines MAJOR_VERSION = 0 -MINOR_VERSION = 22 +MINOR_VERSION = 23 EXTRA_VERSION = None if EXTRA_VERSION == None: @@ -52,7 +52,7 @@ else: VERSION = '%d.%d.%d' % (MAJOR_VERSION, MINOR_VERSION, EXTRA_VERSION) -GAMMU_REQUIRED = (1,12,91) +GAMMU_REQUIRED = (1,13,97) PYTHON_REQUIRED = (2,3) ADDITIONAL_PARAMS = [ @@ -157,6 +157,7 @@ def check_version(self, name, version): output = self.do_pkgconfig('--modversion %s' % name) + distutils.log.info('found %s version %s' % (name, output[1])) pkc_version = tuple(map(int, output[1].split('.'))) if pkc_version >= version: return True @@ -191,8 +192,16 @@ def check_gammu(self): if not self.pkg_exists('gammu') or not self.check_version('gammu', GAMMU_REQUIRED): - print '\nYou need installed gammu as shared library and enable pkg-config to find it.\n\n' + \ - 'This is done by invoking make installshared in gammu sources.' + print '\nYou need installed gammu and enabled pkg-config to find it.' + print + print 'This is done by invoking make install in gammu sources.' + print + print 'If package was installed to other prefix, please use' + print '--pkgconfig-search-path=<install_prefix>/lib/pkgconfig' + print + print 'If you get this error when invoking setup.py install, you can' + print 'try to ignore this with --skip-deps' + print sys.exit(1) def read_gammu_version(self, path): ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org