From 9ded637636db7d3bdc460a7e4ecea6971d0ff574c49f03cdef4005bb328bde40 Mon Sep 17 00:00:00 2001
From: Karol Babioch <karol@babioch.de>
Date: Fri, 28 Sep 2018 09:27:16 +0000
Subject: [PATCH] Accepting request 638984 from home:jengelh:branches:security

- Rename %soname to %sover to better reflect its use.
- Fix RPM groups.

OBS-URL: https://build.opensuse.org/request/show/638984
OBS-URL: https://build.opensuse.org/package/show/security/yubico-piv-tool?expand=0&rev=26
---
 yubico-piv-tool.changes |  6 +++++
 yubico-piv-tool.spec    | 50 ++++++++++++++++++++---------------------
 2 files changed, 31 insertions(+), 25 deletions(-)

diff --git a/yubico-piv-tool.changes b/yubico-piv-tool.changes
index 85ed4ee..34f84bb 100644
--- a/yubico-piv-tool.changes
+++ b/yubico-piv-tool.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Sep 28 09:10:38 UTC 2018 - Jan Engelhardt <jengelh@inai.de>
+
+- Rename %soname to %sover to better reflect its use.
+- Fix RPM groups.
+
 -------------------------------------------------------------------
 Thu Sep 27 11:58:29 UTC 2018 - Karol Babioch <kbabioch@suse.com>
 
diff --git a/yubico-piv-tool.spec b/yubico-piv-tool.spec
index d912f58..395c584 100644
--- a/yubico-piv-tool.spec
+++ b/yubico-piv-tool.spec
@@ -16,7 +16,7 @@
 #
 
 
-%define soname  1
+%define sover  1
 Name:           yubico-piv-tool
 Version:        1.6.2
 Release:        0
@@ -32,43 +32,43 @@ BuildRequires:  pcsc-lite-devel
 BuildRequires:  pkgconfig
 BuildRequires:  valgrind
 BuildRequires:  pkgconfig(openssl)
-Requires:       libykcs11-%{soname} = %{version}
-Requires:       libykpiv%{soname} = %{version}
+Requires:       libykcs11-%{sover} = %{version}
+Requires:       libykpiv%{sover} = %{version}
 
 %description
 This is a command line tool to interact with the PIV applet on a YubiKey NEO.
 Among other functions it supports, generating keys on device, importing keys
 and certificates and creating certificate requests.
 
-%package     -n libykpiv%{soname}
+%package     -n libykpiv%{sover}
 Summary:        Yubikey NEO PIV applet library
-Group:          Productivity/Networking/Security
+Group:          System/Libraries
 Requires:       pcsc-ccid
 
-%description -n libykpiv%{soname}
+%description -n libykpiv%{sover}
 This is a low-level library to interact the PIV applet on a YubiKey NEO
 
-%package     -n libykcs11-%{soname}
+%package     -n libykcs11-%{sover}
 Summary:        Yubikey NEO PKCS#11 applet library
-Group:          Productivity/Networking/Security
+Group:          System/Libraries
 Requires:       pcsc-ccid
 
-%description -n libykcs11-%{soname}
+%description -n libykcs11-%{sover}
 This is a PKCS#11 module that allows to communicate with the PIV application running on a YubiKey
 
 %package     -n libykpiv-devel
-Summary:        Development files for Yubikey NEO PIV applet library
+Summary:        Development files for the Yubikey NEO PIV applet library
 Group:          Development/Libraries/C and C++
-Requires:       libykpiv%{soname} = %{version}
+Requires:       libykpiv%{sover} = %{version}
 
 %description -n libykpiv-devel
 This package contains the header file needed to develop applications that use
 Yubikey NEO PIV applet library.
 
 %package     -n libykcs11-devel
-Summary:        Development files for Yubikey NEO PKCS#11 applet library
+Summary:        Development files for the Yubikey NEO PKCS#11 applet library
 Group:          Development/Libraries/C and C++
-Requires:       libykcs11-%{soname} = %{version}
+Requires:       libykcs11-%{sover} = %{version}
 
 %description -n libykcs11-devel
 This package contains the header file needed to develop applications that use
@@ -78,17 +78,17 @@ Yubikey NEO PKCS#11 applet library.
 %setup -q
 
 %build
-%configure --enable-static=no --with-backend=pcsc
+%configure --disable-static --with-backend=pcsc
 make %{?_smp_mflags}
 
 %install
-make install DESTDIR=%{buildroot} INSTALL="install -p"
+%make_install INSTALL="install -p"
 find %{buildroot} -type f -name "*.la" -delete -print
 
-%post -n libykpiv%{soname} -p /sbin/ldconfig
-%postun -n libykpiv%{soname} -p /sbin/ldconfig
-%post -n libykcs11-%{soname} -p /sbin/ldconfig
-%postun -n libykcs11-%{soname} -p /sbin/ldconfig
+%post -n libykpiv%{sover} -p /sbin/ldconfig
+%postun -n libykpiv%{sover} -p /sbin/ldconfig
+%post -n libykcs11-%{sover} -p /sbin/ldconfig
+%postun -n libykcs11-%{sover} -p /sbin/ldconfig
 
 %files
 %license COPYING
@@ -96,13 +96,13 @@ find %{buildroot} -type f -name "*.la" -delete -print
 %{_bindir}/%{name}
 %{_mandir}/man1/*
 
-%files -n libykpiv%{soname}
-%{_libdir}/libykpiv.so.%{soname}
-%{_libdir}/libykpiv.so.%{soname}.4.4
+%files -n libykpiv%{sover}
+%{_libdir}/libykpiv.so.%{sover}
+%{_libdir}/libykpiv.so.%{sover}.4.4
 
-%files -n libykcs11-%{soname}
-%{_libdir}/libykcs11.so.%{soname}
-%{_libdir}/libykcs11.so.%{soname}.4.4
+%files -n libykcs11-%{sover}
+%{_libdir}/libykcs11.so.%{sover}
+%{_libdir}/libykcs11.so.%{sover}.4.4
 
 %files -n libykpiv-devel
 %dir %{_includedir}/ykpiv/