Accepting request 995225 from home:dirkmueller:Factory

- light modernization of the spec file
- avoid bashism in post scripts (bsc#1195391)

OBS-URL: https://build.opensuse.org/request/show/995225
OBS-URL: https://build.opensuse.org/package/show/security:chipcard/coolkey?expand=0&rev=21
This commit is contained in:
Jason Sikes 2022-08-20 00:49:46 +00:00 committed by Git OBS Bridge
parent 145e237c68
commit da9c26ea10
2 changed files with 17 additions and 10 deletions

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Mon Aug 15 19:50:30 UTC 2022 - Dirk Müller <dmueller@suse.com>
- light modernization of the spec file
- avoid bashism in post scripts (bsc#1195391)
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Jul 24 23:02:16 UTC 2017 - jengelh@inai.de Mon Jul 24 23:02:16 UTC 2017 - jengelh@inai.de

View File

@ -1,7 +1,7 @@
# #
# spec file for package coolkey # spec file for package coolkey
# #
# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2022 SUSE LLC
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -12,7 +12,7 @@
# license that conforms to the Open Source Definition (Version 1.9) # license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative. # published by the Open Source Initiative.
# Please submit bugfixes or comments via http://bugs.opensuse.org/ # Please submit bugfixes or comments via https://bugs.opensuse.org/
# #
@ -22,9 +22,9 @@ Name: coolkey
Version: 1.1.0 Version: 1.1.0
Release: 0 Release: 0
Summary: CoolKey and CAC PKCS #11 PKI Module for Smart Cards Summary: CoolKey and CAC PKCS #11 PKI Module for Smart Cards
License: LGPL-2.1 License: LGPL-2.1-only
Group: Productivity/Security Group: Productivity/Security
Url: http://directory.fedoraproject.org/wiki/CoolKey URL: https://www.dogtagpki.org/wiki/CoolKey
Source: %{name}-%{version}.tar.gz Source: %{name}-%{version}.tar.gz
Source1: %{name}.rpmlintrc Source1: %{name}.rpmlintrc
Source2: baselibs.conf Source2: baselibs.conf
@ -132,7 +132,7 @@ export CXXFLAGS="%{optflags} -fno-strict-aliasing"
--with-debug\ --with-debug\
--disable-dependency-tracking\ --disable-dependency-tracking\
--enable-pk11install --enable-pk11install
make %{?_smp_mflags} %make_build
%install %install
%make_install %make_install
@ -141,11 +141,11 @@ ln -s pkcs11/libcoolkeypk11.so %{buildroot}/%{_libdir}
%triggerin -- mozilla-nss-sysinit mozilla-nss-tools %triggerin -- mozilla-nss-sysinit mozilla-nss-tools
if [ -x %{_bindir}/pk11install -a -x %{_bindir}/modutil -a -f %{_sysconfdir}/pki/nssdb/pkcs11.txt ]; then if [ -x %{_bindir}/pk11install -a -x %{_bindir}/modutil -a -f %{_sysconfdir}/pki/nssdb/pkcs11.txt ]; then
isThere=`modutil -rawlist -dbdir dbm:%{nssdb} | grep %{coolkey_module} || echo NO` isThere=`modutil -rawlist -dbdir dbm:%{nssdb} | grep %{coolkey_module} || echo NO`
if [ "$isThere" == "NO" ]; then if [ "$isThere" = "NO" ]; then
pk11install -l -p %{nssdb} 'name=%{coolkey_module} library=libcoolkeypk11.so' ||: pk11install -l -p %{nssdb} 'name=%{coolkey_module} library=libcoolkeypk11.so' ||:
fi fi
isThere=`modutil -rawlist -dbdir sql:%{nssdb} | grep %{coolkey_module} || echo NO` isThere=`modutil -rawlist -dbdir sql:%{nssdb} | grep %{coolkey_module} || echo NO`
if [ "$isThere" == "NO" ]; then if [ "$isThere" = "NO" ]; then
pk11install -s -p %{nssdb} 'name=%{coolkey_module} library=libcoolkeypk11.so' ||: pk11install -s -p %{nssdb} 'name=%{coolkey_module} library=libcoolkeypk11.so' ||:
fi fi
fi fi
@ -154,11 +154,11 @@ fi
/sbin/ldconfig /sbin/ldconfig
if [ -x %{_bindir}/pk11install -a -x %{_bindir}/modutil -a -f %{_sysconfdir}/pki/nssdb/pkcs11.txt ]; then if [ -x %{_bindir}/pk11install -a -x %{_bindir}/modutil -a -f %{_sysconfdir}/pki/nssdb/pkcs11.txt ]; then
isThere=`modutil -rawlist -dbdir dbm:%{nssdb} | grep %{coolkey_module} || echo NO` isThere=`modutil -rawlist -dbdir dbm:%{nssdb} | grep %{coolkey_module} || echo NO`
if [ "$isThere" == "NO" ]; then if [ "$isThere" = "NO" ]; then
pk11install -l -p %{nssdb} 'name=%{coolkey_module} library=libcoolkeypk11.so' ||: pk11install -l -p %{nssdb} 'name=%{coolkey_module} library=libcoolkeypk11.so' ||:
fi fi
isThere=`modutil -rawlist -dbdir sql:%{nssdb} | grep %{coolkey_module} || echo NO` isThere=`modutil -rawlist -dbdir sql:%{nssdb} | grep %{coolkey_module} || echo NO`
if [ "$isThere" == "NO" ]; then if [ "$isThere" = "NO" ]; then
pk11install -s -p %{nssdb} 'name=%{coolkey_module} library=libcoolkeypk11.so' ||: pk11install -s -p %{nssdb} 'name=%{coolkey_module} library=libcoolkeypk11.so' ||:
fi fi
fi fi
@ -171,7 +171,8 @@ if [ $1 -eq 0 -a -x %{_bindir}/modutil -a -f %{_sysconfdir}/pki/nssdb/pkcs11.txt
fi fi
%files %files
%doc ChangeLog LICENSE README %license LICENSE
%doc ChangeLog README
%{_bindir}/pk11install %{_bindir}/pk11install
%{_libdir}/libcoolkeypk11.so %{_libdir}/libcoolkeypk11.so
%{_libdir}/pkcs11/*.so %{_libdir}/pkcs11/*.so