Hello community, here is the log from the commit of package gammu for openSUSE:Factory checked in at 2015-04-15 16:27:37 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gammu (Old) and /work/SRC/openSUSE:Factory/.gammu.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "gammu" Changes: -------- --- /work/SRC/openSUSE:Factory/gammu/gammu.changes 2015-03-03 11:15:59.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.gammu.new/gammu.changes 2015-04-15 16:27:38.000000000 +0200 @@ -1,0 +2,21 @@ +Wed Apr 15 08:06:34 UTC 2015 - [email protected] + +- Fix compatibility with libdbi snapshot from Git we are using + (Compatibility-with-libdbi-from-git.patch) + +------------------------------------------------------------------- +Tue Apr 14 08:58:20 UTC 2015 - [email protected] + +- Update to 1.36.0: + * The python-gammu module is now shipped separately. + * Removed usage of __TIME__ and __DATE__ macros in codebase. + * Fixed encoding of special chars to iCalendar format. + * Fixed decoding of priority from vTODO. + * Avoid infinite loops with ignored messages. + * Improved stability of checking phone SMS memory. + * Fixed parsing of some backup files. +- Adjusted Source URL +- Python module is now shipped separately +- No more need for fake build date + +------------------------------------------------------------------- Old: ---- gammu-1.35.0.tar.xz New: ---- Compatibility-with-libdbi-from-git.patch gammu-1.36.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gammu.spec ++++++ --- /var/tmp/diff_new_pack.96BadV/_old 2015-04-15 16:27:39.000000000 +0200 +++ /var/tmp/diff_new_pack.96BadV/_new 2015-04-15 16:27:39.000000000 +0200 @@ -19,21 +19,19 @@ %define so_ver 7 Name: gammu -Version: 1.35.0 +Version: 1.36.0 Release: 0 Summary: Mobile phone management utility License: GPL-2.0 Group: Productivity/Telephony/Utilities Url: http://wammu.eu/gammu/ -Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.xz +Source0: http://dl.cihar.com/gammu/releases/%{name}-%{version}.tar.xz # PATCH-FIX-OPENSUSE gammu-smsd.lsb.patch [email protected] -- Fix rpmlint warnings "unknown-lsb-keyword" and "init-script-runlevel-4" Patch0: gammu-smsd.lsb.patch # PATCH-FIX-OPENSUSE gammu-remove-gplv3-files.patch [email protected] -- Remove GPLv3 files bnc#775397 Patch1: gammu-remove-gplv3-files.patch -# Python location -%{!?__python: %define __python python} -%define g_python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)") -%define g_python_major_version %(%{__python} -c 'import sys; print sys.version.split(" ")[0][:3]') +# PATCH-FIX-UPSTREAM -- Upstream patch for libdbi from git (which we are using) +Patch2: Compatibility-with-libdbi-from-git.patch # Docdir %if 0%{?fedora_version} || 0%{?centos_version} || 0%{?rhel_version} || 0%{?fedora} || 0%{?rhel} %define gammu_docdir %{_docdir}/%{name}-%{version} @@ -130,7 +128,6 @@ BuildRequires: python-Sphinx BuildRequires: python-sphinxcontrib-breathe %endif -BuildRequires: python-devel BuildRequires: unixODBC-devel %if 0%{?suse_version} && 0%{?suse_version} <= 1210 BuildRequires: xz @@ -269,29 +266,13 @@ This package contains the Gammu SMS daemon shared library. -%package -n python-gammu -Summary: Python module to communicate with mobile phones -Group: Development/Languages/Python -Requires: python < %{g_python_major_version}.99 -Requires: python >= %{g_python_major_version} -%{?py_requires} - -%description -n python-gammu -This provides gammu module, that can work with any phone Gammu -supports - many Nokias, Siemens, Alcatel, ... - %prep %setup -q %patch0 %patch1 -p1 +%patch2 -p1 -# Remove build time references - Fix rpmlint warning "file-contains-date-and-time" -FAKE_BUILDTIME=$(LC_ALL=C date -u -r %{_sourcedir}/%{name}.changes '+%%H:%%M') -FAKE_BUILDDATE=$(LC_ALL=C date -u -r %{_sourcedir}/%{name}.changes '+%%b %%e %%Y') -sed -i "s/__TIME__/\"$FAKE_BUILDTIME\"/" gammu/gammu.c gammu-detect/main.c libgammu/gsmstate.c smsd/inject.c smsd/monitor.c smsd/main.c -sed -i "s/__DATE__/\"$FAKE_BUILDDATE\"/" gammu/gammu.c gammu-detect/main.c libgammu/gsmstate.c libgammu/phone/dummy/dummy.c smsd/inject.c smsd/monitor.c smsd/main.c # Change permissions - Fix rpmlint warning "doc-file-dependency" -chmod 644 python/examples/*.py chmod 644 contrib/init/gammu-smsd.lsb # GPL-3.0 licensed files, bnc#775397 @@ -306,7 +287,6 @@ export CXXFLAGS="%{optflags}" cmake ../ \ -DBUILD_SHARED_LIBS=ON \ - -DBUILD_PYTHON=/usr/bin/python \ -DCMAKE_INSTALL_PREFIX=%{_prefix} \ -DINSTALL_DOC_DIR=%{gammu_docdir} \ -DINSTALL_LIB_DIR=%{_lib} \ @@ -419,9 +399,4 @@ %defattr(-,root,root,-) %{_libdir}/libgsmsd.so.%{so_ver}* -%files -n python-gammu -%defattr(-,root,root,-) -%doc README.Python python/examples/ -%{g_python_sitearch}/gammu/ - %changelog ++++++ Compatibility-with-libdbi-from-git.patch ++++++ >From 1a360969313237b9cd0507163c9a2c320c8c3692 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= <[email protected]> Date: Wed, 15 Apr 2015 10:04:45 +0200 Subject: [PATCH 1/1] Compatibility with libdbi from git. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Michal Čihař <[email protected]> --- ChangeLog | 4 +++- smsd/services/dbi.c | 4 ++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/smsd/services/dbi.c b/smsd/services/dbi.c index d204a96..9d585e9 100644 --- a/smsd/services/dbi.c +++ b/smsd/services/dbi.c @@ -58,6 +58,10 @@ long long SMSDDBI_GetNumber(GSM_SMSDConfig * Config, SQL_result *res, unsigned i } SMSD_Log(DEBUG_ERROR, Config, "Wrong decimal field subtype from DBI: %d", type); return -1; +#ifdef DBI_TYPE_XDECIMAL + case DBI_TYPE_XDECIMAL: + return dbi_result_get_as_longlong_idx(res->dbi, field); +#endif default: SMSD_Log(DEBUG_ERROR, Config, "Wrong field type for number (not INTEGER nor DECIMAL) from DBI: %d", type); return -1; @@ -79,6 +79,9 @@ time_t SMSDDBI_GetDate(GSM_SMSDConfig * Config, SQL_result *res, unsigned int fi switch (type) { case DBI_TYPE_INTEGER: case DBI_TYPE_DECIMAL: +#ifdef DBI_TYPE_XDECIMAL + case DBI_TYPE_XDECIMAL: +#endif return SMSDDBI_GetNumber(Config, res, field); case DBI_TYPE_STRING: date = dbi_result_get_string_idx(res->dbi, field); @@ -104,6 +107,9 @@ gboolean SMSDDBI_GetBool(GSM_SMSDConfig * Config, SQL_result *res, unsigned int switch (type) { case DBI_TYPE_INTEGER: case DBI_TYPE_DECIMAL: +#ifdef DBI_TYPE_XDECIMAL + case DBI_TYPE_XDECIMAL: +#endif num = SMSDDBI_GetNumber(Config, res, field); if (num == -1) { return -1; -- 2.1.4 ++++++ gammu-1.35.0.tar.xz -> gammu-1.36.0.tar.xz ++++++ ++++ 1180475 lines of diff (skipped)
