From 4ad6d7a83b6a29def93f669041a71caf8856338fea407ca8ab50f3da8a55812a Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Wed, 12 Apr 2023 08:15:52 +0000 Subject: [PATCH] Accepting request 1078460 from home:dimstar:Factory - Also mark /usr/share/factory/var/lib/ca-certificates/ as writable by the user during install: allow rpm to properly execute %clean when completed. OBS-URL: https://build.opensuse.org/request/show/1078460 OBS-URL: https://build.opensuse.org/package/show/Base:System/ca-certificates-mozilla?expand=0&rev=127 --- ca-certificates-mozilla-prebuilt.changes | 7 +++++++ ca-certificates-mozilla-prebuilt.spec | 4 ++-- ca-certificates-mozilla.spec | 2 +- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/ca-certificates-mozilla-prebuilt.changes b/ca-certificates-mozilla-prebuilt.changes index 0dc2807..d39ab36 100644 --- a/ca-certificates-mozilla-prebuilt.changes +++ b/ca-certificates-mozilla-prebuilt.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Tue Apr 11 14:05:12 UTC 2023 - Dominique Leuenberger + +- Also mark /usr/share/factory/var/lib/ca-certificates/ as writable + by the user during install: allow rpm to properly execute %clean + when completed. + ------------------------------------------------------------------- Tue Aug 30 10:23:35 UTC 2022 - Dominique Leuenberger diff --git a/ca-certificates-mozilla-prebuilt.spec b/ca-certificates-mozilla-prebuilt.spec index 057832e..d0a1b91 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) 2022 SUSE LLC +# Copyright (c) 2023 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -59,7 +59,7 @@ ln -s /var/lib/ca-certificates/ca-bundle.pem %{buildroot}/etc/ssl/ca-bundle.pem mkdir -p %{buildroot}/usr/share/factory/var/lib cp -a /var/lib/ca-certificates %{buildroot}/usr/share/factory/var/lib # need rpm needs to be able to delete the buildroot -chmod u+w %{buildroot}/usr/share/factory/var/lib/ca-certificates/* +chmod u+w %{buildroot}/usr/share/factory/var/lib/ca-certificates{,/*} mkdir -p %{buildroot}%{_tmpfilesdir} echo "C /var/lib/ca-certificates" > %{buildroot}%{_tmpfilesdir}/%{name}.conf diff --git a/ca-certificates-mozilla.spec b/ca-certificates-mozilla.spec index 21db3c5..2e2564b 100644 --- a/ca-certificates-mozilla.spec +++ b/ca-certificates-mozilla.spec @@ -1,7 +1,7 @@ # # spec file for package ca-certificates-mozilla # -# Copyright (c) 2022 SUSE LLC +# Copyright (c) 2023 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed