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
This commit is contained in:
Dirk Mueller 2019-05-15 06:48:25 +00:00 committed by Git OBS Bridge
parent 15dbe7ce84
commit 54759f7fd0
2 changed files with 8 additions and 3 deletions

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Fri May 10 09:28:21 UTC 2019 - Dominique Leuenberger <dimstar@opensuse.org>
- Move RPM macros to %_rpmmacrodir.
-------------------------------------------------------------------
Fri Jun 15 04:09:24 UTC 2018 - fezhang@suse.com

View File

@ -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