diff --git a/nss-util-config.in b/nss-util-config.in deleted file mode 100644 index ba3202a..0000000 --- a/nss-util-config.in +++ /dev/null @@ -1,142 +0,0 @@ -#!/bin/sh - -prefix=@prefix@ - -major_version=@MOD_MAJOR_VERSION@ -minor_version=@MOD_MINOR_VERSION@ -patch_version=@MOD_PATCH_VERSION@ - -usage() -{ - cat <&2 -fi - -lib_ssl=no -lib_smime=no -lib_nss=no -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 - ;; - ssl) - lib_ssl=no - ;; - smime) - lib_smime=no - ;; - nss) - lib_nss=no - ;; - nssutil) - lib_nssutil=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=`pkg-config --variable=exec_prefix nssutil` -fi -if test -z "$includedir"; then - includedir=`pkg-config --variable=includedir nssutil` -fi -if test -z "$libdir"; then - libdir=`pkg-config --variable=libdir nssutil` -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_ssl"; then - libdirs="$libdirs -lssl${major_version}" - fi - if test -n "$lib_smime"; then - libdirs="$libdirs -lsmime${major_version}" - fi - if test -n "$lib_nss"; then - libdirs="$libdirs -lnss${major_version}" - fi - 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 deleted file mode 100644 index 079f83f..0000000 --- a/nss-util.pc.in +++ /dev/null @@ -1,11 +0,0 @@ -prefix=%prefix% -exec_prefix=%exec_prefix% -libdir=%libdir% -includedir=%includedir% - -Name: NSS-UTIL -Description: Network Security Services Utility Library -Version: %NSSUTIL_VERSION% -Requires: nspr >= %NSPR_VERSION% -Libs: -lnssutil3 -Cflags: -I${includedir} diff --git a/nss.spec b/nss.spec index 587047e..e8bd27d 100644 --- a/nss.spec +++ b/nss.spec @@ -40,8 +40,6 @@ Source3: blank-cert8.db Source4: blank-key3.db Source5: blank-secmod.db Source8: nss-prelink.conf -Source10: nss-util.pc.in -Source11: nss-util-config.in Source20: nss-softokn.pc.in Source21: nss-softokn-config.in Source12: %{name}-pem-20090622.tar.bz2 @@ -226,32 +224,6 @@ chmod 755 ./mozilla/dist/pkgconfig/nss-config # Set up our package file %{__mkdir_p} ./mozilla/dist/pkgconfig -%{__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%%,%{version},g" > \ - ./mozilla/dist/pkgconfig/nss-util.pc - -NSSUTIL_VMAJOR=`cat mozilla/security/nss/lib/util/nssutil.h | grep "#define.*NSSUTIL_VMAJOR" | awk '{print $3}'` -NSSUTIL_VMINOR=`cat mozilla/security/nss/lib/util/nssutil.h | grep "#define.*NSSUTIL_VMINOR" | awk '{print $3}'` -NSSUTIL_VPATCH=`cat mozilla/security/nss/lib/util/nssutil.h | grep "#define.*NSSUTIL_VPATCH" | awk '{print $3}'` - -export NSSUTIL_VMAJOR -export NSSUTIL_VMINOR -export NSSUTIL_VPATCH - -%{__cat} %{SOURCE11} | 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" \ - > ./mozilla/dist/pkgconfig/nss-util-config - -chmod 755 ./mozilla/dist/pkgconfig/nss-util-config # Set up our package file %{__mkdir_p} ./mozilla/dist/pkgconfig @@ -395,8 +367,6 @@ done # Copy the package configuration files %{__install} -p ./mozilla/dist/pkgconfig/nss.pc $RPM_BUILD_ROOT/%{_libdir}/pkgconfig/nss.pc %{__install} -p ./mozilla/dist/pkgconfig/nss-config $RPM_BUILD_ROOT/%{_bindir}/nss-config -%{__install} -p ./mozilla/dist/pkgconfig/nss-util.pc $RPM_BUILD_ROOT/%{_libdir}/pkgconfig/nss-util.pc -%{__install} -p ./mozilla/dist/pkgconfig/nss-util-config $RPM_BUILD_ROOT/%{_bindir}/nss-util-config %{__install} -p ./mozilla/dist/pkgconfig/nss-softokn.pc $RPM_BUILD_ROOT/%{_libdir}/pkgconfig/nss-softokn.pc %{__install} -p ./mozilla/dist/pkgconfig/nss-softokn-config $RPM_BUILD_ROOT/%{_bindir}/nss-softokn-config @@ -629,6 +599,9 @@ rm -rf $RPM_BUILD_ROOT/%{_includedir}/nss3/utilrename.h %changelog +* Mon Aug 24 2009 Dennis Gilmore - 3.12.3.99.3-14 +- don install the nss-util pkgconfig bits + * Mon Aug 24 2009 Dennis Gilmore - 3.12.3.99.3-13 - remove from -devel the 3 headers that ship in nss-util-devel