- updated to final 3.6 (20020929 snap was pre-3.6 beta)

[packages/nss.git] / nss.spec

diff --git a/nss.spec b/nss.spec
index a08df15b8deda51699103bcbf20483a8f9d5dc82..4000eca2bfb5ea99f421c714869a1faf03ceac26 100644 (file)
--- a/nss.spec
+++ b/nss.spec
@@ -1,49 +1,49 @@
-# $Revision: 1.12 $ $Date: 2002-01-26 06:52:03 $
+# $Revision: 1.30 $ $Date: 2002-10-21 11:45:12 $
 Summary:       NSS - Network Security Services
 Summary(pl):   NSS - Network Security Services
 Name:          nss
-Version:       3.3.1
-Release:       3
+Version:       3.6
+Release:       1
+Epoch:         1
 License:       GPL
 Group:         Libraries
-Group(de):     Libraries
-Group(es):     Bibliotecas
-Group(fr):     Librairies
-Group(pl):     Biblioteki
-Group(pt_BR):  Bibliotecas
-Group(ru):     âÉÂÌÉÏÔÅËÉ
-Group(uk):     â¦Â̦ÏÔÅËÉ
-Source0:       ftp://ftp.mozilla.org/pub/security/nss/releases/NSS_3_3_1_RTM/src/%{name}-%{version}.tar.gz
+Source0:       ftp://ftp.mozilla.org/pub/security/nss/releases/NSS_3_6_RTM/src/%{name}-%{version}.tar.gz
 Patch0:                %{name}-Makefile.patch
-BuildRequires: nspr-devel
-BuildRequires: zip
+Patch1:                %{name}-system-zlib.patch
+BuildRequires:  nspr-devel >= 4.2.2
+BuildRequires: zip >= 2.1
 BuildConflicts:        mozilla < 0.9.6-3
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 Obsoletes:     libnss3
 
-%description 
+%description
 NSS supports cross-platform development of security-enabled server
-applications. Applications built with NSS can support PKCS #5, PKCS
-#7, PKCS #11, PKCS #12, S/MIME, TLS, SSL v2 and v3, X.509 v3
+applications. Applications built with NSS can support PKCS #5, 
+PKCS #7, PKCS #11, PKCS #12, S/MIME, TLS, SSL v2 and v3, X.509 v3
 certificates, and other security standards.
 
 %description -l pl
-NNS wspomaga pisanie wieloplatformowych bezpiecznych serwerów.
-Aplikacja u¿ywaj±ca NSS jest w stanie obs³u¿yæ PKCS #5, PKCS #7, PKCS
-#11, PKCS #12, S/MIME, TLS, SSL v2 oraz v3, certyfikaty X.509 v3, i
+NSS wspomaga pisanie wieloplatformowych bezpiecznych serwerów.
+Aplikacja u¿ywaj±ca NSS jest w stanie obs³u¿yæ PKCS #5, PKCS #7, 
+PKCS #11, PKCS #12, S/MIME, TLS, SSL v2 oraz v3, certyfikaty X.509 v3, i
 wiele innych bezpiecznych standardów.
 
+%package tools
+Summary:       NSS command line tools and utilities
+Summary(pl):   Narzêdzia NSS
+Group:         Applications
+Requires:      %{name} = %{version}
+
+%description tools
+The NSS Toolkit command line tool.
+
+%description tools -l pl
+Narzêdzia NSS obs³ugiwane z linii poleceñ.
+
 %package devel
 Summary:       NSS - header files
 Summary(pl):   NSS - pliki nag³ówkowe
 Group:         Development/Libraries
-Group(de):     Entwicklung/Libraries
-Group(es):     Desarrollo/Bibliotecas
-Group(fr):     Development/Librairies
-Group(pl):     Programowanie/Biblioteki
-Group(pt_BR):  Desenvolvimento/Bibliotecas
-Group(ru):     òÁÚÒÁÂÏÔËÁ/âÉÂÌÉÏÔÅËÉ
-Group(uk):     òÏÚÒÏÂËÁ/â¦Â̦ÏÔÅËÉ
 Requires:      %{name} = %{version}
 Obsoletes:     libnss3-devel
 
@@ -53,31 +53,10 @@ Development part of NSS library.
 %description devel -l pl
 Czê¶æ biblioteki NSS przeznaczona dla programistów.
 
-%package tools
-Summary:       NSS command line tools and utilities
-Group:         Applications
-Group(de):     Applikationen
-Group(es):     Aplicaciones
-Group(fr):     Utilitaires
-Group(pl):     Aplikacje
-Group(pt):     Aplicações
-Group(pt_BR):  Aplicações
-Requires:      %{name} = %{version}
-
-%description tools
-The NSS Toolkit command line tool.
-
 %package static
 Summary:       NSS - static library
 Summary(pl):   NSS - biblioteka statyczna
 Group:         Development/Libraries
-Group(de):     Entwicklung/Libraries
-Group(es):     Desarrollo/Bibliotecas
-Group(fr):     Development/Librairies
-Group(pl):     Programowanie/Biblioteki
-Group(pt_BR):  Desenvolvimento/Bibliotecas
-Group(ru):     òÁÚÒÁÂÏÔËÁ/âÉÂÌÉÏÔÅËÉ
-Group(uk):     òÏÚÒÏÂËÁ/â¦Â̦ÏÔÅËÉ
 Requires:      %{name}-devel = %{version}
 
 %description static
@@ -89,6 +68,7 @@ Statyczne wersje bibliotek z NSS.
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
 cd mozilla/security/nss
@@ -111,7 +91,7 @@ cd mozilla/security/nss
        BUILD_OPT=1 \
        OPTIMIZER="%{rpmcflags}" \
        PLATFORM="pld"
-       
+
 %{__make} all \
        NSDISTMODE=copy \
        NS_USE_GCC=1 \
@@ -126,18 +106,21 @@ cd mozilla/security/nss
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_bindir},%{_includedir}/nss,%{_libdir}}
 
-install mozilla/dist/private/security/*        $RPM_BUILD_ROOT%{_includedir}/nss
+install mozilla/dist/private/nss/*     $RPM_BUILD_ROOT%{_includedir}/nss
 install mozilla/dist/public/dbm/*      $RPM_BUILD_ROOT%{_includedir}/nss
 install mozilla/dist/public/seccmd/*   $RPM_BUILD_ROOT%{_includedir}/nss
-install mozilla/dist/public/security/* $RPM_BUILD_ROOT%{_includedir}/nss
+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}
 
+# resolve conflict with squid
+mv -f $RPM_BUILD_ROOT%{_bindir}/{,nss-}client
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post   -p /sbin/ldconfig
-%postun -p /sbin/ldconfig
+%post  -p /sbin/ldconfig
+%postun        -p /sbin/ldconfig
 
 %files
 %defattr(644,root,root,755)
@@ -146,6 +129,7 @@ rm -rf $RPM_BUILD_ROOT
 %files devel
 %defattr(644,root,root,755)
 %{_includedir}/nss
+%{_libdir}/libcrmf.a
 
 %files tools
 %defattr(644,root,root,755)
@@ -153,4 +137,6 @@ rm -rf $RPM_BUILD_ROOT
 
 %files static
 %defattr(644,root,root,755)
-%{_libdir}/*.a
+%{_libdir}/lib[^c]*.a
+%{_libdir}/libc[^r]*.a
+%{_libdir}/libcr[^m]*.a