From c9c5e798be4cd589848ea98f9f2808534ed46b57538cdbec9919928570b6a878 Mon Sep 17 00:00:00 2001 From: Fabian Vogt Date: Thu, 8 Dec 2022 09:32:34 +0000 Subject: [PATCH] Accepting request 1040877 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/1040877 OBS-URL: https://build.opensuse.org/package/show/X11:common:Factory/update-desktop-files?expand=0&rev=72 --- update-desktop-files.changes | 8 ++++++++ update-desktop-files.spec | 8 +++----- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/update-desktop-files.changes b/update-desktop-files.changes index cca2e8d..e3d7a6d 100644 --- a/update-desktop-files.changes +++ b/update-desktop-files.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Tue Dec 6 17:11:05 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 Jun 30 03:21:06 UTC 2020 - Stanislav Brabec diff --git a/update-desktop-files.spec b/update-desktop-files.spec index dffcbad..40d0b6e 100644 --- a/update-desktop-files.spec +++ b/update-desktop-files.spec @@ -1,7 +1,7 @@ # # spec file for package update-desktop-files # -# 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 @@ -64,9 +64,7 @@ Extract translations from all desktop files, polkit actions, mimetype descriptio and AppStream metainfo found in build root %prep -%setup -q -n . -D -T 0 -mkdir %name -cd %name +%setup -q -D -T 0 -c # supi hack sed -e '/awk/d' < %SOURCE4 > brp-extract-translations @@ -77,7 +75,7 @@ mkdir -p $RPM_BUILD_ROOT%_rpmconfigdir install -m0755 %SOURCE0 %SOURCE1 $RPM_BUILD_ROOT%_rpmconfigdir install -m0644 -D %SOURCE2 $RPM_BUILD_ROOT%_rpmmacrodir/macros.%name install -m0755 -D %SOURCE4 $RPM_BUILD_ROOT/usr/lib/rpm/brp-suse.d/brp-70-trim-translations -install -m0755 -D %name/brp-extract-translations $RPM_BUILD_ROOT/usr/lib/rpm/brp-suse.d/brp-70-extract-translations +install -m0755 -D brp-extract-translations $RPM_BUILD_ROOT/usr/lib/rpm/brp-suse.d/brp-70-extract-translations %files %defattr(-,root,root)