From 239483735b19e5bf3b1ad0676892c7f3e8c5484b6262345de3cadba55d32b1af Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Fri, 11 Jun 2021 15:08:31 +0000 Subject: [PATCH] Accepting request 899461 from home:dimstar:Factory - Move /macros.fonts-config from /etc/rpm to %{_rpmmacrodir} (boo#1185657). - /var/adm/update-scripts is deprecated and will be removed at OBS-URL: https://build.opensuse.org/request/show/899461 OBS-URL: https://build.opensuse.org/package/show/M17N:fonts/fontpackages?expand=0&rev=41 --- fontpackages.changes | 8 +++++++- fontpackages.spec | 15 ++++++--------- 2 files changed, 13 insertions(+), 10 deletions(-) diff --git a/fontpackages.changes b/fontpackages.changes index 531f2c6..d2e44ce 100644 --- a/fontpackages.changes +++ b/fontpackages.changes @@ -1,7 +1,13 @@ +------------------------------------------------------------------- +Fri Jun 11 11:49:27 UTC 2021 - Dominique Leuenberger + +- Move /macros.fonts-config from /etc/rpm to %{_rpmmacrodir} + (boo#1185657). + ------------------------------------------------------------------- Tue Nov 21 15:14:15 CET 2017 - kukuk@suse.de -- /var/adm/update-scripts is deprecated and will be removed at +- /var/adm/update-scripts is deprecated and will be removed at some point in the future, since %posttrans support in libzypp was fixed with SLE12. Remove the workaround, only use the RPM posttrans to simplify the code and testing. diff --git a/fontpackages.spec b/fontpackages.spec index 0a691c2..e209877 100644 --- a/fontpackages.spec +++ b/fontpackages.spec @@ -1,7 +1,7 @@ # # spec file for package fontpackages # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2021 SUSE LLC # # 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/ # @@ -24,7 +24,6 @@ License: BSD-3-Clause Group: System/Base Source0: rpm-macros.fonts-config Source100: COPYING -BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch %description @@ -37,19 +36,17 @@ Group: Development/Tools/Building %description devel Development commons for font packages. - %prep %build cp %{SOURCE100} . %install -mkdir -p %{buildroot}%{_sysconfdir}/rpm -cp -a %{SOURCE0} %{buildroot}%{_sysconfdir}/rpm/macros.fonts-config +mkdir -p %{buildroot}%{_rpmmacrodir} +cp -a %{SOURCE0} %{buildroot}%{_rpmmacrodir}/macros.fonts-config %files devel -%defattr(-,root,root) -%doc COPYING -%config %{_sysconfdir}/rpm/macros.fonts-config +%license COPYING +%{_rpmmacrodir}/macros.fonts-config %changelog