Reverting to having nssutil and -rpath-link in nss-config not to break
other's builds - 522477
This commit is contained in:
parent
9c5e014b12
commit
6c848200f3
|
@ -20,6 +20,7 @@ Options:
|
||||||
[--cflags]
|
[--cflags]
|
||||||
Dynamic Libraries:
|
Dynamic Libraries:
|
||||||
nss
|
nss
|
||||||
|
nssutil
|
||||||
ssl
|
ssl
|
||||||
smime
|
smime
|
||||||
EOF
|
EOF
|
||||||
|
@ -33,6 +34,7 @@ fi
|
||||||
lib_ssl=yes
|
lib_ssl=yes
|
||||||
lib_smime=yes
|
lib_smime=yes
|
||||||
lib_nss=yes
|
lib_nss=yes
|
||||||
|
lib_nssutil=yes
|
||||||
|
|
||||||
while test $# -gt 0; do
|
while test $# -gt 0; do
|
||||||
case "$1" in
|
case "$1" in
|
||||||
|
@ -83,6 +85,9 @@ while test $# -gt 0; do
|
||||||
nss)
|
nss)
|
||||||
lib_nss=yes
|
lib_nss=yes
|
||||||
;;
|
;;
|
||||||
|
nssutil)
|
||||||
|
lib_nssutil=yes
|
||||||
|
;;
|
||||||
*)
|
*)
|
||||||
usage 1 1>&2
|
usage 1 1>&2
|
||||||
;;
|
;;
|
||||||
|
@ -122,7 +127,7 @@ if test "$echo_cflags" = "yes"; then
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if test "$echo_libs" = "yes"; then
|
if test "$echo_libs" = "yes"; then
|
||||||
libdirs="-Wl,$libdir -L$libdir"
|
libdirs="-Wl,-rpath-link,$libdir -L$libdir"
|
||||||
if test -n "$lib_ssl"; then
|
if test -n "$lib_ssl"; then
|
||||||
libdirs="$libdirs -lssl${major_version}"
|
libdirs="$libdirs -lssl${major_version}"
|
||||||
fi
|
fi
|
||||||
|
@ -132,6 +137,9 @@ if test "$echo_libs" = "yes"; then
|
||||||
if test -n "$lib_nss"; then
|
if test -n "$lib_nss"; then
|
||||||
libdirs="$libdirs -lnss${major_version}"
|
libdirs="$libdirs -lnss${major_version}"
|
||||||
fi
|
fi
|
||||||
|
if test -n "$lib_nssutil"; then
|
||||||
|
libdirs="$libdirs -lnssutil${major_version}"
|
||||||
|
fi
|
||||||
echo $libdirs
|
echo $libdirs
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
5
nss.spec
5
nss.spec
|
@ -6,7 +6,7 @@
|
||||||
Summary: Network Security Services
|
Summary: Network Security Services
|
||||||
Name: nss
|
Name: nss
|
||||||
Version: 3.12.4
|
Version: 3.12.4
|
||||||
Release: 7%{?dist}
|
Release: 8%{?dist}
|
||||||
License: MPLv1.1 or GPLv2+ or LGPLv2+
|
License: MPLv1.1 or GPLv2+ or LGPLv2+
|
||||||
URL: http://www.mozilla.org/projects/security/pki/nss/
|
URL: http://www.mozilla.org/projects/security/pki/nss/
|
||||||
Group: System Environment/Libraries
|
Group: System Environment/Libraries
|
||||||
|
@ -447,6 +447,9 @@ rm -rf $RPM_BUILD_ROOT/%{_includedir}/nss3/nsslowhash.h
|
||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Thu Sep 10 2009 Elio Maldonado<emaldona@redhat.com> - 3.12.4-8
|
||||||
|
- Restoring nssutil and -rpath-link to nss-config for now - 522477
|
||||||
|
|
||||||
* Tue Sep 08 2009 Elio Maldonado<emaldona@redhat.com - 3.12.4-7
|
* Tue Sep 08 2009 Elio Maldonado<emaldona@redhat.com - 3.12.4-7
|
||||||
- Add the nss-sysinit subpackage
|
- Add the nss-sysinit subpackage
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue