Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package mozilla-nss for openSUSE:Factory checked in at 2022-03-29 18:14:13 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/mozilla-nss (Old) and /work/SRC/openSUSE:Factory/.mozilla-nss.new.1900 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "mozilla-nss" Tue Mar 29 18:14:13 2022 rev:185 rq:965234 version:3.75 Changes: -------- --- /work/SRC/openSUSE:Factory/mozilla-nss/mozilla-nss.changes 2022-03-11 21:40:52.806053025 +0100 +++ /work/SRC/openSUSE:Factory/.mozilla-nss.new.1900/mozilla-nss.changes 2022-03-29 18:14:27.839075439 +0200 @@ -1,0 +2,5 @@ +Fri Mar 25 15:42:05 UTC 2022 - Callum Farmer <[email protected]> + +- Add nss-util pkgconfig and config files (copied from RH/Fedora) + +------------------------------------------------------------------- New: ---- nss-util-config.in nss-util.pc.in ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mozilla-nss.spec ++++++ --- /var/tmp/diff_new_pack.96Ppq9/_old 2022-03-29 18:14:29.079076580 +0200 +++ /var/tmp/diff_new_pack.96Ppq9/_new 2022-03-29 18:14:29.083076583 +0200 @@ -41,6 +41,8 @@ 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 @@ 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 @@ -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 @@ %{_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 ++++++ nss-util-config.in ++++++ #!/bin/sh prefix=@prefix@ major_version=@MOD_MAJOR_VERSION@ minor_version=@MOD_MINOR_VERSION@ patch_version=@MOD_PATCH_VERSION@ usage() { cat <<EOF Usage: nss-util-config [OPTIONS] [LIBRARIES] Options: [--prefix[=DIR]] [--exec-prefix[=DIR]] [--includedir[=DIR]] [--libdir[=DIR]] [--version] [--libs] [--cflags] Dynamic Libraries: nssutil EOF exit $1 } if test $# -eq 0; then usage 1 1>&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 ++++++ nss-util.pc.in ++++++ 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}
