rpms/nss
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Move signtool to %%_libdir/nss/unsupported-tools

Browse Source
This commit is contained in:
Daiki Ueno 2017-07-13 16:16:30 +02:00
parent b2ceaeb648
commit 314afd2133
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
nss.spec
View File

@ -2,7 +2,7 @@
%global nss_util_version 3.31.0 %global nss_util_version 3.31.0
%global nss_softokn_version 3.31.0 %global nss_softokn_version 3.31.0
%global unsupported_tools_directory %{_libdir}/nss/unsupported-tools %global unsupported_tools_directory %{_libdir}/nss/unsupported-tools
%global allTools "certutil cmsutil crlutil derdump modutil pk12util signtool signver ssltap vfychain vfyserv" %global allTools "certutil cmsutil crlutil derdump modutil pk12util signver ssltap vfychain vfyserv"
# solution taken from icedtea-web.spec # solution taken from icedtea-web.spec
%define multilib_arches %{power64} sparc64 x86_64 mips64 mips64el %define multilib_arches %{power64} sparc64 x86_64 mips64 mips64el
@ -21,7 +21,7 @@ Name: nss
Version: 3.31.0 Version: 3.31.0
# for Rawhide, please always use release >= 2 # for Rawhide, please always use release >= 2
# for Fedora release branches, please use release < 2 (1.0, 1.1, ...) # for Fedora release branches, please use release < 2 (1.0, 1.1, ...)
Release: 2%{?dist} Release: 3%{?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/
Group: System Environment/Libraries Group: System Environment/Libraries
@ -561,7 +561,7 @@ do
done done
# Copy the binaries we ship as unsupported # Copy the binaries we ship as unsupported
for file in atob btoa derdump listsuites ocspclnt pp selfserv strsclnt symkeyutil tstclnt vfyserv vfychain for file in atob btoa derdump listsuites ocspclnt pp selfserv signtool strsclnt symkeyutil tstclnt vfyserv vfychain
do do
%{__install} -p -m 755 dist/*.OBJ/bin/$file $RPM_BUILD_ROOT/%{unsupported_tools_directory} %{__install} -p -m 755 dist/*.OBJ/bin/$file $RPM_BUILD_ROOT/%{unsupported_tools_directory}
done done
@ -687,7 +687,6 @@ fi
%{_bindir}/crlutil %{_bindir}/crlutil
%{_bindir}/modutil %{_bindir}/modutil
%{_bindir}/pk12util %{_bindir}/pk12util
%{_bindir}/signtool
%{_bindir}/signver %{_bindir}/signver
%{_bindir}/ssltap %{_bindir}/ssltap
%{unsupported_tools_directory}/atob %{unsupported_tools_directory}/atob
@ -697,6 +696,7 @@ fi
%{unsupported_tools_directory}/ocspclnt %{unsupported_tools_directory}/ocspclnt
%{unsupported_tools_directory}/pp %{unsupported_tools_directory}/pp
%{unsupported_tools_directory}/selfserv %{unsupported_tools_directory}/selfserv
%{unsupported_tools_directory}/signtool
%{unsupported_tools_directory}/strsclnt %{unsupported_tools_directory}/strsclnt
%{unsupported_tools_directory}/symkeyutil %{unsupported_tools_directory}/symkeyutil
%{unsupported_tools_directory}/tstclnt %{unsupported_tools_directory}/tstclnt
@ -709,10 +709,10 @@ fi
%attr(0644,root,root) %doc %{_mandir}/man1/crlutil.1.gz %attr(0644,root,root) %doc %{_mandir}/man1/crlutil.1.gz
%attr(0644,root,root) %doc %{_mandir}/man1/modutil.1.gz %attr(0644,root,root) %doc %{_mandir}/man1/modutil.1.gz
%attr(0644,root,root) %doc %{_mandir}/man1/pk12util.1.gz %attr(0644,root,root) %doc %{_mandir}/man1/pk12util.1.gz
%attr(0644,root,root) %doc %{_mandir}/man1/signtool.1.gz
%attr(0644,root,root) %doc %{_mandir}/man1/signver.1.gz %attr(0644,root,root) %doc %{_mandir}/man1/signver.1.gz
# unsupported tools # unsupported tools
%attr(0644,root,root) %doc %{_mandir}/man1/derdump.1.gz %attr(0644,root,root) %doc %{_mandir}/man1/derdump.1.gz
%attr(0644,root,root) %doc %{_mandir}/man1/signtool.1.gz
%if %{defined rhel} %if %{defined rhel}
%attr(0644,root,root) %doc %{_mandir}/man1/pp.1.gz %attr(0644,root,root) %doc %{_mandir}/man1/pp.1.gz
%else %else
@ -797,6 +797,10 @@ fi
%changelog %changelog
* Thu Jul 13 2017 Daiki Ueno <dueno@redhat.com> - 3.31.0-3
- Move signtool to %%_libdir/nss/unsupported-tools, for:
https://fedoraproject.org/wiki/Changes/NSSSigntoolDeprecation
* Wed Jun 21 2017 Daiki Ueno <dueno@redhat.com> - 3.31.0-2 * Wed Jun 21 2017 Daiki Ueno <dueno@redhat.com> - 3.31.0-2
- Rebase to NSS 3.31.0 - Rebase to NSS 3.31.0