From 44b095c66677cc13aedd687b35166b8b60e2f8f0 Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Dec 21 2021 09:09:02 +0000
Subject: import opencryptoki-3.16.0-7.el8_5


---

diff --git a/SOURCES/opencryptoki.module b/SOURCES/opencryptoki.module
deleted file mode 100644
index 4720c04..0000000
--- a/SOURCES/opencryptoki.module
+++ /dev/null
@@ -1,8 +0,0 @@
-# This file describes how to load the opensc module
-# See: http://p11-glue.freedesktop.org/doc/p11-kit/config.html
-
-# This is a relative path, which means it will be loaded from
-# the p11-kit default path which is usually $(libdir)/pkcs11.
-# Doing it this way allows for packagers to package opensc for
-# 32-bit and 64-bit and make them parallel installable
-module: libopencryptoki.so
diff --git a/SPECS/opencryptoki.spec b/SPECS/opencryptoki.spec
index e36a23c..fde0bac 100644
--- a/SPECS/opencryptoki.spec
+++ b/SPECS/opencryptoki.spec
@@ -1,12 +1,11 @@
 Name: opencryptoki
 Summary: Implementation of the PKCS#11 (Cryptoki) specification v2.11
 Version: 3.16.0
-Release: 5%{?dist}
+Release: 7%{?dist}
 License: CPL
 Group: System Environment/Base
 URL: https://github.com/opencryptoki/opencryptoki
 Source0: https://github.com/opencryptoki/%{name}/archive/v%{version}/%{name}-%{version}.tar.gz
-Source1: opencryptoki.module
 # https://bugzilla.redhat.com/show_bug.cgi?id=732756
 Patch0: opencryptoki-3.11.0-group.patch
 # bz#1373833, change tmpfiles snippets from /var/lock/* to /run/lock/*
@@ -217,7 +216,6 @@ make %{?_smp_mflags} CHGRP=/bin/true
 
 %install
 make install DESTDIR=$RPM_BUILD_ROOT CHGRP=/bin/true
-install -Dpm 644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/p11-kit/modules/opencryptoki.module
 
 # Remove unwanted cruft
 rm -f $RPM_BUILD_ROOT/%{_libdir}/%{name}/*.la
@@ -300,10 +298,6 @@ fi
 %{_libdir}/pkcs11/libopencryptoki.so
 %{_libdir}/pkcs11/PKCS11_API.so
 %{_libdir}/pkcs11/stdll
-# Co-owned with p11-kit
-%dir %{_datadir}/p11-kit/
-%dir %{_datadir}/p11-kit/modules/
-%{_datadir}/p11-kit/modules/opencryptoki.module
 
 %files devel
 %{_includedir}/%{name}/
@@ -360,6 +354,12 @@ fi
 
 
 %changelog
+* Mon Oct 18 2021 Than Ngo <than@redhat.com> - 3.16.0-7
+- Rebuilt
+
+* Mon Sep 13 2021 Than Ngo <than@redhat.com> - 3.16.0-6
+- Fix: Could not open /run/lock/opencryptoki/LCK..APIlock
+
 * Thu Aug 19 2021 Than Ngo <than@redhat.com> - 3.16.0-5
 - Resolves: #1987256, pkcstok_migrate leaves options with multiple strings in opencryptoki.conf options without double-quotes