rpms/nss
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Remove prelink.conf as prelink was removed in F24

Browse Source 
Suggested by Harald Reindl in:
https://bugzilla.redhat.com/show_bug.cgi?id=1659674
This commit is contained in:
Daiki Ueno 2018-12-18 16:17:30 +01:00
parent 5221baae09
commit b250b65666
2 changed files with 5 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
nss-softokn-prelink.conf
View File

@ -1,6 +0,0 @@
-b /lib{,64}/libfreeblpriv3.so
-b /lib{,64}/libsoftokn3.so
-b /lib{,64}/libnssdbm3.so
-b /usr/lib{,64}/libfreeblpriv3.so
-b /usr/lib{,64}/libsoftokn3.so
-b /usr/lib{,64}/libnssdbm3.so

13
nss.spec
View File

@ -2,7 +2,6 @@
%global nss_version 3.41.0 %global nss_version 3.41.0
%global unsupported_tools_directory %{_libdir}/nss/unsupported-tools %global unsupported_tools_directory %{_libdir}/nss/unsupported-tools
%global saved_files_dir %{_libdir}/nss/saved %global saved_files_dir %{_libdir}/nss/saved
%global prelink_conf_dir %{_sysconfdir}/prelink.conf.d/
%global dracutlibdir %{_prefix}/lib/dracut %global dracutlibdir %{_prefix}/lib/dracut
%global dracut_modules_dir %{dracutlibdir}/modules.d/05nss-softokn/ %global dracut_modules_dir %{dracutlibdir}/modules.d/05nss-softokn/
%global dracut_conf_dir %{dracutlibdir}/dracut.conf.d %global dracut_conf_dir %{dracutlibdir}/dracut.conf.d
@ -44,7 +43,7 @@ rpm.define(string.format("nss_release_tag NSS_%s_RTM",
Summary: Network Security Services Summary: Network Security Services
Name: nss Name: nss
Version: %{nss_version} Version: %{nss_version}
Release: 1%{?dist} Release: 2%{?dist}
License: MPLv2.0 License: MPLv2.0
URL: http://www.mozilla.org/projects/security/pki/nss/ URL: http://www.mozilla.org/projects/security/pki/nss/
Requires: nspr >= %{nspr_version} Requires: nspr >= %{nspr_version}
@ -70,7 +69,6 @@ Source1: nss-util.pc.in
Source2: nss-util-config.in Source2: nss-util-config.in
Source3: nss-softokn.pc.in Source3: nss-softokn.pc.in
Source4: nss-softokn-config.in Source4: nss-softokn-config.in
Source5: nss-softokn-prelink.conf
Source6: nss-softokn-dracut-module-setup.sh Source6: nss-softokn-dracut-module-setup.sh
Source7: nss-softokn-dracut.conf Source7: nss-softokn-dracut.conf
Source8: nss.pc.in Source8: nss.pc.in
@ -200,7 +198,6 @@ Requires: nspr >= 4.12
# For NSS_SecureMemcmpZero() from nss-util >= 3.33 # For NSS_SecureMemcmpZero() from nss-util >= 3.33
Requires: nss-util >= 3.33 Requires: nss-util >= 3.33
Conflicts: nss < 3.12.2.99.3-5 Conflicts: nss < 3.12.2.99.3-5
Conflicts: prelink < 0.4.3
Conflicts: filesystem < 3 Conflicts: filesystem < 3
%description softokn-freebl %description softokn-freebl
@ -522,7 +519,6 @@ mkdir -p $RPM_BUILD_ROOT/%{_libdir}
mkdir -p $RPM_BUILD_ROOT/%{unsupported_tools_directory} mkdir -p $RPM_BUILD_ROOT/%{unsupported_tools_directory}
mkdir -p $RPM_BUILD_ROOT/%{_libdir}/pkgconfig mkdir -p $RPM_BUILD_ROOT/%{_libdir}/pkgconfig
mkdir -p $RPM_BUILD_ROOT/%{saved_files_dir} mkdir -p $RPM_BUILD_ROOT/%{saved_files_dir}
mkdir -p $RPM_BUILD_ROOT/%{prelink_conf_dir}
mkdir -p $RPM_BUILD_ROOT/%{dracut_modules_dir} mkdir -p $RPM_BUILD_ROOT/%{dracut_modules_dir}
mkdir -p $RPM_BUILD_ROOT/%{dracut_conf_dir} mkdir -p $RPM_BUILD_ROOT/%{dracut_conf_dir}
mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/crypto-policies/local.d mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/crypto-policies/local.d
@ -533,7 +529,6 @@ mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/crypto-policies/local.d
mkdir -p $RPM_BUILD_ROOT%{_datadir}/doc/nss-tools mkdir -p $RPM_BUILD_ROOT%{_datadir}/doc/nss-tools
%endif %endif
install -m 644 %{SOURCE5} $RPM_BUILD_ROOT/%{prelink_conf_dir}
install -m 755 %{SOURCE6} $RPM_BUILD_ROOT/%{dracut_modules_dir}/module-setup.sh install -m 755 %{SOURCE6} $RPM_BUILD_ROOT/%{dracut_modules_dir}/module-setup.sh
install -m 644 %{SOURCE7} $RPM_BUILD_ROOT/%{dracut_conf_dir}/50-nss-softokn.conf install -m 644 %{SOURCE7} $RPM_BUILD_ROOT/%{dracut_conf_dir}/50-nss-softokn.conf
@ -866,8 +861,6 @@ update-crypto-policies
%{_libdir}/libfreeblpriv3.so %{_libdir}/libfreeblpriv3.so
%{_libdir}/libfreeblpriv3.chk %{_libdir}/libfreeblpriv3.chk
#shared #shared
%dir %{prelink_conf_dir}
%{prelink_conf_dir}/nss-softokn-prelink.conf
%dir %{dracut_modules_dir} %dir %{dracut_modules_dir}
%{dracut_modules_dir}/module-setup.sh %{dracut_modules_dir}/module-setup.sh
%{dracut_conf_dir}/50-nss-softokn.conf %{dracut_conf_dir}/50-nss-softokn.conf
@ -901,6 +894,10 @@ update-crypto-policies
%changelog %changelog
* Tue Dec 18 2018 Daiki Ueno <dueno@redhat.com> - 3.41.0-2
- Remove prelink.conf as prelink was removed in F24, suggested by
Harald Reindl
* Mon Dec 10 2018 Daiki Ueno <dueno@redhat.com> - 3.41.0-1 * Mon Dec 10 2018 Daiki Ueno <dueno@redhat.com> - 3.41.0-1
- Update to NSS 3.41 - Update to NSS 3.41