Accepting request 708185 from home:dimstar:Factory

- Move rpm macros to %_rpmmacrodir.

OBS-URL: https://build.opensuse.org/request/show/708185
OBS-URL: https://build.opensuse.org/package/show/X11:common:Factory/update-desktop-files?expand=0&rev=66
This commit is contained in:
Stanislav Brabec 2019-06-18 23:09:45 +00:00 committed by Git OBS Bridge
parent ea359cb5bf
commit b36b48cbd7
2 changed files with 9 additions and 4 deletions

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Thu Jun 6 17:53:56 UTC 2019 - Dominique Leuenberger <dimstar@opensuse.org>
- Move rpm macros to %_rpmmacrodir.
-------------------------------------------------------------------
Wed Jun 20 12:21:36 UTC 2018 - fvogt@suse.com

View File

@ -1,7 +1,7 @@
#
# spec file for package update-desktop-files
#
# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -12,7 +12,7 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
# Please submit bugfixes or comments via http://bugs.opensuse.org/
# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
@ -75,7 +75,7 @@ sed -e '/awk/d' < %SOURCE4 > brp-extract-translations
%install
mkdir -p $RPM_BUILD_ROOT%_rpmconfigdir
install -m0755 %SOURCE0 %SOURCE1 $RPM_BUILD_ROOT%_rpmconfigdir
install -m0644 -D %SOURCE2 $RPM_BUILD_ROOT/etc/rpm/macros.%name
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
@ -83,7 +83,7 @@ install -m0755 -D %name/brp-extract-translations $RPM_BUILD_ROOT/usr/lib/rpm/brp
%defattr(-,root,root)
%_rpmconfigdir/*
%exclude %_rpmconfigdir/brp-suse.d
/etc/rpm/*
%_rpmmacrodir/*
%files -n brp-trim-translations
%defattr(-,root,root)