Accepting request 327663 from home:Nijel:branches:hardware

- Update to 1.36.5:
  * Properly use timezones with SQLite in SMSD.
  * Improve support for Huawei E1752.
  * Fixed compilation on distros with old Glib.
  * Use advisory locking to prevent two Gammu instances share one device.
  * Include child process stdout and stderr in SMSD logs to ease debugging.
  * Fix string quoting with ODBC driver.
  * Added RunOnSent option to SMSD.
  * Store message reference in outbox in files SMSD.
  * Improved C API documentation in manual.
  * Updated list of GSM country codes and networks.
  * Fixed bash completition install path (Ville Skyttä).
  * Better logging of delivery report failures in SMSD.
  * Improved support for Huawei E3372.
  * Fixed compilation using MSVC.
  * Fix siemenssatnetmon (Daniel Glöckner).
  * Documentation improvements.
  * Fixed smsd startup with non existing folders.
  * Fixed possible stack overflows on Windows.
  * Compatibility with libdbi from git.
  * Fix siemenssatnetmon (Daniel Glöckner).
  * Fixed reconnecting to SQL server.
  * Don't split a surrogate pair between message segments (David Brown).
- Remove patches merged upstream:
  - Compatibility-with-libdbi-from-git.patch
  - gammu-smsd.lsb.patch
- Enable testsuite
- Clarify dependency on newer CMake

OBS-URL: https://build.opensuse.org/request/show/327663
OBS-URL: https://build.opensuse.org/package/show/hardware/gammu?expand=0&rev=29

Compatibility-with-libdbi-from-git.patch

@@ -1,52 +0,0 @@
-From 1a360969313237b9cd0507163c9a2c320c8c3692 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= <michal@cihar.com>
-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ř <michal@cihar.com>
----
- 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.36.0.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:9c89fd204e190db5b301d28b793e8d0f2b05069a5b2b91fde451a6dae7f7d633
-size 1673644

gammu-1.36.5.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:42e626f8f8b97c7a0afc5547a6056aa061725e8e3ace91dbcf9e83816a70ab86
+size 1686448

gammu-smsd.lsb.patch

@@ -1,15 +0,0 @@
---- contrib/init/gammu-smsd.lsb.orig	2011-07-19 12:33:00.000000000 +0300
-+++ contrib/init/gammu-smsd.lsb	2011-07-23 00:39:21.489000027 +0300
-@@ -25,11 +25,10 @@
- # Required-Stop:     $local_fs $remote_fs
- # Should-Start:      mysql postgresql $syslog
- # Should-Stop:       mysql postgresql $syslog
--# Default-Start:     2 3 4 5
-+# Default-Start:     2 3 5
- # Default-Stop:      0 1 6
- # Short-Description: Gammu SMS daemon
- # Description:       Daemon for automatically sending and receiving messages using GSM phone.
--# Author:            Michal Čihař <michal@cihar.com>
- ### END INIT INFO
- 
- # Uncommend and adjust following line if you need to set locales in init script:

gammu.changes

@@ -1,3 +1,35 @@
+-------------------------------------------------------------------
+Fri Aug 28 08:04:21 UTC 2015 - mcihar@suse.cz
+
+- Update to 1.36.5:
+  * Properly use timezones with SQLite in SMSD.
+  * Improve support for Huawei E1752.
+  * Fixed compilation on distros with old Glib.
+  * Use advisory locking to prevent two Gammu instances share one device.
+  * Include child process stdout and stderr in SMSD logs to ease debugging.
+  * Fix string quoting with ODBC driver.
+  * Added RunOnSent option to SMSD.
+  * Store message reference in outbox in files SMSD.
+  * Improved C API documentation in manual.
+  * Updated list of GSM country codes and networks.
+  * Fixed bash completition install path (Ville Skyttä).
+  * Better logging of delivery report failures in SMSD.
+  * Improved support for Huawei E3372.
+  * Fixed compilation using MSVC.
+  * Fix siemenssatnetmon (Daniel Glöckner).
+  * Documentation improvements.
+  * Fixed smsd startup with non existing folders.
+  * Fixed possible stack overflows on Windows.
+  * Compatibility with libdbi from git.
+  * Fix siemenssatnetmon (Daniel Glöckner).
+  * Fixed reconnecting to SQL server.
+  * Don't split a surrogate pair between message segments (David Brown).
+- Remove patches merged upstream:
+  - Compatibility-with-libdbi-from-git.patch
+  - gammu-smsd.lsb.patch
+- Enable testsuite
+- Clarify dependency on newer CMake
+
 -------------------------------------------------------------------
 Wed Apr 15 08:06:34 UTC 2015 - mcihar@suse.cz
 

gammu.spec

@@ -19,19 +19,15 @@
 %define so_ver 7
 
 Name:           gammu
-Version:        1.36.0
+Version:        1.36.5
 Release:        0
 Summary:        Mobile phone management utility
 License:        GPL-2.0
 Group:          Productivity/Telephony/Utilities
 Url:            http://wammu.eu/gammu/
 Source0:        http://dl.cihar.com/gammu/releases/%{name}-%{version}.tar.xz
-# PATCH-FIX-OPENSUSE gammu-smsd.lsb.patch asterios.dramis@gmail.com -- Fix rpmlint warnings "unknown-lsb-keyword" and "init-script-runlevel-4"
-Patch0:         gammu-smsd.lsb.patch
 # PATCH-FIX-OPENSUSE gammu-remove-gplv3-files.patch idoenmez@suse.de -- Remove GPLv3 files bnc#775397
 Patch1:         gammu-remove-gplv3-files.patch
-# 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}
@@ -83,7 +79,7 @@ Patch2:         Compatibility-with-libdbi-from-git.patch
 %endif
 %endif
 %endif
-BuildRequires:  cmake
+BuildRequires:  cmake >= 2.8
 BuildRequires:  doxygen
 BuildRequires:  gettext
 BuildRequires:  glib2-devel
@@ -268,9 +264,7 @@ This package contains the Gammu SMS daemon shared library.
 
 %prep
 %setup -q
-%patch0
 %patch1 -p1
-%patch2 -p1
 
 # Change permissions - Fix rpmlint warning "doc-file-dependency"
 chmod 644 contrib/init/gammu-smsd.lsb
@@ -300,9 +294,9 @@ make manual-html
 cd ..
 
 %check
-#cd build
+cd build
-#ctest -V
+ctest -V
-#cd ..
+cd ..
 
 %install
 make -C build install DESTDIR=%{buildroot}