- merge from DEVEL (20020929 snap) - mozilla 1.0 still works, mozilla 1.1 builds

[packages/nss.git] / nss.spec

diff --git a/nss.spec b/nss.spec
index 55b778b649b30a98f6e00040772a04c7a01d4462..e8e4f8a3fc8e3787cd4143b6cffd2bb232c5be95 100644 (file)
--- a/nss.spec
+++ b/nss.spec
@@ -1,15 +1,17 @@
-# $Revision: 1.24 $ $Date: 2002-04-16 15:53:40 $
+# $Revision: 1.29 $ $Date: 2002-10-18 09:01:28 $
 Summary:       NSS - Network Security Services
 Summary(pl):   NSS - Network Security Services
 Name:          nss
-Version:       3.4.rc1
-Release:       1
+Version:       3.4.2
+%define                snap    20020929
+Release:       3.%{snap}
+Epoch:         1
 License:       GPL
 Group:         Libraries
-Source0:       ftp://ftp.mozilla.org/pub/security/nss/releases/NSS_3_4_RC1/src/%{name}-%{version}.tar.gz
+#Source0:      ftp://ftp.mozilla.org/pub/security/nss/releases/NSS_3_4_2_RTM/src/%{name}-%{version}.tar.gz
+Source0:       %{name}-%{snap}.tar.bz2
 Patch0:                %{name}-Makefile.patch
-Patch1:                %{name}-dbm.patch.bz2
-Patch2:                %{name}-system-zlib.patch
+Patch1:                %{name}-system-zlib.patch
 BuildRequires:  nspr-devel >= 4.1.2-3
 BuildRequires: zip >= 2.1
 BuildConflicts:        mozilla < 0.9.6-3
@@ -18,16 +20,28 @@ Obsoletes:  libnss3
 
 %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
 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
+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
@@ -41,18 +55,6 @@ 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
-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 static
 Summary:       NSS - static library
 Summary(pl):   NSS - biblioteka statyczna
@@ -66,10 +68,9 @@ Static NSS Toolkit libraries.
 Statyczne wersje bibliotek z NSS.
 
 %prep
-%setup -q
+%setup -q -n %{name}-%{snap}
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
 
 %build
 cd mozilla/security/nss
@@ -107,13 +108,16 @@ 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