From 0c5b62120425e7746c759e84c6a61f8638ee6c2f4ed2a73b20fc02047c10799d Mon Sep 17 00:00:00 2001 From: Wolfgang Rosenauer Date: Sat, 3 Aug 2019 08:03:51 +0000 Subject: [PATCH] - split hmac subpackages to match SLE's packaging OBS-URL: https://build.opensuse.org/package/show/mozilla:Factory/mozilla-nss?expand=0&rev=286 --- baselibs.conf | 2 ++ mozilla-nss.changes | 5 +++++ mozilla-nss.spec | 36 +++++++++++++++++++++++++++++++----- 3 files changed, 38 insertions(+), 5 deletions(-) diff --git a/baselibs.conf b/baselibs.conf index c5f3914..63dcb8f 100644 --- a/baselibs.conf +++ b/baselibs.conf @@ -5,9 +5,11 @@ mozilla-nss requires "mozilla-nss-certs-" libsoftokn3 requires "libfreebl3- = " +libsoftokn3-hmac +/usr/lib/libsoftokn3.chk +/usr/lib/libnssdbm3.chk libfreebl3 +libfreebl3-hmac +/lib/libfreebl3.chk +/lib/libfreeblpriv3.chk mozilla-nss-sysinit diff --git a/mozilla-nss.changes b/mozilla-nss.changes index 808e9fa..334c1fe 100644 --- a/mozilla-nss.changes +++ b/mozilla-nss.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Aug 2 14:43:24 UTC 2019 - Wolfgang Rosenauer + +- split hmac subpackages to match SLE's packaging + ------------------------------------------------------------------- Mon Jul 22 07:13:42 UTC 2019 - Martin Liška diff --git a/mozilla-nss.spec b/mozilla-nss.spec index d4a897c..0d0d292 100644 --- a/mozilla-nss.spec +++ b/mozilla-nss.spec @@ -2,7 +2,7 @@ # spec file for package mozilla-nss # # Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. -# Copyright (c) 2006-2018 Wolfgang Rosenauer +# Copyright (c) 2006-2019 Wolfgang Rosenauer # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -129,7 +129,7 @@ any system or user configured modules. %package -n libfreebl3 Summary: Freebl library for the Network Security Services Group: System/Libraries -Provides: libfreebl3-hmac +Recommends: libfreebl3-hmac = %{version}-%{release} %description -n libfreebl3 Network Security Services (NSS) is a set of libraries designed to @@ -141,11 +141,21 @@ certificates, and other security standards. This package installs the freebl library from NSS. +%package -n libfreebl3-hmac +Summary: Freebl library checksums for the Network Security Services +Group: System/Libraries +Requires: libfreebl3 = %{version}-%{release} + +%description -n libfreebl3-hmac +Checksums for libraries contained in the libfreebl3 package +used in the FIPS 140-2 mode. + + %package -n libsoftokn3 Summary: Network Security Services Softoken Module Group: System/Libraries Requires: libfreebl3 = %{version}-%{release} -Provides: libsoftokn3-hmac +Recommends: libsoftokn3-hmac = %{version}-%{release} %description -n libsoftokn3 Network Security Services (NSS) is a set of libraries designed to @@ -157,6 +167,16 @@ certificates, and other security standards. Network Security Services Softoken Cryptographic Module +%package -n libsoftokn3-hmac +Summary: Network Security Services Softoken Module checksums +Group: System/Libraries +Requires: libsoftokn3 = %{version}-%{release} + +%description -n libsoftokn3-hmac +Checksums for libraries contained in the libsoftokn3 package +used in the FIPS 140-2 mode. + + %package certs Summary: CA certificates for NSS Group: Productivity/Networking/Security @@ -390,15 +410,21 @@ fi %files -n libfreebl3 %defattr(-, root, root) /%{_lib}/libfreebl3.so -/%{_lib}/libfreebl3.chk /%{_lib}/libfreeblpriv3.so + +%files -n libfreebl3-hmac +%defattr(-, root, root) +/%{_lib}/libfreebl3.chk /%{_lib}/libfreeblpriv3.chk %files -n libsoftokn3 %defattr(-, root, root) %{_libdir}/libsoftokn3.so -%{_libdir}/libsoftokn3.chk %{_libdir}/libnssdbm3.so + +%files -n libsoftokn3-hmac +%defattr(-, root, root) +%{_libdir}/libsoftokn3.chk %{_libdir}/libnssdbm3.chk %files certs