Hello community, here is the log from the commit of package gnokii for openSUSE:Factory checked in at Tue Jan 18 01:06:13 CET 2011. -------- --- gnokii/gnokii.changes 2010-05-23 16:38:47.000000000 +0200 +++ gnokii/gnokii.changes 2011-01-18 00:22:09.000000000 +0100 @@ -1,0 +2,6 @@ +Tue Jan 18 00:18:58 CET 2011 - vuntz@opensuse.org + +- Add gnokii-new-libpcsc-lite.patch, that we apply on 11.4 and + later: fix build with libpcsc-lite >= 1.6.0. Taken from git. + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- gnokii-new-libpcsc-lite.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gnokii.spec ++++++ --- /var/tmp/diff_new_pack.PPjVjb/_old 2011-01-18 01:04:33.000000000 +0100 +++ /var/tmp/diff_new_pack.PPjVjb/_new 2011-01-18 01:04:33.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package gnokii (Version 0.6.29) +# spec file for package gnokii # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,7 +19,7 @@ Name: gnokii Version: 0.6.29 -Release: 1 +Release: 4 License: GPLv2+ Summary: Nokia Connectivity Program Url: http://www.gnokii.org/ @@ -28,6 +28,8 @@ Source1: xgnokii.desktop Source2: gnokii.xpm Source3: README.SUSE +# PATCH-FIX-UPSTREAM gnokii-new-libpcsc-lite.patch vuntz@opensuse.org -- Taken from git, to fix build with libpcsc-lite >= 1.6.0. Taken from git. +Patch0: gnokii-new-libpcsc-lite.patch BuildRequires: bluez-devel BuildRequires: coreutils BuildRequires: gtk2-devel @@ -91,6 +93,9 @@ %prep %setup -q +%if 0%{?suse_version} > 1130 +%patch0 -p1 +%endif %build export CFLAGS="%{optflags} -D_GNU_SOURCE -fPIC -Wall -Wno-unused -fstack-protector -fno-strict-aliasing" ++++++ gnokii-new-libpcsc-lite.patch ++++++
From 3dac96714fba1f06445c15e34af3a0c3ad7eb1ce Mon Sep 17 00:00:00 2001 From: Guido Falsi
Date: Sat, 05 Jun 2010 17:18:19 +0000 Subject: Make libgnokii compile with libpcsc-lite 1.6.0
SCARD_W_INSERTED_CARD was removed in http://svn.debian.org/viewsvn/pcsclite?view=rev&revision=4574 --- diff --git a/common/phones/pcsc.c b/common/phones/pcsc.c index d4a976c..bc04c0f 100644 --- a/common/phones/pcsc.c +++ b/common/phones/pcsc.c @@ -199,7 +199,6 @@ static gn_error get_gn_error(PCSC_IOSTRUCT *ios, LONG ret) case SCARD_W_UNPOWERED_CARD: case SCARD_W_RESET_CARD: case SCARD_W_REMOVED_CARD: - case SCARD_W_INSERTED_CARD: return GN_ERR_SIMPROBLEM; case SCARD_E_NO_MEMORY: return GN_ERR_MEMORYFULL; -- cgit v0.8.3.2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org