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
This commit is contained in:
Fabian Vogt 2022-12-07 08:57:44 +00:00 committed by Git OBS Bridge
parent 94d90edf12
commit 5aa250a785
2 changed files with 10 additions and 2 deletions

View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Tue Dec 6 17:07:08 UTC 2022 - Dominique Leuenberger <dimstar@opensuse.org>
- 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 <fvogt@suse.com> Tue Jul 7 14:42:29 UTC 2020 - Fabian Vogt <fvogt@suse.com>

View File

@ -1,7 +1,7 @@
# #
# spec file for package obs-service-kiwi_label_helper # 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 # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # 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. suse_label_helper:add_prefix element useful for building containers.
%prep %prep
%setup -q -D -T -n . %setup -q -D -T -c
cp %{SOURCE2} . cp %{SOURCE2} .
%build %build