diff --git a/ca-certificates-mozilla-prebuilt.spec b/ca-certificates-mozilla-prebuilt.spec index 0c06947..21b40c4 100644 --- a/ca-certificates-mozilla-prebuilt.spec +++ b/ca-certificates-mozilla-prebuilt.spec @@ -1,7 +1,7 @@ # # spec file for package ca-certificates-mozilla-prebuilt # -# Copyright (c) 2024 SUSE LLC +# Copyright (c) 2025 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed diff --git a/ca-certificates-mozilla.changes b/ca-certificates-mozilla.changes index cd2e81d..d5d6b9f 100644 --- a/ca-certificates-mozilla.changes +++ b/ca-certificates-mozilla.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Jan 23 08:23:15 UTC 2025 - Steve Kowalik + +- Define two macros to break a build cycle with p11-kit. + ------------------------------------------------------------------- Sun Dec 15 21:07:58 UTC 2024 - Dirk Müller diff --git a/ca-certificates-mozilla.spec b/ca-certificates-mozilla.spec index 1ec35ab..307bc84 100644 --- a/ca-certificates-mozilla.spec +++ b/ca-certificates-mozilla.spec @@ -1,7 +1,7 @@ # # spec file for package ca-certificates-mozilla # -# Copyright (c) 2024 SUSE LLC +# Copyright (c) 2025 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -33,6 +33,9 @@ %endif %endif # +# Taken from p11-kit, to avoid a build cycle +%define pkidir_static %{_datadir}/pki +%define trustdir_static %{pkidir_static}/trust %define certdir %{trustdir_static} Name: ca-certificates-mozilla # Version number is NSS_BUILTINS_LIBRARY_VERSION in this file: @@ -61,11 +64,10 @@ Source11: %{name}.COPYING Source12: compareoldnew BuildRequires: ca-certificates BuildRequires: openssl -BuildRequires: p11-kit-devel BuildRequires: python3-base # for update-ca-certificates Requires(post): ca-certificates -Requires(postun):ca-certificates +Requires(postun): ca-certificates # # replaces this package from SLE11 times Obsoletes: openssl-certs < %version