Accepting request 244776 from home:sfalken:branches:security

- Specfile Cleanup, Added directory macros in appropriate places

OBS-URL: https://build.opensuse.org/request/show/244776
OBS-URL: https://build.opensuse.org/package/show/security/openCryptoki?expand=0&rev=18
This commit is contained in:
Marcus Meissner 2014-09-02 14:33:18 +00:00 committed by Git OBS Bridge
parent d6c48bed19
commit f04f03e4fb
2 changed files with 18 additions and 13 deletions

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Fri Aug 15 02:14:21 UTC 2014 - sfalken@opensuse.org
- Specfile Cleanup, Added directory macros in appropriate places
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Jun 26 06:55:03 UTC 2014 - jjolly@suse.com Thu Jun 26 06:55:03 UTC 2014 - jjolly@suse.com

View File

@ -180,10 +180,10 @@ CFLAGS="$RPM_OPT_FLAGS -D__USE_BSD" ./configure \
%endif %endif
--sysconfdir=%{_sysconfdir} \ --sysconfdir=%{_sysconfdir} \
--localstatedir=%{_localstatedir} --localstatedir=%{_localstatedir}
make %__make
%install %install
make install DESTDIR=$RPM_BUILD_ROOT INSROOT=$RPM_BUILD_ROOT %make_install DESTDIR=$RPM_BUILD_ROOT INSROOT=$RPM_BUILD_ROOT
install -d $RPM_BUILD_ROOT/usr/include install -d $RPM_BUILD_ROOT/usr/include
install -d $RPM_BUILD_ROOT/var/lib/opencryptoki install -d $RPM_BUILD_ROOT/var/lib/opencryptoki
install -d $RPM_BUILD_ROOT/etc/init.d install -d $RPM_BUILD_ROOT/etc/init.d
@ -286,27 +286,27 @@ ln -sf %{_libdir}/opencryptoki/libopencryptoki.so /usr/lib/pkcs11/PKCS11_API.so6
%defattr(-,root,root) %defattr(-,root,root)
%doc openCryptoki-TFAQ.html %doc openCryptoki-TFAQ.html
# configuration directory # configuration directory
%dir /etc/opencryptoki %dir %{_sysconfdir}/opencryptoki
%config /etc/opencryptoki/opencryptoki.conf %config %{_sysconfdir}/opencryptoki/opencryptoki.conf
%ifarch s390 s390x %ifarch s390 s390x
%config /etc/opencryptoki/ep11tok.conf %config %{_sysconfdir}/opencryptoki/ep11tok.conf
/usr/sbin/pkcsep11_migrate %{_sbindir}/pkcsep11_migrate
%endif %endif
%if %{uses_systemd} %if %{uses_systemd}
/usr/lib/systemd/system/pkcsslotd.service %{_prefix}/lib/systemd/system/pkcsslotd.service
/usr/lib/tmpfiles.d/openCryptoki-tmp.conf %{_prefix}/lib/tmpfiles.d/openCryptoki-tmp.conf
%else %else
/etc/init.d/pkcsslotd %{_sysconfdir}/init.d/pkcsslotd
%ghost %dir %attr(770,root,pkcs11) %{_localstatedir}/lock/opencryptoki %ghost %dir %attr(770,root,pkcs11) %{_localstatedir}/lock/opencryptoki
%ghost %dir %attr(770,root,pkcs11) %{_localstatedir}/lock/opencryptoki/ccatok %ghost %dir %attr(770,root,pkcs11) %{_localstatedir}/lock/opencryptoki/ccatok
%ghost %dir %attr(770,root,pkcs11) %{_localstatedir}/lock/opencryptoki/swtok %ghost %dir %attr(770,root,pkcs11) %{_localstatedir}/lock/opencryptoki/swtok
%ghost %dir %attr(770,root,pkcs11) %{_localstatedir}/lock/opencryptoki/tpm %ghost %dir %attr(770,root,pkcs11) %{_localstatedir}/lock/opencryptoki/tpm
%endif %endif
/usr/sbin/rcpkcsslotd %{_sbindir}/rcpkcsslotd
# utilities # utilities
/usr/sbin/pkcsslotd %{_sbindir}/pkcsslotd
/usr/sbin/pkcsconf %{_sbindir}/pkcsconf
/usr/sbin/pkcsicsf %{_sbindir}/pkcsicsf
%dir %{_libdir}/opencryptoki %dir %{_libdir}/opencryptoki
%dir %{_libdir}/opencryptoki/stdll %dir %{_libdir}/opencryptoki/stdll
# State and lock directories # State and lock directories