rpms/nss-softokn/devel nss-softokn.spec,1.9,1.10

[Elio Maldonado]

Author: emaldonado

Update of /cvs/extras/rpms/nss-softokn/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4209

Modified Files:
	nss-softokn.spec 
Log Message:
Determine NSSUTIL_INCLUDE_DIR and NSSUTIL_LIB_DIR with a pkg-config query on nss-util, remnove release 17 hack


Index: nss-softokn.spec
===================================================================
RCS file: /cvs/extras/rpms/nss-softokn/devel/nss-softokn.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- nss-softokn.spec	27 Aug 2009 15:23:15 -0000	1.9
+++ nss-softokn.spec	27 Aug 2009 23:09:53 -0000	1.10
@@ -17,7 +17,7 @@
 Summary:          Network Security Services Soktoken Module
 Name:             nss-softokn
 Version:          3.12.3.99.3
-Release:          18%{?dist}
+Release:          19%{?dist}
 License:          MPLv1.1 or GPLv2+ or LGPLv2+
 URL:              http://www.mozilla.org/projects/security/pki/nss/
 Group:            System Environment/Libraries
@@ -105,7 +105,7 @@ BUILD_OPT=1
 export BUILD_OPT
 
 # Generate symbolic info for debuggers
-XCFLAGS="$RPM_OPT_FLAGS -I%{_includedir}/nss3"
+XCFLAGS=$RPM_OPT_FLAGS
 export XCFLAGS
 
 
@@ -121,8 +121,8 @@ NSPR_LIB_DIR=`/usr/bin/pkg-config --libs
 export NSPR_INCLUDE_DIR
 export NSPR_LIB_DIR
 
-NSS_INCLUDE_DIR=`/usr/bin/pkg-config --cflags-only-I nss | sed 's/-I//'`
-NSS_LIB_DIR=`/usr/bin/pkg-config --libs-only-L nss | sed 's/-L//'`
+NSS_INCLUDE_DIR=`/usr/bin/pkg-config --cflags-only-I nss-util | sed 's/-I//'`
+NSS_LIB_DIR=`/usr/bin/pkg-config --libs-only-L nss-util | sed 's/-L//'`
 
 export NSS_INCLUDE_DIR
 export NSS_LIB_DIR
@@ -310,6 +310,10 @@ done
 %{_includedir}/nss3/shsign.h
 
 %changelog
+* Thu Aug 27 2009 Elio Maldonado@<emaldona at redhat.com> - 3.12.3.99.3-19
+- Determine NSSUTIL_INCLUDE_DIR and NSSUTIL_LIB_DIR with a pkg-config query on nss-util
+- Remove the release 17 hack
+
 * Wed Aug 27 2009 Elio maldonado<emaldona at redhat.com> - 3.12.3.99.3-18
 - fix spurious executable permissions on nss-softokn.pc