From 5aa250a78530e879f201009ebb34e9b9906d8e7de940b41ade342d255b583926 Mon Sep 17 00:00:00 2001 From: Fabian Vogt Date: Wed, 7 Dec 2022 08:57:44 +0000 Subject: [PATCH] Accepting request 1040878 from home:dimstar:Factory - Do not ever use "%setup -n .": rpm 4.18 tries to be cleaner and remove stuff it extraced, which would lead to 'rm -rf .', which rm does not like. Use "%setup -c" instead, which creates the appropriate %{name}-%{version} directory expected. OBS-URL: https://build.opensuse.org/request/show/1040878 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/obs-service-kiwi_label_helper?expand=0&rev=8 --- obs-service-kiwi_label_helper.changes | 8 ++++++++ obs-service-kiwi_label_helper.spec | 4 ++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/obs-service-kiwi_label_helper.changes b/obs-service-kiwi_label_helper.changes index e0b81a7..002e000 100644 --- a/obs-service-kiwi_label_helper.changes +++ b/obs-service-kiwi_label_helper.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Tue Dec 6 17:07:08 UTC 2022 - Dominique Leuenberger + +- Do not ever use "%setup -n .": rpm 4.18 tries to be cleaner and + remove stuff it extraced, which would lead to 'rm -rf .', which + rm does not like. Use "%setup -c" instead, which creates the + appropriate %{name}-%{version} directory expected. + ------------------------------------------------------------------- Tue Jul 7 14:42:29 UTC 2020 - Fabian Vogt diff --git a/obs-service-kiwi_label_helper.spec b/obs-service-kiwi_label_helper.spec index 7292170..e462529 100644 --- a/obs-service-kiwi_label_helper.spec +++ b/obs-service-kiwi_label_helper.spec @@ -1,7 +1,7 @@ # # spec file for package obs-service-kiwi_label_helper # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2022 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -35,7 +35,7 @@ This service can be used during buildtime to implement the suse_label_helper:add_prefix element useful for building containers. %prep -%setup -q -D -T -n . +%setup -q -D -T -c cp %{SOURCE2} . %build