SPECS: nss.spec - added nss-config (subst based on suse spec) - ad...

[glen]

Author: glen                         Date: Wed Nov  1 23:57:24 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- added nss-config (subst based on suse spec)
- add nss.pc
- nspr epoch
- 1 jobserver because it fails otherwise

---- Files affected:
SPECS:
   nss.spec (1.68 -> 1.69) 

---- Diffs:

================================================================
Index: SPECS/nss.spec
diff -u SPECS/nss.spec:1.68 SPECS/nss.spec:1.69
--- SPECS/nss.spec:1.68	Sat Sep 16 19:57:51 2006
+++ SPECS/nss.spec	Thu Nov  2 00:57:19 2006
@@ -1,9 +1,9 @@
 # $Revision$, $Date$
+%define	foover	%(echo %{version} | tr . _)
 Summary:	NSS - Network Security Services
 Summary(pl):	NSS - Network Security Services
 Name:		nss
 Version:	3.11.3
-%define	foover	%(echo %{version} | tr . _)
 Release:	1
 Epoch:		1
 License:	GPL
@@ -16,9 +16,10 @@
 Source0:	ftp://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_%{foover}_RTM/src/%{name}-%{version}.tar.gz
 # Source0-md5:	196c8d2746bd75d3561d129f64bbf9cf
 Source1:	%{name}-mozilla-nss.pc
+Source2:	%{name}-config.in
 Patch0:		%{name}-Makefile.patch
 URL:		http://www.mozilla.org/projects/security/pki/nss/
-BuildRequires:	nspr-devel >= 4.6.3
+BuildRequires:	nspr-devel >= 1:4.6.3
 BuildRequires:	zlib-devel
 BuildConflicts:	mozilla < 0.9.6-3
 Requires:	nspr >= 1:4.6.3
@@ -87,7 +88,7 @@
 export USE_64=1
 %endif
 
-%{__make} build_coreconf \
+%{__make} -j1 build_coreconf \
 	NSDISTMODE=copy \
 	NS_USE_GCC=1 \
 	MOZILLA_CLIENT=1 \
@@ -96,7 +97,7 @@
 	BUILD_OPT=1 \
 	OPTIMIZER="%{rpmcflags}"
 
-%{__make} build_dbm \
+%{__make} -j1 build_dbm \
 	NSDISTMODE=copy \
 	NS_USE_GCC=1 \
 	MOZILLA_CLIENT=1 \
@@ -106,7 +107,7 @@
 	OPTIMIZER="%{rpmcflags}" \
 	PLATFORM="pld"
 
-%{__make} all \
+%{__make} -j1 all \
 	NSDISTMODE=copy \
 	NS_USE_GCC=1 \
 	MOZILLA_CLIENT=1 \
@@ -128,11 +129,26 @@
 install mozilla/dist/pld/bin/*		$RPM_BUILD_ROOT%{_bindir}
 install mozilla/dist/pld/lib/*		$RPM_BUILD_ROOT%{_libdir}
 
-sed \
-	-e 's#libdir=.*#libdir=%{_libdir}#g' \
-	-e 's#includedir=.*#includedir=%{_includedir}#g' \
-	-e 's#VERSION#%{version}#g' \
-	%{SOURCE1} > $RPM_BUILD_ROOT%{_pkgconfigdir}/mozilla-nss.pc
+%{__sed} -e '
+	s#libdir=.*#libdir=%{_libdir}#g
+	s#includedir=.*#includedir=%{_includedir}#g
+	s#VERSION#%{version}#g
+' %{SOURCE1} > $RPM_BUILD_ROOT%{_pkgconfigdir}/mozilla-nss.pc
+ln -s mozilla-nss.pc $RPM_BUILD_ROOT%{_pkgconfigdir}/nss.pc
+
+NSS_VMAJOR=$(awk '/#define.*NSS_VMAJOR/ {print $3}' mozilla/security/nss/lib/nss/nss.h)
+NSS_VMINOR=$(awk '/#define.*NSS_VMINOR/ {print $3}' mozilla/security/nss/lib/nss/nss.h)
+NSS_VPATCH=$(awk '/#define.*NSS_VPATCH/ {print $3}' mozilla/security/nss/lib/nss/nss.h)
+%{__sed} -e "
+	s, at libdir@,%{_libdir},g
+	s, at prefix@,%{_prefix},g
+	s, at exec_prefix@,%{_prefix},g
+	s, at includedir@,%{_includedir}/nss3,g
+	s, at MOD_MAJOR_VERSION@,$NSS_VMAJOR,g
+	s, at MOD_MINOR_VERSION@,$NSS_VMINOR,g
+	s, at MOD_PATCH_VERSION@,$NSS_VPATCH,g
+" %{SOURCE2} > $RPM_BUILD_ROOT%{_bindir}/nss-config
+chmod +x $RPM_BUILD_ROOT%{_bindir}/nss-config
 
 # resolve conflict with squid
 mv -f $RPM_BUILD_ROOT%{_bindir}/{,nss-}client
@@ -153,10 +169,12 @@
 %{_includedir}/nss
 %{_libdir}/libcrmf.a
 %{_pkgconfigdir}/*.pc
+%{_bindir}/nss-config
 
 %files tools
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/*
+%exclude %{_bindir}/nss-config
 
 %files static
 %defattr(644,root,root,755)
@@ -169,6 +187,12 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.69  2006/11/01 23:57:19  glen
+- added nss-config (subst based on suse spec)
+- add nss.pc
+- nspr epoch
+- 1 jobserver because it fails otherwise
+
 Revision 1.68  2006/09/16 17:57:51  charles
 - BR s/zip/zlib-devel/
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/nss.spec?r1=1.68&r2=1.69&f=u