- merged 4.6-beta snap from DEVEL

[packages/nspr.git] / nspr.spec

diff --git a/nspr.spec b/nspr.spec
index bcb65d0efd93e563a92a5ee3f775ac525d657538..2802108eae17461b540f83667601fdf35730fa35 100644 (file)
--- a/nspr.spec
+++ b/nspr.spec
@@ -1,12 +1,24 @@
 Summary:       Netscape Portable Runtime (NSPR)
 Summary(pl):   Przeno¶ne biblioteki uruchomieniowe Netscape
 Name:          nspr
-Version:       4.1.2
-Release:       2
-License:       GPL
+Version:       4.6
+%define        snap    20041030
+Release:       0.%{snap}.1
+Epoch:         1
+License:       MPL v1.1 or GPL v2+ or LGPL v2.1+
 Group:         Libraries
-Source0:       ftp://ftp.mozilla.org/pub/nspr/releases/v%{version}/src/%{name}-%{version}.tar.gz
-Patch0:                %{name}-moz0.9.6.patch.gz
+# :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}-libdir.patch
+BuildRequires: autoconf >= 2.12
+BuildRequires: automake
+Obsoletes:     nspr-pthreads
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -20,7 +32,8 @@ Biblioteki z wieloplatformow
 Summary:       NSPR library header files for development
 Summary(pl):   Pliki nag³ówkowe bibliotek NSPR
 Group:         Development/Libraries
-Requires:      %{name} = %{version}
+Requires:      %{name} = %{epoch}:%{version}-%{release}
+Obsoletes:     nspr-pthreads-devel
 
 %description devel
 Header files for the NSPR library from Netscape.
@@ -32,7 +45,8 @@ Pliki nag
 Summary:       Static NSPR library
 Summary(pl):   Statyczna biblioteka NSPR
 Group:         Development/Libraries
-Requires:      %{name}-devel = %{version}
+Requires:      %{name}-devel = %{epoch}:%{version}-%{release}
+Obsoletes:     nspr-pthreads-static
 
 %description static
 Static NSPR library.
@@ -41,22 +55,27 @@ Static NSPR library.
 Statyczna biblioteka NSPR.
 
 %prep
-%setup -q
+%setup -q -n %{name}-%{version}.HEAD
 %patch0 -p1
+%patch1 -p1
+%patch2 -p1
 
 %build
 cd mozilla/nsprpub
-autoconf
+cp -f /usr/share/automake/config.sub build/autoconf
+%{__autoconf}
+# don't use "--disable-strip" - it will cause stripping
 %configure \
        --with-dist-prefix=$RPM_BUILD_ROOT%{_prefix} \
+       --with-dist-libdir=$RPM_BUILD_ROOT%{_libdir} \
        --with-mozilla \
        --enable-optimize="%{rpmcflags}" \
-       --disable-debug \
-       --enable-strip \
+       --%{?debug:en}%{!?debug:dis}able-debug \
+       %{!?debug:--enable-strip} \
        --with-pthreads \
        --enable-ipv6
 
-%{__make}      
+%{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT