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
This commit is contained in:
Fabian Vogt 2022-12-08 09:32:34 +00:00 committed by Git OBS Bridge
parent b97bddfeda
commit c9c5e798be
2 changed files with 11 additions and 5 deletions

View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Tue Dec 6 17:11:05 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 Jun 30 03:21:06 UTC 2020 - Stanislav Brabec <sbrabec@suse.com>

View File

@ -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)