Accepting request 296738 from hardware
1 OBS-URL: https://build.opensuse.org/request/show/296738 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gammu?expand=0&rev=40
This commit is contained in:
Git OBS Bridge
52
Compatibility-with-libdbi-from-git.patch
Normal file
52
Compatibility-with-libdbi-from-git.patch
Normal file
@@ -0,0 +1,52 @@
|
||||
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
|
||||
|
||||
@@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:c203a982004adc2f816aa71b16983bbff9b444f0404e699ca2566e785aac46f6
|
||||
size 1979880
|
||||
3
gammu-1.36.0.tar.xz
Normal file
3
gammu-1.36.0.tar.xz
Normal file
@@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:9c89fd204e190db5b301d28b793e8d0f2b05069a5b2b91fde451a6dae7f7d633
|
||||
size 1673644
|
||||
@@ -1,3 +1,24 @@
|
||||
-------------------------------------------------------------------
|
||||
Wed Apr 15 08:06:34 UTC 2015 - mcihar@suse.cz
|
||||
|
||||
- Fix compatibility with libdbi snapshot from Git we are using
|
||||
(Compatibility-with-libdbi-from-git.patch)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Apr 14 08:58:20 UTC 2015 - mcihar@suse.cz
|
||||
|
||||
- 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
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Mar 2 15:01:40 UTC 2015 - mcihar@suse.cz
|
||||
|
||||
|
||||
35
gammu.spec
35
gammu.spec
@@ -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 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
|
||||
# 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: %{dist_bluez_libs}
|
||||
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 @@ Currently supported phones include:
|
||||
|
||||
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 CFLAGS="%{optflags}"
|
||||
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 @@ rm -rf %{buildroot}%{_datadir}/locale/sw/
|
||||
%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
|
||||
|
||||
Reference in New Issue
Block a user