From 992ff6a8e2f3eda8c09ceb68404e467eccbd03d8 Mon Sep 17 00:00:00 2001 From: Mikhail Novosyolov Date: Mon, 20 Apr 2020 19:57:23 +0300 Subject: [PATCH] add pkgconfig(nss-softokn) from Fedora as a BR of Java in Fedora/openEuler --- nss-softokn.pc.in | 11 +++++++++++ nss.spec | 14 +++++++++++++- 2 files changed, 24 insertions(+), 1 deletion(-) create mode 100644 nss-softokn.pc.in diff --git a/nss-softokn.pc.in b/nss-softokn.pc.in new file mode 100644 index 0000000..022ebbf --- /dev/null +++ b/nss-softokn.pc.in @@ -0,0 +1,11 @@ +prefix=%prefix% +exec_prefix=%exec_prefix% +libdir=%libdir% +includedir=%includedir% + +Name: NSS-SOFTOKN +Description: Network Security Services Softoken PKCS #11 Module +Version: %SOFTOKEN_VERSION% +Requires: nspr >= %NSPR_VERSION%, nss-util >= %NSSUTIL_VERSION% +Libs: -L${libdir} -lfreebl3 -lnssdbm3 -lsoftokn3 +Cflags: -I${includedir} diff --git a/nss.spec b/nss.spec index 6ee82e8..7eb2d87 100644 --- a/nss.spec +++ b/nss.spec @@ -19,7 +19,7 @@ Summary: Network Security Services Name: nss Version: 3.51.1 -Release: 1 +Release: 3 Epoch: 2 Group: System/Libraries License: MPL or GPLv2+ or LGPLv2+ @@ -39,6 +39,7 @@ Source8: verisign-class-3-secure-server-ca.der # Brasilian government certificate # verified in person with a government official Source9: https://github.com/demoiselle/certificate/raw/master/impl/ca-icp-brasil/src/main/resources/trustedca/CertificadoACRaiz.crt +Source10: nss-softokn.pc.in Patch0: nss-no-rpath.patch Patch2: renegotiate-transitional.patch # (tpg) be carefull with last nspr4-4.10 because prtypes.h was moved to include/nspr4/ @@ -203,6 +204,8 @@ Group: Development/C++ Requires: %{libname} >= %{EVRD} Requires: %{libfreebl} >= %{EVRD} Provides: nss-devel = %{EVRD} +# a BR of Java in RH/OEU +Provides: nss-softokn-freebl-devel = %{EVRD} %rename %{libname}-devel %description -n %{devname} @@ -215,6 +218,7 @@ Header files to doing development with Network Security Services. %{_includedir}/nss/*.h %{_includedir}/nss/nssck.api %{_libdir}/pkgconfig/nss.pc +%{_libdir}/pkgconfig/nss-softokn.pc %{_libdir}/libsoftokn%{major}.chk %{_libdir}/libfreebl%{major}.chk @@ -397,6 +401,14 @@ cat %{SOURCE2} | sed -e "s,%%libdir%%,%{_libdir},g" \ -e "s,%%NSPR_VERSION%%,%{nspr_version},g" \ -e "s,%%NSS_VERSION%%,%{version},g" > \ %{buildroot}%{_libdir}/pkgconfig/nss.pc +cat %{SOURCE10} | sed -e "s,%%libdir%%,%{_libdir},g" \ + -e "s,%%prefix%%,%{_prefix},g" \ + -e "s,%%exec_prefix%%,%{_prefix},g" \ + -e "s,%%includedir%%,%{_includedir}/nss3,g" \ + -e "s,%%NSPR_VERSION%%,%{nspr_version},g" \ + -e "s,%%NSSUTIL_VERSION%%,%{nss_version},g" \ + -e "s,%%SOFTOKEN_VERSION%%,%{version},g" > \ + %{buildroot}%{_libdir}/pkgconfig/nss-softokn.pc %endif popd