up to 4.35

[packages/nspr.git] / nspr.spec

diff --git a/nspr.spec b/nspr.spec
index be10d95b08bc7a7800c4f216d6a04ca5138b00f6..6385b1177e9674570b2f71ab1a0f775fc59e7ef5 100644 (file)
--- a/nspr.spec
+++ b/nspr.spec
@@ -1,18 +1,16 @@
 Summary:       Netscape Portable Runtime (NSPR)
 Summary(pl.UTF-8):     Przenośne biblioteki uruchomieniowe Netscape
 Name:          nspr
-Version:       4.9
+Version:       4.35
 Release:       1
 Epoch:         1
-License:       MPL v1.1 or GPL v2+ or LGPL v2.1+
+License:       MPL v2.0
 Group:         Libraries
-Source0:       http://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v%{version}/src/%{name}-%{version}.tar.gz
-# Source0-md5: aa0c960b23a9d66a3c30c3e6ba80a99a
-Source1:       %{name}-mozilla-nspr.pc
-Patch0:                %{name}-acfix.patch
-Patch1:                %{name}-sparc64.patch
-URL:           http://www.mozilla.org/projects/nspr/
-BuildRequires: autoconf >= 2.12
+Source0:       https://ftp.mozilla.org/pub/nspr/releases/v%{version}/src/%{name}-%{version}.tar.gz
+# Source0-md5: 5e0acf9fbdde85181bddd510f4624841
+Patch0:                %{name}-pc.patch
+URL:           https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSPR
+BuildRequires: autoconf >= 2.61
 BuildRequires: automake
 BuildRequires: sed >= 4.0
 Obsoletes:     nspr-pthreads
@@ -55,22 +53,18 @@ Statyczna biblioteka NSPR.
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p0
-
-install %{SOURCE1} mozilla/nsprpub/nspr-mozilla-nspr.pc.in
-
-# Win32-specific, requires autoconf2.13
-%{__rm} mozilla/nsprpub/build/autoconf/acwinpaths.m4 \
-       mozilla/nsprpub/aclocal.m4
 
 %build
-cd mozilla/nsprpub
+cd nspr
 cp -f /usr/share/automake/config.sub build/autoconf
 %{__autoconf}
 %configure \
        --includedir=%{_includedir}/nspr \
 %ifarch %{x8664} ppc64
        --enable-64bit \
+%endif
+%ifarch x32
+       --enable-x32 \
 %endif
        --%{?debug:en}%{!?debug:dis}able-debug \
        --enable-ipv6 \
@@ -80,18 +74,14 @@ cp -f /usr/share/automake/config.sub build/autoconf
 
 %{__make}
 
-./config.status --file=nspr-mozilla-nspr.pc
-
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{_pkgconfigdir}
 
-%{__make} -C mozilla/nsprpub install \
+%{__make} -C nspr install \
        DESTDIR=$RPM_BUILD_ROOT
 
-install mozilla/nsprpub/nspr-mozilla-nspr.pc $RPM_BUILD_ROOT%{_pkgconfigdir}/mozilla-nspr.pc
-
-ln -s mozilla-nspr.pc $RPM_BUILD_ROOT%{_pkgconfigdir}/nspr.pc
+# for compatibility (upstream installs only nspr.nc); to be dropped sometime?
+ln -s nspr.pc $RPM_BUILD_ROOT%{_pkgconfigdir}/mozilla-nspr.pc
 
 %{__rm} $RPM_BUILD_ROOT%{_bindir}/{compile-et.pl,prerr.properties}