From ba166e77c510eb526dbe848731f20a5f6fd74da5 Mon Sep 17 00:00:00 2001 From: Bastien Nocera Date: Dec 08 2010 10:05:53 +0000 Subject: Add upstream patch for pcsc build failure --- diff --git a/0001-Make-libgnokii-compile-with-libpcsc-lite-1.6.0.patch b/0001-Make-libgnokii-compile-with-libpcsc-lite-1.6.0.patch new file mode 100644 index 0000000..0088996 --- /dev/null +++ b/0001-Make-libgnokii-compile-with-libpcsc-lite-1.6.0.patch @@ -0,0 +1,26 @@ +From 3dac96714fba1f06445c15e34af3a0c3ad7eb1ce Mon Sep 17 00:00:00 2001 +From: Guido Falsi +Date: Sat, 5 Jun 2010 19:18:19 +0200 +Subject: [PATCH] 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 +--- + common/phones/pcsc.c | 1 - + 1 files changed, 0 insertions(+), 1 deletions(-) + +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; +-- +1.7.3.2 + diff --git a/gnokii.spec b/gnokii.spec index 4f783cb..3741213 100644 --- a/gnokii.spec +++ b/gnokii.spec @@ -39,6 +39,9 @@ BuildRequires: readline-devel BuildRequires: perl(XML::Parser) intltool Requires(pre): %{_sbindir}/groupadd +# From upstream +Patch2: 0001-Make-libgnokii-compile-with-libpcsc-lite-1.6.0.patch + %description Gnokii provides tools and a user space driver for use with mobile phones under Linux, various unices and Win32. With gnokii you can do @@ -98,6 +101,7 @@ Requires: pkgconfig %setup -q #%patch0 -p0 %patch1 -p0 +%patch2 -p1 -b .pcsc install -pm 644 %{SOURCE5} smsd2mail.sh install -pm 644 %{SOURCE6} README.smsd2mail