From 7f79f8bf08c9b973e69bb40d97868372c69ff35f9a618761cd570f967cf6b7b5 Mon Sep 17 00:00:00 2001 From: Wolfgang Rosenauer Date: Sun, 27 Mar 2022 19:24:54 +0000 Subject: [PATCH] Accepting request 964904 from home:gmbr3:Active - Add nss-util pkgconfig and config files (copied from RH/Fedora) OBS-URL: https://build.opensuse.org/request/show/964904 OBS-URL: https://build.opensuse.org/package/show/mozilla:Factory/mozilla-nss?expand=0&rev=376 --- mozilla-nss.changes | 5 ++ mozilla-nss.spec | 20 ++++++++ nss-util-config.in | 118 ++++++++++++++++++++++++++++++++++++++++++++ nss-util.pc.in | 11 +++++ 4 files changed, 154 insertions(+) create mode 100644 nss-util-config.in create mode 100644 nss-util.pc.in diff --git a/mozilla-nss.changes b/mozilla-nss.changes index 8a58dbc..a246f7c 100644 --- a/mozilla-nss.changes +++ b/mozilla-nss.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Mar 25 15:42:05 UTC 2022 - Callum Farmer + +- Add nss-util pkgconfig and config files (copied from RH/Fedora) + ------------------------------------------------------------------- Wed Mar 2 14:28:30 UTC 2022 - Wolfgang Rosenauer diff --git a/mozilla-nss.spec b/mozilla-nss.spec index 4b3e4f7..3ae0778 100644 --- a/mozilla-nss.spec +++ b/mozilla-nss.spec @@ -41,6 +41,8 @@ Source7: cert9.db Source8: key4.db Source9: pkcs11.txt #Source10: PayPalEE.cert +Source11: nss-util.pc.in +Source13: nss-util-config.in Source99: %{name}.changes Patch1: nss-opt.patch Patch2: system-nspr.patch @@ -356,6 +358,10 @@ sed "s:%%LIBDIR%%:%{_libdir}:g s:%%VERSION%%:%{version}:g s:%%NSPR_VERSION%%:%{nspr_ver}:g" \ %{SOURCE1} > %{buildroot}%{_libdir}/pkgconfig/nss.pc +sed "s:%%LIBDIR%%:%{_libdir}:g +s:%%VERSION%%:%{version}:g +s:%%NSPR_VERSION%%:%{nspr_ver}:g" \ + %{SOURCE11} > %{buildroot}%{_libdir}/pkgconfig/nss-util.pc # prepare nss-config file popd NSS_VMAJOR=`cat lib/nss/nss.h | grep "#define.*NSS_VMAJOR" | gawk '{print $3}'` @@ -370,6 +376,18 @@ cat %{SOURCE3} | sed -e "s,@libdir@,%{_libdir},g" \ -e "s,@MOD_PATCH_VERSION@,$NSS_VPATCH,g" \ > %{buildroot}/%{_bindir}/nss-config chmod 755 %{buildroot}/%{_bindir}/nss-config +NSSUTIL_VMAJOR=`cat lib/util/nssutil.h | grep "#define.*NSSUTIL_VMAJOR" | awk '{print $3}'` +NSSUTIL_VMINOR=`cat lib/util/nssutil.h | grep "#define.*NSSUTIL_VMINOR" | awk '{print $3}'` +NSSUTIL_VPATCH=`cat lib/util/nssutil.h | grep "#define.*NSSUTIL_VPATCH" | awk '{print $3}'` +cat %{SOURCE13} | 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,@MOD_MAJOR_VERSION@,$NSSUTIL_VMAJOR,g" \ + -e "s,@MOD_MINOR_VERSION@,$NSSUTIL_VMINOR,g" \ + -e "s,@MOD_PATCH_VERSION@,$NSSUTIL_VPATCH,g" \ + > %{buildroot}/%{_bindir}/nss-util-config +chmod 755 %{buildroot}/%{_bindir}/nss-util-config # setup-nsssysinfo.sh install -m 744 %{SOURCE6} %{buildroot}%{_sbindir}/ # create empty NSS database @@ -428,12 +446,14 @@ fi %{_libdir}/*.a %{_libdir}/pkgconfig/* %attr(755,root,root) %{_bindir}/nss-config +%attr(755,root,root) %{_bindir}/nss-util-config %files tools %{_bindir}/* %exclude %{_sbindir}/setup-nsssysinit.sh %{_libexecdir}/nss/ %exclude %{_bindir}/nss-config +%exclude %{_bindir}/nss-util-config %files sysinit %dir %{_sysconfdir}/pki diff --git a/nss-util-config.in b/nss-util-config.in new file mode 100644 index 0000000..325f3d4 --- /dev/null +++ b/nss-util-config.in @@ -0,0 +1,118 @@ +#!/bin/sh + +prefix=@prefix@ + +major_version=@MOD_MAJOR_VERSION@ +minor_version=@MOD_MINOR_VERSION@ +patch_version=@MOD_PATCH_VERSION@ + +usage() +{ + cat <&2 +fi + +lib_nssutil=yes + +while test $# -gt 0; do + case "$1" in + -*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;; + *) optarg= ;; + esac + + case $1 in + --prefix=*) + prefix=$optarg + ;; + --prefix) + echo_prefix=yes + ;; + --exec-prefix=*) + exec_prefix=$optarg + ;; + --exec-prefix) + echo_exec_prefix=yes + ;; + --includedir=*) + includedir=$optarg + ;; + --includedir) + echo_includedir=yes + ;; + --libdir=*) + libdir=$optarg + ;; + --libdir) + echo_libdir=yes + ;; + --version) + echo ${major_version}.${minor_version}.${patch_version} + ;; + --cflags) + echo_cflags=yes + ;; + --libs) + echo_libs=yes + ;; + *) + usage 1 1>&2 + ;; + esac + shift +done + +# Set variables that may be dependent upon other variables +if test -z "$exec_prefix"; then + exec_prefix=@exec_prefix@ +fi +if test -z "$includedir"; then + includedir=@includedir@ +fi +if test -z "$libdir"; then + libdir=@libdir@ +fi + +if test "$echo_prefix" = "yes"; then + echo $prefix +fi + +if test "$echo_exec_prefix" = "yes"; then + echo $exec_prefix +fi + +if test "$echo_includedir" = "yes"; then + echo $includedir +fi + +if test "$echo_libdir" = "yes"; then + echo $libdir +fi + +if test "$echo_cflags" = "yes"; then + echo -I$includedir +fi + +if test "$echo_libs" = "yes"; then + libdirs="-Wl,-rpath-link,$libdir -L$libdir" + if test -n "$lib_nssutil"; then + libdirs="$libdirs -lnssutil${major_version}" + fi + echo $libdirs +fi + diff --git a/nss-util.pc.in b/nss-util.pc.in new file mode 100644 index 0000000..920ca7d --- /dev/null +++ b/nss-util.pc.in @@ -0,0 +1,11 @@ +prefix=/usr +exec_prefix=${prefix} +libdir=%LIBDIR% +includedir=${prefix}/include/nss3 + +Name: NSS-UTIL +Description: Network Security Services Utility Library +Version: %VERSION% +Requires: nspr >= %NSPR_VERSION% +Libs: -lnssutil3 +Cflags: -I${includedir}