Attachment 651733 Details for Bug 879978 – spec file changes to install nsscki.api for mod_revocator - in patch form

[patch] spec file changes to install nsscki.api for mod_revocator - in patch form

patch4nss.spec.txt (text/plain), 2.98 KB, created by Elio Maldonado Batiz on 2012-11-26 03:19:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Elio Maldonado Batiz

Created: 2012-11-26 03:19:01 UTC

Size: 2.98 KB

patch

obsolete

>diff --git a/nss.spec b/nss.spec
>index 37a4484..ccff9ee 100644
>--- a/nss.spec
>+++ b/nss.spec
>@@ -7,7 +7,7 @@
> Summary:          Network Security Services
> Name:             nss
> Version:          3.14
>-Release:          10%{?dist}
>+Release:          10.1%{?dist}.installnssck.api.2
> License:          MPLv2.0
> URL:              http://www.mozilla.org/projects/security/pki/nss/
> Group:            System Environment/Libraries
>@@ -159,6 +159,9 @@ low level services.
> %patch41 -p0 -b .872124
> %patch42 -p0 -b .870864
> 
>+%{__mkdir_p} ./mozilla/dist/doc/templates
>+%{__cp} -p ./mozilla/security/nss/lib/ckfw/nssck.api ./mozilla/dist/doc/templates/
>+
> %build
> 
> NSS_NO_PKCS11_BYPASS=1
>@@ -282,6 +285,8 @@ chmod 755 ./mozilla/dist/pkgconfig/nss-config
> %{__cat} %{SOURCE9} > ./mozilla/dist/pkgconfig/setup-nsssysinit.sh
> chmod 755 ./mozilla/dist/pkgconfig/setup-nsssysinit.sh
> 
>+%{__cp} -f ./mozilla/dist/doc/templates/nssck.api ./mozilla/dist/public/nss/
>+
> %check
> 
> # Begin -- copied from the build section
>@@ -374,6 +379,7 @@ echo "test suite completed"
> %{__mkdir_p} $RPM_BUILD_ROOT/%{_libdir}
> %{__mkdir_p} $RPM_BUILD_ROOT/%{unsupported_tools_directory}
> %{__mkdir_p} $RPM_BUILD_ROOT/%{_libdir}/pkgconfig
>+%{__mkdir_p} $RPM_BUILD_ROOT/%{_usr}/share/doc/nss3/templates
> 
> # Copy the binary libraries we want
> for file in libnss3.so libnssckbi.so libnsspem.so libnsssysinit.so libsmime3.so libssl3.so
>@@ -416,6 +422,10 @@ do
>   %{__install} -p -m 644 $file $RPM_BUILD_ROOT/%{_includedir}/nss3
> done
> 
>+# Copy the nssck.api file to the doc dir
>+%{__install} -p -m 644 mozilla/dist/doc/templates/nssck.api $RPM_BUILD_ROOT/%{_usr}/share/doc/nss3/templates/
>+# and also as an "include" so mod_revocator can find it
>+%{__install} -p -m 644 mozilla/dist/doc/templates/nssck.api $RPM_BUILD_ROOT/%{_includedir}/nss3/
> # Copy the package configuration files
> %{__install} -p -m 644 ./mozilla/dist/pkgconfig/nss.pc $RPM_BUILD_ROOT/%{_libdir}/pkgconfig/nss.pc
> %{__install} -p -m 755 ./mozilla/dist/pkgconfig/nss-config $RPM_BUILD_ROOT/%{_bindir}/nss-config
>@@ -574,7 +584,8 @@ rm -f $RPM_BUILD_ROOT/%{_includedir}/nss3/nsslowhash.h
> %{_includedir}/nss3/sslerr.h
> %{_includedir}/nss3/sslproto.h
> %{_includedir}/nss3/sslt.h
>-
>+%{_usr}/share/doc/nss3/templates/nssck.api
>+%doc %{_usr}/share/doc/nss3/templates/nssck.api
> 
> %files pkcs11-devel
> %defattr(-, root, root)
>@@ -588,11 +599,17 @@ rm -f $RPM_BUILD_ROOT/%{_includedir}/nss3/nsslowhash.h
> %{_includedir}/nss3/nssckg.h
> %{_includedir}/nss3/nssckmdt.h
> %{_includedir}/nss3/nssckt.h
>+%{_includedir}/nss3/nssck.api
> %{_libdir}/libnssb.a
> %{_libdir}/libnssckfw.a
>+%{_usr}/share/doc/nss3/templates/*.api
> 
> 
> %changelog
>+* Sun Nov 25 2012 Elio Maldonado <emaldona@redhat.com> - 3.14-10.1.installnssck.api.2
>+- Install nssck.api in /usr/share/doc/nss3/templates and also in /usr/includes/nss3
>+- Bug 879978 - Install the nssck.api header template in a place where mod_revocator can access it
>+
> * Mon Nov 19 2012 Elio Maldonado <emaldona@redhat.com> - 3.14-10
> - Bug 870864 - Add support in NSS for Secure Boot
>

Actions: View | Diff

Attachments on bug 879978: 651733 | 653311