- added nss-config (subst based on suse spec)

- add nss.pc
- nspr epoch
- 1 jobserver because it fails otherwise

Changed files:
    nss.spec -> 1.69

diff --git a/nss.spec b/nss.spec
index 0e9a47f9906c36231ac81d4d5c28920c71028932..1238e04cb0eee96889bb0999915093b53d6362aa 100644 (file)
--- a/nss.spec
+++ b/nss.spec
@@ -1,8 +1,8 @@
+%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
@@ -15,9 +15,10 @@ Group:               Libraries
 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
@@ -86,7 +87,7 @@ cd mozilla/security/nss
 export USE_64=1
 %endif
 
-%{__make} build_coreconf \
+%{__make} -j1 build_coreconf \
        NSDISTMODE=copy \
        NS_USE_GCC=1 \
        MOZILLA_CLIENT=1 \
@@ -95,7 +96,7 @@ export USE_64=1
        BUILD_OPT=1 \
        OPTIMIZER="%{rpmcflags}"
 
-%{__make} build_dbm \
+%{__make} -j1 build_dbm \
        NSDISTMODE=copy \
        NS_USE_GCC=1 \
        MOZILLA_CLIENT=1 \
@@ -105,7 +106,7 @@ export USE_64=1
        OPTIMIZER="%{rpmcflags}" \
        PLATFORM="pld"
 
-%{__make} all \
+%{__make} -j1 all \
        NSDISTMODE=copy \
        NS_USE_GCC=1 \
        MOZILLA_CLIENT=1 \
@@ -127,11 +128,26 @@ install mozilla/dist/public/nss/* $RPM_BUILD_ROOT%{_includedir}/nss
 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,@libdir@,%{_libdir},g
+       s,@prefix@,%{_prefix},g
+       s,@exec_prefix@,%{_prefix},g
+       s,@includedir@,%{_includedir}/nss3,g
+       s,@MOD_MAJOR_VERSION@,$NSS_VMAJOR,g
+       s,@MOD_MINOR_VERSION@,$NSS_VMINOR,g
+       s,@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
@@ -152,10 +168,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_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)