Attachment 862577 Details for Bug 606022 – changes to the spec file in patch format

[patch] changes to the spec file in patch format

manpages-specfile-changes.patch (text/plain), 4.25 KB, created by Elio Maldonado Batiz on 2014-02-12 23:33:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Elio Maldonado Batiz

Created: 2014-02-12 23:33:01 UTC

Size: 4.25 KB

patch

obsolete

>diff --git a/nss.spec b/nss.spec
>index 0eddb15..dd3659e 100644
>--- a/nss.spec
>+++ b/nss.spec
>@@ -3,6 +3,7 @@
> %global nss_softokn_fips_version 3.14.3
> %global nss_softokn_version 3.14.3
> %global unsupported_tools_directory %{_libdir}/nss/unsupported-tools
>+%global allTools "certutil cmsutil crlutil derdump modutil pk12util pp signtool signver ssltap vfychain vfyserv"
> 
> # solution taken from icedtea-web.spec
> %define multilib_arches x86_64 ppc64 ia64 s390x sparc64
>@@ -15,7 +16,7 @@
> Summary:          Network Security Services
> Name:             nss
> Version:          3.15.3
>-Release:          7%{?dist}
>+Release:          8%{?dist}
> License:          MPLv2.0
> URL:              http://www.mozilla.org/projects/security/pki/nss/
> Group:            System Environment/Libraries
>@@ -100,6 +101,10 @@ Patch58: revoking-trust-in-one-anssi-certificate.patch
> Patch59: 0001-RHBZ-895339.patch
> Patch64: 0001-pinst-make-derEncodingsMatch-work-with-encrypted-key.patch
> 
>+# Upstream: https://bugzilla.mozilla.org/show_bug.cgi?id=932001
>+# Fixed upstream: Remove this patch we update to nss-3.15.4
>+Patch65: add-missing-option-descriptions.patch
>+
> %description
> Network Security Services (NSS) is a set of libraries designed to
> support cross-platform development of security-enabled client and
>@@ -146,6 +151,7 @@ Requires:         nss-util-devel
> Requires:         nss-softokn-devel
> Requires:         nspr-devel >= %{nspr_version}
> Requires:         pkgconfig
>+BuildRequires:    xmlto
> 
> %description devel
> Header and Library files for doing development with Network Security Services.
>@@ -271,6 +277,16 @@ export NSS_BLTEST_NOT_AVAILABLE=1
> %{__make} -C ./nss
> unset NSS_BLTEST_NOT_AVAILABLE
> 
>+# build the man pages clean
>+pushd ./nss
>+%{__make} clean_docs build_docs
>+popd
>+
>+# and copy them here
>+for m in "%{allTools}"; do 
>+  cp ./nss/doc/nroff/${m}.1 .
>+done
>+
> # Set up our package file
> # The nspr_version and nss_{util|softokn}_version globals used
> # here match the ones nss has for its Requires. 
>@@ -422,6 +438,8 @@ echo "test suite completed"
> %{__mkdir_p} $RPM_BUILD_ROOT/%{unsupported_tools_directory}
> %{__mkdir_p} $RPM_BUILD_ROOT/%{_libdir}/pkgconfig
> 
>+mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1
>+
> touch $RPM_BUILD_ROOT%{_libdir}/libnssckbi.so
> %{__install} -p -m 755 dist/*.OBJ/lib/libnssckbi.so $RPM_BUILD_ROOT/%{_libdir}/nss/libnssckbi.so
> 
>@@ -472,6 +490,11 @@ done
> # Copy the pkcs #11 configuration script
> %{__install} -p -m 755 ./dist/pkgconfig/setup-nsssysinit.sh $RPM_BUILD_ROOT/%{_bindir}/setup-nsssysinit.sh
> 
>+# Copy the man pages for the nss tools
>+for f in "%{allTools}"; do 
>+   install -c -m 644 ${f}.1 $RPM_BUILD_ROOT%{_mandir}/man1/${f}.1
>+done
>+
> #remove the nss-util-devel headers
> rm -f $RPM_BUILD_ROOT/%{_includedir}/nss3/base64.h
> rm -f $RPM_BUILD_ROOT/%{_includedir}/nss3/ciferfam.h
>@@ -596,6 +619,21 @@ fi
> %{unsupported_tools_directory}/tstclnt
> %{unsupported_tools_directory}/vfyserv
> %{unsupported_tools_directory}/vfychain
>+# instead of %%{_mandir}/man*/* let's list them explicitely
>+# supported tools
>+%attr(0644,root,root) %doc /usr/share/man/man1/certutil.1.gz
>+%attr(0644,root,root) %doc /usr/share/man/man1/cmsutil.1.gz
>+%attr(0644,root,root) %doc /usr/share/man/man1/crlutil.1.gz
>+%attr(0644,root,root) %doc /usr/share/man/man1/modutil.1.gz
>+%attr(0644,root,root) %doc /usr/share/man/man1/pk12util.1.gz
>+%attr(0644,root,root) %doc /usr/share/man/man1/signtool.1.gz
>+%attr(0644,root,root) %doc /usr/share/man/man1/signver.1.gz
>+# unsupported tools
>+%attr(0644,root,root) %doc /usr/share/man/man1/derdump.1.gz
>+%attr(0644,root,root) %doc /usr/share/man/man1/pp.1.gz
>+%attr(0644,root,root) %doc /usr/share/man/man1/ssltap.1.gz
>+%attr(0644,root,root) %doc /usr/share/man/man1/vfychain.1.gz
>+%attr(0644,root,root) %doc /usr/share/man/man1/vfyserv.1.gz
> 
> %files devel
> %defattr(-,root,root)
>@@ -670,6 +708,11 @@ fi
> 
> 
> %changelog
>+* Wed Feb 12 2014 Elio Maldonado <emaldona@redhat.com> - 3.15.3-8
>+- Install man pages for the nss security tools
>+- Add some missing option descriptions to man page for certutil
>+- Resolves: Bug 606022 - nss security tools lack man pages
>+
> * Wed Feb 12 2014 Elio Maldonado <emaldona@redhat.com> - 3.15.3-7
> - Fix the numbering and naming of the patches
> - Resolves: Bug 895339 - [PEM] active FTPS with encrypted client key ends up with SSL_ERROR_TOKEN_INSERTION_REMOVAL

Flags:

kengert: review+

Actions: View | Diff

Attachments on bug 606022: 862576 | 862577 | 862578 | 892672 | 892674 | 894337 | 894811 | 894820