From 35beba87b4ff4cb0defc102a3dde08eb9279b11d Mon Sep 17 00:00:00 2001 From: =?utf8?q?Arkadiusz=20Mi=C5=9Bkiewicz?= Date: Fri, 17 Oct 2014 19:44:02 +0200 Subject: [PATCH 1/1] - rel 3; provide nss-softokn.pc --- nss-softokn.pc.in | 11 +++++++++++ nss.spec | 15 ++++++++++++++- 2 files changed, 25 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..ceddda2 --- /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 >= %NSS_VERSION% +Libs: -L${libdir} -lfreebl3 -lnssdbm3 -lsoftokn3 +Cflags: -I${includedir} diff --git a/nss.spec b/nss.spec index 6c89ced..6743f70 100644 --- a/nss.spec +++ b/nss.spec @@ -4,7 +4,7 @@ Summary: NSS - Network Security Services Summary(pl.UTF-8): NSS - Network Security Services Name: nss Version: 3.17.2 -Release: 2 +Release: 3 Epoch: 1 License: MPL v2.0 Group: Libraries @@ -14,6 +14,7 @@ Source1: %{name}-mozilla-nss.pc Source2: %{name}-config.in Source3: http://www.cacert.org/certs/root.der # Source3-md5: a61b375e390d9c3654eebd2031461f6b +Source4: nss-softokn.pc.in Patch0: %{name}-Makefile.patch # Upstream: https://bugzilla.mozilla.org/show_bug.cgi?id=1083900 Patch1: tls12.patch @@ -159,6 +160,17 @@ cp -p nss/doc/nroff/*.1 $RPM_BUILD_ROOT%{_mandir}/man1 # compatibility symlink ln -s nss.pc $RPM_BUILD_ROOT%{_pkgconfigdir}/mozilla-nss.pc +cat %{SOURCE4} | \ +sed -e "s,%%libdir%%,%{_libdir},g" \ + -e "s,%%prefix%%,%{_prefix},g" \ + -e "s,%%exec_prefix%%,%{_prefix},g" \ + -e "s,%%includedir%%,%{_includedir}/nss,g" \ + -e "s,%%NSPR_VERSION%%,$(echo %{nspr_ver} | sed -e 's#.*:##g'),g" \ + -e "s,%%NSS_VERSION%%,%{version},g" \ + -e "s,%%SOFTOKEN_VERSION%%,%{version},g" > \ + $RPM_BUILD_ROOT%{_pkgconfigdir}/nss-softokn.pc + + NSS_VMAJOR=$(awk '/#define.*NSS_VMAJOR/ {print $3}' nss/lib/nss/nss.h) NSS_VMINOR=$(awk '/#define.*NSS_VMINOR/ {print $3}' nss/lib/nss/nss.h) NSS_VPATCH=$(awk '/#define.*NSS_VPATCH/ {print $3}' nss/lib/nss/nss.h) @@ -212,6 +224,7 @@ rm -rf $RPM_BUILD_ROOT %{_includedir}/nss %{_pkgconfigdir}/mozilla-nss.pc %{_pkgconfigdir}/nss.pc +%{_pkgconfigdir}/nss-softokn.pc %files tools %defattr(644,root,root,755) -- 2.44.0