From 09df6fc638ad281b8d25e90adb14d783f690b92c Mon Sep 17 00:00:00 2001
From: Jakub Jelen <jjelen@redhat.com>
Date: Tue, 2 Jul 2024 10:50:55 +0200
Subject: [PATCH] 1.6.0-1

Resolves: RHEL-38429
---
 .gitignore          |  2 ++
 pcsc-lite-ccid.spec | 26 +++++++++++++++-----------
 sources             |  4 ++--
 3 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/.gitignore b/.gitignore
index 7c7ecaa..2e353ee 100644
--- a/.gitignore
+++ b/.gitignore
@@ -25,3 +25,5 @@
 /ccid-1.5.3.tar.bz2.asc
 /ccid-1.5.4.tar.bz2.asc
 /ccid-1.5.5.tar.bz2.asc
+/ccid-1.6.0.tar.xz
+/ccid-1.6.0.tar.xz.asc
diff --git a/pcsc-lite-ccid.spec b/pcsc-lite-ccid.spec
index c15cd10..aab0050 100644
--- a/pcsc-lite-ccid.spec
+++ b/pcsc-lite-ccid.spec
@@ -2,23 +2,24 @@
 %global pcsc_lite_ver 1.8.9
 
 Name:           pcsc-lite-ccid
-Version:        1.5.5
-Release:        4%{?dist}
+Version:        1.6.0
+Release:        1%{?dist}
 Summary:        Generic USB CCID smart card reader driver
 
-License:        BSD 3-Clause AND GPL-2.0-or-later AND LGPL-2.1-or-later
+License:        BSD-3-Clause AND GPL-2.0-or-later AND LGPL-2.1-or-later
 URL:            https://ccid.apdu.fr/files
-Source0:        https://ccid.apdu.fr/files/ccid-%{version}.tar.bz2
-Source1:        https://ccid.apdu.fr/files/ccid-%{version}.tar.bz2.asc
+Source0:        https://ccid.apdu.fr/files/ccid-%{version}.tar.xz
+Source1:        https://ccid.apdu.fr/files/ccid-%{version}.tar.xz.asc
 Source2:        gpgkey-F5E11B9FFE911146F41D953D78A1B4DFE8F9C57E.gpg
 Patch0:         ccid-1.4.26-omnikey-3121.patch
 
-BuildRequires: make
+BuildRequires:  meson
+BuildRequires:  gcc
 BuildRequires:  perl-interpreter
 BuildRequires:  perl-Getopt-Long
 BuildRequires:  libusb1-devel
 BuildRequires:  pcsc-lite-devel >= %{pcsc_lite_ver}
-BuildRequires:  gnupg2 gcc
+BuildRequires:  gnupg2
 BuildRequires:  flex
 BuildRequires:  zlib-devel
 Requires(post): systemd
@@ -42,12 +43,12 @@ gpgv2 --keyring %{SOURCE2} %{SOURCE1} %{SOURCE0}
 %patch 0 -p1 -b .omnikey
 
 %build
-%configure --enable-twinserial
-%make_build
+%meson -Dserial=true
 
+%meson_build
 
 %install
-%make_install
+%meson_install
 cp -p src/openct/LICENSE LICENSE.openct
 
 
@@ -59,7 +60,7 @@ cp -p src/openct/LICENSE LICENSE.openct
 
 
 %files
-%doc AUTHORS ChangeLog README.md
+%doc AUTHORS README.md
 %license COPYING LICENSE.openct
 %{dropdir}/ifd-ccid.bundle/
 %{dropdir}/serial/
@@ -67,6 +68,9 @@ cp -p src/openct/LICENSE LICENSE.openct
 
 
 %changelog
+* Tue Jul 02 2024 Jakub Jelen <jjelen@redhat.com> - 1.6.0-1
+- New upstream release with meson build system (#2284336)
+
 * Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 1.5.5-4
 - Bump release for June 2024 mass rebuild
 
diff --git a/sources b/sources
index a7b40ac..2906d60 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (ccid-1.5.5.tar.bz2) = 9d2aebe645a5880bfad7d420ddab96811d1fd989c79afa28f5471ae53f36b6d45ee5e13b32ac4afcf59fc762ae835db7e6312ad6642b263158c2d9a30c7651bd
-SHA512 (ccid-1.5.5.tar.bz2.asc) = ba09a7abe5e7309bcefbe8140361285b2d9b07135afa395c38a994742fec83c6108b3b1e189c81294523e7a1a34149c308bbb8e55a6ebad6881e2baf4f2ebfc1
+SHA512 (ccid-1.6.0.tar.xz) = e26a28531e8f2e82d49d0f5caa769ae1197d5d88d9fe6d79a4943f460be6c0e603e3f6f0dc224216d3d697df0749a5d9c83836d66f63999d9755c17539e96b2c
+SHA512 (ccid-1.6.0.tar.xz.asc) = 694b041f5a9a2fa11255db562fb72058bd047bba3befcfd7dce2008c3a7a6efe4340972590ec4815a601c1db8c6de833d36f5e2525965ee9b8e3c3c4837a3a86