[packages/yubico-piv-tool] up to 2.3.0
atler
atler at pld-linux.org
Tue Nov 29 17:56:58 CET 2022
commit 3b9f586b7c521aab981e3383a825a55b0b741779
Author: Jan Palus <atler at pld-linux.org>
Date: Tue Nov 29 17:56:02 2022 +0100
up to 2.3.0
- disable tests until next release is made (fail to compile with gcc 12
due to -Werror)
install.patch | 26 --------------------------
openssl3.patch | 13 -------------
yubico-piv-tool.spec | 11 ++++-------
3 files changed, 4 insertions(+), 46 deletions(-)
---
diff --git a/yubico-piv-tool.spec b/yubico-piv-tool.spec
index 1d86920..41fa5f9 100644
--- a/yubico-piv-tool.spec
+++ b/yubico-piv-tool.spec
@@ -1,19 +1,18 @@
#
# Conditional build:
%bcond_without static_libs # static library
-%bcond_without tests # unit tests
+%bcond_with tests # unit tests
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: 2.2.1
+# toggle tests on upgrade
+Version: 2.3.0
Release: 1
License: BSD
Group: Applications
Source0: https://developers.yubico.com/yubico-piv-tool/Releases/%{name}-%{version}.tar.gz
-# Source0-md5: fdd64e16da13c464cfb0c7999b407cec
-Patch0: openssl3.patch
-Patch1: install.patch
+# Source0-md5: b05ccce29454183f7f58dea00ef169e2
URL: https://developers.yubico.com/yubico-piv-tool/
BuildRequires: check-devel >= 0.9.6
BuildRequires: gengetopt
@@ -91,8 +90,6 @@ pakiet zawiera biblioteki statyczne.
%prep
%setup -q
-%patch0 -p1
-%patch1 -p1
%build
mkdir -p build
diff --git a/install.patch b/install.patch
deleted file mode 100644
index 689a6f7..0000000
--- a/install.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- 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
deleted file mode 100644
index 34718a6..0000000
--- a/openssl3.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- 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>
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/yubico-piv-tool.git/commitdiff/3b9f586b7c521aab981e3383a825a55b0b741779
More information about the pld-cvs-commit
mailing list