- up to 2.2.1

diff --git a/install.patch b/install.patch
new file mode 100644 (file)
index 0000000..689a6f7
--- /dev/null
+++ b/install.patch
@@ -0,0 +1,26 @@
+--- yubico-piv-tool-2.2.1/cmake/options.cmake~ 2021-09-03 00:10:22.000000000 +0200
++++ yubico-piv-tool-2.2.1/cmake/options.cmake  2021-10-02 23:38:42.534617111 +0200
+@@ -50,19 +50,19 @@
+ 
+ # Set various install paths
+ if (NOT DEFINED YKPIV_INSTALL_LIB_DIR)
+-    set(YKPIV_INSTALL_LIB_DIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}" CACHE PATH "Installation directory for libraries")
++    set(YKPIV_INSTALL_LIB_DIR "${CMAKE_INSTALL_LIBDIR}" CACHE PATH "Installation directory for libraries")
+ endif ()
+ 
+ if (NOT DEFINED YKPIV_INSTALL_INC_DIR)
+-    set(YKPIV_INSTALL_INC_DIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_INCLUDEDIR}" CACHE PATH "Installation directory for headers")
++    set(YKPIV_INSTALL_INC_DIR "${CMAKE_INSTALL_INCLUDEDIR}" CACHE PATH "Installation directory for headers")
+ endif ()
+ 
+ if (NOT DEFINED YKPIV_INSTALL_BIN_DIR)
+-    set(YKPIV_INSTALL_BIN_DIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_BINDIR}" CACHE PATH "Installation directory for executables")
++    set(YKPIV_INSTALL_BIN_DIR "${CMAKE_INSTALL_BINDIR}" CACHE PATH "Installation directory for executables")
+ endif ()
+ 
+ if (NOT DEFINED YKPIV_INSTALL_MAN_DIR)
+-    set(YKPIV_INSTALL_MAN_DIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_MANDIR}" CACHE PATH "Installation directory for manual pages")
++    set(YKPIV_INSTALL_MAN_DIR "${CMAKE_INSTALL_MANDIR}" CACHE PATH "Installation directory for manual pages")
+ endif ()
+ 
+ if (NOT DEFINED YKPIV_INSTALL_PKGCONFIG_DIR)

diff --git a/openssl3.patch b/openssl3.patch
new file mode 100644 (file)
index 0000000..34718a6
--- /dev/null
+++ b/openssl3.patch
@@ -0,0 +1,13 @@
+--- yubico-piv-tool-2.2.1/ykcs11/openssl_types.h.orig  2021-09-03 00:10:22.000000000 +0200
++++ yubico-piv-tool-2.2.1/ykcs11/openssl_types.h       2021-10-02 23:25:06.526611292 +0200
+@@ -28,8 +28,8 @@
+  *
+  */
+ 
+-#ifndef OPENSSL_TYPES_H
+-#define OPENSSL_TYPES_H
++#ifndef YKCS_OPENSSL_TYPES_H
++#define YKCS_OPENSSL_TYPES_H
+ 
+ #include <openssl/bn.h>
+ #include <openssl/x509.h>

diff --git a/yubico-piv-tool.spec b/yubico-piv-tool.spec
index d3d2331f2dc950139293b20dd898dd2e650607d4..af19f6a9d210d0014536341be1977cffa1df0abe 100644 (file)
--- a/yubico-piv-tool.spec
+++ b/yubico-piv-tool.spec
@@ -6,14 +6,17 @@
 Summary:       Tool for interacting with the PIV applet on a YubiKey NEO
 Summary(pl.UTF-8):     Narzędzie do komunikacji z apletem PIV na YubiKey NEO
 Name:          yubico-piv-tool
-Version:       1.5.0
-Release:       3
+Version:       2.2.1
+Release:       1
 License:       BSD
 Group:         Applications
 Source0:       https://developers.yubico.com/yubico-piv-tool/Releases/%{name}-%{version}.tar.gz
-# Source0-md5: bcfec9fa2454ba7f7be6cc80632bd41f
+# Source0-md5: fdd64e16da13c464cfb0c7999b407cec
+Patch0:                openssl3.patch
+Patch1:                install.patch
 URL:           https://developers.yubico.com/yubico-piv-tool/
 %{?with_tests:BuildRequires:   check-devel >= 0.9.6}
+BuildRequires: gengetopt
 BuildRequires: help2man
 BuildRequires: openssl-devel
 BuildRequires: pcsc-lite-devel
@@ -88,28 +91,25 @@ pakiet zawiera biblioteki statyczne.
 
 %prep
 %setup -q
+%patch0 -p1
+%patch1 -p1
 
 %build
-%configure \
-       --with-backend="pcsc" \
-       --disable-silent-rules \
-       %{!?with_static_libs:--disable-static}
-
+mkdir -p build
+cd build
+%{cmake} ../ \
+       -DBACKEND="pcsc"
 %{__make}
 
 %if %{with tests}
-# disable valgrind, it catches some issues in bash
-%{__make} check \
-       LOG_COMPILER=
+%{__make} test
 %endif
 
 %install
 rm -rf $RPM_BUILD_ROOT
-%{__make} install \
+%{__make} -C build install \
        DESTDIR=$RPM_BUILD_ROOT
 
-%{__rm} $RPM_BUILD_ROOT%{_libdir}/lib{ykcs11,ykpiv}.la
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -118,16 +118,16 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc COPYING ChangeLog NEWS README doc/*.adoc
+%doc COPYING NEWS README doc/*.adoc
 %attr(755,root,root) %{_bindir}/yubico-piv-tool
 %{_mandir}/man1/yubico-piv-tool.1*
 
 %files libs
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libykpiv.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libykpiv.so.1
+%attr(755,root,root) %ghost %{_libdir}/libykpiv.so.2
 %attr(755,root,root) %{_libdir}/libykcs11.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libykcs11.so.1
+%attr(755,root,root) %ghost %{_libdir}/libykcs11.so.2
 
 %files devel
 %defattr(644,root,root,755)