- merged 4.6-beta snap from DEVEL

[packages/nspr.git] / nspr.spec

diff --git a/nspr.spec b/nspr.spec
index 589c84345a8196a35403fff0e37f0406cebf60d3..2802108eae17461b540f83667601fdf35730fa35 100644 (file)
--- a/nspr.spec
+++ b/nspr.spec
@@ -1,17 +1,21 @@
 Summary:       Netscape Portable Runtime (NSPR)
 Summary(pl):   Przeno¶ne biblioteki uruchomieniowe Netscape
 Name:          nspr
-Version:       4.4.1
-Release:       3
+Version:       4.6
+%define        snap    20041030
+Release:       0.%{snap}.1
 Epoch:         1
-License:       MPL or GPL
+License:       MPL v1.1 or GPL v2+ or LGPL v2.1+
 Group:         Libraries
-Source0:       http://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v%{version}/src/%{name}-%{version}.tar.gz
-# Source0-md5: 6187ec5f2c01554ceef2db35160f84dc
+# :pserver:anonymous@cvs-mirror.mozilla.org:/cvsroot mozilla/nsprpub -A
+# (still waiting for -r NSPR_4_6_RTM)
+Source0:       %{name}-%{version}-%{snap}.tar.bz2
+# Source0-md5: b8b224d015b28ed47cbad573e0a3d363
+# releases
+#Source0:      http://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v%{version}/src/%{name}-%{version}.tar.gz
 Patch0:                %{name}-am18.patch
 Patch1:                %{name}-acfix.patch
-Patch2:                %{name}-amd64.patch
-Patch3:                %{name}-libdir.patch
+Patch2:                %{name}-libdir.patch
 BuildRequires: autoconf >= 2.12
 BuildRequires: automake
 Obsoletes:     nspr-pthreads
@@ -28,7 +32,7 @@ Biblioteki z wieloplatformow
 Summary:       NSPR library header files for development
 Summary(pl):   Pliki nag³ówkowe bibliotek NSPR
 Group:         Development/Libraries
-Requires:      %{name} = %{epoch}:%{version}
+Requires:      %{name} = %{epoch}:%{version}-%{release}
 Obsoletes:     nspr-pthreads-devel
 
 %description devel
@@ -41,7 +45,7 @@ Pliki nag
 Summary:       Static NSPR library
 Summary(pl):   Statyczna biblioteka NSPR
 Group:         Development/Libraries
-Requires:      %{name}-devel = %{epoch}:%{version}
+Requires:      %{name}-devel = %{epoch}:%{version}-%{release}
 Obsoletes:     nspr-pthreads-static
 
 %description static
@@ -51,15 +55,14 @@ Static NSPR library.
 Statyczna biblioteka NSPR.
 
 %prep
-%setup -q
+%setup -q -n %{name}-%{version}.HEAD
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
-%patch3 -p1
 
 %build
 cd mozilla/nsprpub
-cp /usr/share/automake/config.sub build/autoconf/
+cp -f /usr/share/automake/config.sub build/autoconf
 %{__autoconf}
 # don't use "--disable-strip" - it will cause stripping
 %configure \