Accepting request 703089 from Base:System

OBS-URL: https://build.opensuse.org/request/show/703089
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/p11-kit?expand=0&rev=33
This commit is contained in:
Dominique Leuenberger 2019-05-16 20:01:31 +00:00 committed by Git OBS Bridge
commit 22c8aeaf04
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 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 rm %{buildroot}%{_sysconfdir}/pkcs11/pkcs11.conf.example
find %{buildroot} -type f -name "*.la" -delete -print find %{buildroot} -type f -name "*.la" -delete -print
# #
install -d -m 755 %{buildroot}%{_sysconfdir}/rpm/ install -d -m 755 %{buildroot}%{_rpmmacrodir}
cat <<'FIN' >%{buildroot}%{_sysconfdir}/rpm/macros.%{name} cat <<'FIN' >%{buildroot}%{_rpmmacrodir}/macros.%{name}
# Macros from p11-kit package # Macros from p11-kit package
%%pkidir_cfg %{pkidir_cfg} %%pkidir_cfg %{pkidir_cfg}
%%pkidir_static %{pkidir_static} %%pkidir_static %{pkidir_static}
@ -178,7 +178,7 @@ make %{?_smp_mflags} check
%files devel %files devel
%defattr(-,root,root) %defattr(-,root,root)
%config %{_sysconfdir}/rpm/macros.%{name} %{_rpmmacrodir}/macros.%{name}
%{_includedir}/p11-kit-1/ %{_includedir}/p11-kit-1/
%{_libdir}/libp11-kit.so %{_libdir}/libp11-kit.so
%{_libdir}/pkgconfig/p11-kit-1.pc %{_libdir}/pkgconfig/p11-kit-1.pc