From 4c0898964562e40f1f226cebb940b1c9836e38ff Mon Sep 17 00:00:00 2001
From: Bob Relyea <rrelyea@redhat.com>
Date: Tue, 22 Jun 2021 19:37:34 -0700
Subject: [PATCH] Related: rhbz#1972928 - only include nspr man pages in
 nspr-devel

---
 nss-gcm-param-default-pkcs11v2.patch | 21 ---------------------
 nss.spec                             | 11 +++++++----
 2 files changed, 7 insertions(+), 25 deletions(-)
 delete mode 100644 nss-gcm-param-default-pkcs11v2.patch

diff --git a/nss-gcm-param-default-pkcs11v2.patch b/nss-gcm-param-default-pkcs11v2.patch
deleted file mode 100644
index 2d6cba8..0000000
--- a/nss-gcm-param-default-pkcs11v2.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -up ./lib/util/pkcs11n.h.aes_gcm_pkcs11_v2 ./lib/util/pkcs11n.h
---- ./lib/util/pkcs11n.h.aes_gcm_pkcs11_v2	2020-05-13 13:44:11.312405744 -0700
-+++ ./lib/util/pkcs11n.h	2020-05-13 13:45:23.951723660 -0700
-@@ -605,7 +605,7 @@ typedef struct CK_NSS_GCM_PARAMS {
- typedef CK_NSS_GCM_PARAMS CK_PTR CK_NSS_GCM_PARAMS_PTR;
- 
- /* deprecated #defines. Drop in future NSS releases */
--#ifdef NSS_PKCS11_2_0_COMPAT
-+#ifndef NSS_PKCS11_3_0_STRICT
- 
- /* defines that were changed between NSS's PKCS #11 and the Oasis headers */
- #define CKF_EC_FP CKF_EC_F_P
-@@ -664,7 +664,7 @@ typedef CK_NSS_GCM_PARAMS CK_PTR CK_GCM_
- #define CKT_NETSCAPE_VALID CKT_NSS_VALID
- #define CKT_NETSCAPE_VALID_DELEGATOR CKT_NSS_VALID_DELEGATOR
- #else
--/* use the new CK_GCM_PARAMS if NSS_PKCS11_2_0_COMPAT is not defined */
-+/* use the new CK_GCM_PARAMS if NSS_PKCS11_3_0_STRICT is defined */
- typedef struct CK_GCM_PARAMS_V3 CK_GCM_PARAMS;
- typedef CK_GCM_PARAMS_V3 CK_PTR CK_GCM_PARAMS_PTR;
- #endif
diff --git a/nss.spec b/nss.spec
index 61d8b21..e1f5134 100644
--- a/nss.spec
+++ b/nss.spec
@@ -2,7 +2,7 @@
 # NOTE: To avoid NVR clashes of nspr* packages:
 # - reset %%{nspr_release} to 1, when updating %%{nspr_version}
 # - increment %%{nspr_version}, when updating the NSS part only
-%global nspr_release 1
+%global nspr_release 2
 %global nss_version 3.67.0
 # only need to update this as we added new
 # algorithms under nss policy control
@@ -56,7 +56,7 @@ rpm.define(string.format("nss_release_tag NSS_%s_RTM",
 Summary:          Network Security Services
 Name:             nss
 Version:          %{nss_version}
-Release:          3%{?dist}
+Release:          4%{?dist}
 License:          MPLv2.0
 URL:              http://www.mozilla.org/projects/security/pki/nss/
 Requires:         nspr >= %{nspr_version}
@@ -1068,11 +1068,14 @@ update-crypto-policies &> /dev/null || :
 %{_includedir}/nspr4
 %{_libdir}/pkgconfig/nspr.pc
 %{_bindir}/nspr-config
-%{_mandir}/man*/*
+%doc %{_mandir}/man1/nspr-config.*
 
 
 %changelog
-* Fri Jun 18 2021 Bob Relyea <rrelyea@redhat.com> - 3.67.0-1
+* Fri Jun 18 2021 Bob Relyea <rrelyea@redhat.com> - 3.67.0-4
+- update nspr man page files to only pick up nspr man pages
+
+* Fri Jun 18 2021 Bob Relyea <rrelyea@redhat.com> - 3.67.0-3
 - Update NSS to 3.67
 - Update NSPR to 2.31
 - pick up rhel coverity patches which have not yet been pushed upstream.