From a9004f00a602ebefc8f17b954e5183e6ca2bd770beccb7bcaa24a90221bdadea Mon Sep 17 00:00:00 2001 From: Martin Wilck Date: Fri, 10 May 2019 13:22:47 +0000 Subject: [PATCH] Accepting request 701955 from home:dimstar:Factory Move RPM macros to %_rpmmacrodir. OBS-URL: https://build.opensuse.org/request/show/701955 OBS-URL: https://build.opensuse.org/package/show/Base:System/suse-module-tools?expand=0&rev=65 --- suse-module-tools.changes | 5 +++++ suse-module-tools.spec | 6 +++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/suse-module-tools.changes b/suse-module-tools.changes index 815e738..4bac7d6 100644 --- a/suse-module-tools.changes +++ b/suse-module-tools.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri May 10 09:18:57 UTC 2019 - Dominique Leuenberger + +- Move RPM macros to %_rpmmacrodir. + ------------------------------------------------------------------- Thu Mar 14 16:02:23 UTC 2019 - mwilck@suse.com diff --git a/suse-module-tools.spec b/suse-module-tools.spec index 541842e..9950c08 100644 --- a/suse-module-tools.spec +++ b/suse-module-tools.spec @@ -102,8 +102,8 @@ install -pm 755 weak-modules{,2} "%{buildroot}%{_libexecdir}/module-init-tools/" install -pm 755 driver-check.sh "%{buildroot}%{_libexecdir}/module-init-tools/" # rpm macros and helper -install -d -m 755 "%{buildroot}%{_sysconfdir}/rpm" -install -pm 644 "macros.initrd" "%{buildroot}%{_sysconfdir}/rpm/" +install -d -m 755 "%{buildroot}%{_rpmmacrodir}" +install -pm 644 "macros.initrd" "%{buildroot}%{_rpmmacrodir}" install -pm 755 "regenerate-initrd-posttrans" "%{buildroot}%{_libexecdir}/module-init-tools/" install -d -m 755 "%{buildroot}%{_prefix}/bin" @@ -247,7 +247,7 @@ done %config(noreplace) %{_sysconfdir}/modprobe.d/99-local.conf %dir %{_sysconfdir}/depmod.d %config %{_sysconfdir}/depmod.d/00-system.conf -%config %{_sysconfdir}/rpm/macros.initrd +%{_rpmmacrodir}/macros.initrd %{_bindir}/modhash %{_bindir}/kmp-install %{_libexecdir}/module-init-tools