From f64679bdf86e2cb9ff2efa166fab7c497d7669626249f42a5dda44de12c8b0e6 Mon Sep 17 00:00:00 2001 From: Dirk Stoecker Date: Mon, 31 Aug 2020 11:04:42 +0000 Subject: [PATCH] Accepting request 824478 from home:kukuk:branches:devel:languages:perl - Move macros.perl to /usr/lib/rpm/macros.d OBS-URL: https://build.opensuse.org/request/show/824478 OBS-URL: https://build.opensuse.org/package/show/devel:languages:perl/perl?expand=0&rev=190 --- perl.changes | 5 +++++ perl.spec | 6 +++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/perl.changes b/perl.changes index 5db8a1c..81f52ea 100644 --- a/perl.changes +++ b/perl.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Aug 5 09:19:11 UTC 2020 - Thorsten Kukuk + +- Move macros.perl to /usr/lib/rpm/macros.d + ------------------------------------------------------------------- Fri Jun 5 11:54:19 UTC 2020 - Callum Farmer diff --git a/perl.spec b/perl.spec index 0834852..88fdc78 100644 --- a/perl.spec +++ b/perl.spec @@ -1,7 +1,7 @@ # # spec file for package perl # -# Copyright (c) 2019 SUSE LLC +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -243,7 +243,7 @@ install -m 555 savelibperl.so $cpa/CORE/libperl.so install -m 444 saveConfig.pm $cpa/Config.pm install -m 444 saveConfig_heavy.pl $cpa/Config_heavy.pl # install macros.perl file -install -D -m 644 %{SOURCE2} %{buildroot}%{_sysconfdir}/rpm/macros.perl +install -D -m 644 %{SOURCE2} %{buildroot}%{_rpmconfigdir}/macros.d/macros.perl pushd %{_includedir} ( rpm -ql glibc-devel | fgrep '.h' find %{_includedir}/asm/ -name \*.h @@ -367,7 +367,7 @@ EOF %exclude %{_bindir}/perl%{pversion} %{_bindir}/* /usr/lib/perl5/* -%config %{_sysconfdir}/rpm/macros.perl +%{_rpmconfigdir}/macros.d/macros.perl %files doc %doc README.macros