Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Remove nss-prelink.conf.
Signed-off-by: Matti Kosola <matti.kosola@jolla.com>
  • Loading branch information
mkosola committed Jan 27, 2020
1 parent 42471f7 commit 98e1e7a
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 8 deletions.
2 changes: 0 additions & 2 deletions rpm/nss-prelink.conf

This file was deleted.

7 changes: 1 addition & 6 deletions rpm/nss.spec
Expand Up @@ -74,6 +74,7 @@ Source26: key4.db.xml
Source27: secmod.db.xml
Source28: nss-p11-kit.config


Patch1: nss-nolocalsql.patch
Patch2: add-relro-linker-option.patch
Patch3: renegotiate-transitional.patch
Expand Down Expand Up @@ -585,10 +586,6 @@ done
%{__install} -p -m 644 %{SOURCE14} $RPM_BUILD_ROOT/%{_sysconfdir}/pki/nssdb/key4.db
%{__install} -p -m 644 %{SOURCE15} $RPM_BUILD_ROOT/%{_sysconfdir}/pki/nssdb/pkcs11.txt

# prelink
#{__mkdir_p} $RPM_BUILD_ROOT/#{_sysconfdir}/prelink.conf.d
#{__install} -m 644 #{SOURCE14} $RPM_BUILD_ROOT/#{_sysconfdir}/prelink.conf.d/nss-prelink.conf

# Copy the development libraries we want
for file in libcrmf.a libnssb.a libnssckfw.a
do
Expand Down Expand Up @@ -679,8 +676,6 @@ update-crypto-policies &> /dev/null || :
%config(noreplace) %verify(not md5 size mtime) %{_sysconfdir}/pki/nssdb/key4.db
%config(noreplace) %verify(not md5 size mtime) %{_sysconfdir}/pki/nssdb/pkcs11.txt
%config(noreplace) %verify(not md5 size mtime) %{_sysconfdir}/crypto-policies/local.d/nss-p11-kit.config
#dir #{_sysconfdir}/prelink.conf.d
#config #{_sysconfdir}/prelink.conf.d/nss-prelink.conf
%dir %{unsupported_tools_directory}
%{unsupported_tools_directory}/shlibsign

Expand Down

0 comments on commit 98e1e7a

Please sign in to comment.