up to 1.9.0

diff --git a/libfido2.spec b/libfido2.spec
index 8bde2e0eb0e652f0305c088aa8b037d900bf5e82..ee51f286278ce133b2d687edb6aed5687e9465bf 100644 (file)
--- a/libfido2.spec
+++ b/libfido2.spec
@@ -1,14 +1,13 @@
 Summary:       Library functionality for FIDO 2.0, including communication with a device over USB
 Summary(pl.UTF-8):     Biblioteka funkcji dla FIDO 2.0, wraz z komunikacją z urządzeniem po USB
 Name:          libfido2
-Version:       1.5.0
-Release:       3
+Version:       1.9.0
+Release:       1
 License:       BSD
 Group:         Libraries
 #Source0Download: https://github.com/Yubico/libfido2/releases
 Source0:       https://github.com/Yubico/libfido2/archive/%{version}/%{name}-%{version}.tar.gz
-# Source0-md5: 0ec7d4a249eec0982576c0dbf8f1ffad
-Patch0:                no-Werror.patch
+# Source0-md5: ef5bea44900665ae7893e0b5cc740277
 URL:           https://developers.yubico.com/libfido2/
 BuildRequires: cmake >= 3.0
 BuildRequires: hidapi-devel
@@ -16,6 +15,7 @@ BuildRequires:        libcbor-devel
 BuildRequires: openssl-devel >= 1.1.0
 BuildRequires: pkgconfig
 BuildRequires: udev-devel
+BuildRequires: zlib-devel
 Requires:      openssl >= 1.1.0
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -55,7 +55,6 @@ Biblioteka statyczna FIDO2.
 
 %prep
 %setup -q
-%patch0 -p1
 
 %build
 install -d build
@@ -64,7 +63,8 @@ cd build
 %cmake .. \
        -DCMAKE_INSTALL_LIBDIR=%{_lib} \
        -DGZIP_PATH=FALSE \
-       -DUSE_HIDAPI=1
+       -DUSE_HIDAPI=ON \
+       -DNFC_LINUX=ON
 
 %{__make}
 

diff --git a/no-Werror.patch b/no-Werror.patch
deleted file mode 100644 (file)
index 2c9499d..0000000
--- a/no-Werror.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- libfido2-1.5.0/CMakeLists.txt~     2020-09-01 09:17:43.000000000 +0200
-+++ libfido2-1.5.0/CMakeLists.txt      2021-10-06 22:29:32.451948931 +0200
-@@ -128,13 +128,11 @@
- 
-       set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall")
-       set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wextra")
--      set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Werror")
-       set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wshadow")
-       set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wwrite-strings")
-       set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wmissing-prototypes")
-       set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wbad-function-cast")
-       set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -pedantic")
--      set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -pedantic-errors")
-       check_c_compiler_flag("-fstack-protector-all" HAVE_STACK_PROTECTOR_ALL)
-       if(HAVE_STACK_PROTECTOR_ALL)
-               set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fstack-protector-all")
-@@ -280,9 +280,6 @@
-       add_definitions(-DHAVE_GETOPT)
-       set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wcast-qual")
- else()
--      if(CMAKE_COMPILER_IS_GNUCC)
--              set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-discarded-qualifiers")
--      endif()
-       if(CMAKE_C_COMPILER_ID STREQUAL "Clang")
-               set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-incompatible-pointer-types-discards-qualifiers")
-       endif()