From 18b4bc7a49043dd48a6b26eb96b775f21a74895ad73b172169bedfb23a325d35 Mon Sep 17 00:00:00 2001 From: Fabian Vogt Date: Fri, 7 Oct 2022 12:41:00 +0000 Subject: [PATCH 1/2] Accepting request 1008775 from home:cboltz:branches:openSUSE:Tools Fix syntax error OBS-URL: https://build.opensuse.org/request/show/1008775 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/obs-service-docker_label_helper?expand=0&rev=8 --- README | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README b/README index 5bd9e89..f858ee6 100644 --- a/README +++ b/README @@ -23,7 +23,7 @@ FROM opensuse/tumbleweed LABEL org.opencontainers.image.title="Example container" LABEL org.opencontainers.image.description="This contains nano" # endlabelprefix -LABEL not.expanded.label="example +LABEL not.expanded.label="example" ``` expands to From 155965c6503a67ba8818a6d7bdb7476628168172a5a0bc74a5add7838488d5b1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Thu, 8 Dec 2022 14:45:22 +0000 Subject: [PATCH 2/2] Accepting request 1040902 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/1040902 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/obs-service-docker_label_helper?expand=0&rev=9 --- obs-service-docker_label_helper.changes | 8 ++++++++ obs-service-docker_label_helper.spec | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/obs-service-docker_label_helper.changes b/obs-service-docker_label_helper.changes index 13fa4c5..8b99c1c 100644 --- a/obs-service-docker_label_helper.changes +++ b/obs-service-docker_label_helper.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Wed Dec 7 09:48:52 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. + ------------------------------------------------------------------- Thu Jul 21 12:50:28 UTC 2022 - Fabian Vogt diff --git a/obs-service-docker_label_helper.spec b/obs-service-docker_label_helper.spec index 2396738..48ea673 100644 --- a/obs-service-docker_label_helper.spec +++ b/obs-service-docker_label_helper.spec @@ -37,7 +37,7 @@ An OBS service which expands LABEL instructions in Dockerfile with prefixes. Useful for implementing https://en.opensuse.org/Building_derived_containers#Labels. %prep -%setup -q -D -T -n . +%setup -q -D -T -c cp %{SOURCE2} . %build