From 54759f7fd04e21ce522802ee3fa90217717bde0e5eed29b479438c95ca730df6 Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Wed, 15 May 2019 06:48:25 +0000 Subject: [PATCH] Accepting request 701963 from home:dimstar:Factory Move RPM macros to %_rpmmacrodir. OBS-URL: https://build.opensuse.org/request/show/701963 OBS-URL: https://build.opensuse.org/package/show/Base:System/p11-kit?expand=0&rev=32 --- p11-kit.changes | 5 +++++ p11-kit.spec | 6 +++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/p11-kit.changes b/p11-kit.changes index f19621f..b488982 100644 --- a/p11-kit.changes +++ b/p11-kit.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri May 10 09:28:21 UTC 2019 - Dominique Leuenberger + +- Move RPM macros to %_rpmmacrodir. + ------------------------------------------------------------------- Fri Jun 15 04:09:24 UTC 2018 - fezhang@suse.com diff --git a/p11-kit.spec b/p11-kit.spec index a2786b6..e89c60b 100644 --- a/p11-kit.spec +++ b/p11-kit.spec @@ -116,8 +116,8 @@ install -d %{buildroot}%{_sysconfdir}/pkcs11/modules rm %{buildroot}%{_sysconfdir}/pkcs11/pkcs11.conf.example find %{buildroot} -type f -name "*.la" -delete -print # -install -d -m 755 %{buildroot}%{_sysconfdir}/rpm/ -cat <<'FIN' >%{buildroot}%{_sysconfdir}/rpm/macros.%{name} +install -d -m 755 %{buildroot}%{_rpmmacrodir} +cat <<'FIN' >%{buildroot}%{_rpmmacrodir}/macros.%{name} # Macros from p11-kit package %%pkidir_cfg %{pkidir_cfg} %%pkidir_static %{pkidir_static} @@ -178,7 +178,7 @@ make %{?_smp_mflags} check %files devel %defattr(-,root,root) -%config %{_sysconfdir}/rpm/macros.%{name} +%{_rpmmacrodir}/macros.%{name} %{_includedir}/p11-kit-1/ %{_libdir}/libp11-kit.so %{_libdir}/pkgconfig/p11-kit-1.pc