X-Git-Url: https://git.pld-linux.org/?p=packages%2Fnspr.git;a=blobdiff_plain;f=nspr.spec;h=6385b1177e9674570b2f71ab1a0f775fc59e7ef5;hp=179fe8a502d45c7eff34a32a31295c57077241a6;hb=HEAD;hpb=14dc3614c3768664974c79166a1679550b2793f3

diff --git a/nspr.spec b/nspr.spec
index 179fe8a..6385b11 100644
--- a/nspr.spec
+++ b/nspr.spec
@@ -1,18 +1,16 @@
 Summary:	Netscape Portable Runtime (NSPR)
-Summary(pl):	Przeno¶ne biblioteki uruchomieniowe Netscape
+Summary(pl.UTF-8):	Przenośne biblioteki uruchomieniowe Netscape
 Name:		nspr
-Version:	4.6.4
+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:	ftp://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v%{version}/src/%{name}-%{version}.tar.gz
-# Source0-md5:	43db60ab2ff1599c17d3a3f55caa7d47
-Source1:	%{name}-mozilla-nspr.pc
-Patch0:		%{name}-am18.patch
-Patch1:		%{name}-acfix.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
@@ -22,12 +20,13 @@ BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 Libraries that implement cross-platform runtime services from
 Netscape.
 
-%description -l pl
-Biblioteki z wieloplatformow± implementacj± us³ug z Netscape.
+%description -l pl.UTF-8
+Biblioteki z wieloplatformową implementacją usług
+uruchomieniowych Netscape'a.
 
 %package devel
 Summary:	NSPR library header files for development
-Summary(pl):	Pliki nag³ówkowe bibliotek NSPR
+Summary(pl.UTF-8):	Pliki nagłówkowe bibliotek NSPR
 Group:		Development/Libraries
 Requires:	%{name} = %{epoch}:%{version}-%{release}
 Obsoletes:	nspr-pthreads-devel
@@ -35,12 +34,12 @@ Obsoletes:	nspr-pthreads-devel
 %description devel
 Header files for the NSPR library from Netscape.
 
-%description devel -l pl
-Pliki nag³ówkowe bibliotek NSPR z Netscape.
+%description devel -l pl.UTF-8
+Pliki nagłówkowe bibliotek NSPR Netscape'a.
 
 %package static
 Summary:	Static NSPR library
-Summary(pl):	Statyczna biblioteka NSPR
+Summary(pl.UTF-8):	Statyczna biblioteka NSPR
 Group:		Development/Libraries
 Requires:	%{name}-devel = %{epoch}:%{version}-%{release}
 Obsoletes:	nspr-pthreads-static
@@ -48,58 +47,43 @@ Obsoletes:	nspr-pthreads-static
 %description static
 Static NSPR library.
 
-%description static -l pl
+%description static -l pl.UTF-8
 Statyczna biblioteka NSPR.
 
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
-
-# @includedir@ is not updated to .../nspr
-sed -i -e 's,@includedir@,%{_includedir}/nspr,' mozilla/nsprpub/config/nspr-config.in
 
 %build
-cd mozilla/nsprpub
+cd nspr
 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 \
+	--includedir=%{_includedir}/nspr \
 %ifarch %{x8664} ppc64
 	--enable-64bit \
 %endif
-	--enable-optimize="%{rpmcflags}" \
+%ifarch x32
+	--enable-x32 \
+%endif
 	--%{?debug:en}%{!?debug:dis}able-debug \
-	%{!?debug:--enable-strip} \
-	--with-pthreads \
-	--enable-ipv6
+	--enable-ipv6 \
+	--enable-optimize="%{rpmcflags}" \
+	--with-mozilla \
+	--with-pthreads
 
 %{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_aclocaldir},%{_pkgconfigdir}}
-
-cd mozilla/nsprpub
-%{__make} install \
-	NSDISTMODE=copy
-
-install config/%{name}.m4 $RPM_BUILD_ROOT%{_aclocaldir}
-install config/%{name}-config $RPM_BUILD_ROOT%{_bindir}
 
-sed \
-	-e 's#libdir=.*#libdir=%{_libdir}#g' \
-	-e 's#includedir=.*#includedir=%{_includedir}#g' \
-	-e 's#VERSION#%{version}#g' \
-	%{SOURCE1} > $RPM_BUILD_ROOT%{_pkgconfigdir}/mozilla-nspr.pc
+%{__make} -C nspr install \
+	DESTDIR=$RPM_BUILD_ROOT
 
-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
 
-# let rpm find deps
-chmod 755 $RPM_BUILD_ROOT%{_libdir}/lib*.so
+%{__rm} $RPM_BUILD_ROOT%{_bindir}/{compile-et.pl,prerr.properties}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -109,15 +93,20 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/lib*.so
+%attr(755,root,root) %{_libdir}/libnspr4.so
+%attr(755,root,root) %{_libdir}/libplc4.so
+%attr(755,root,root) %{_libdir}/libplds4.so
 
 %files devel
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/nspr-config
 %{_includedir}/nspr
-%{_aclocaldir}/*.m4
-%{_pkgconfigdir}/*.pc
+%{_aclocaldir}/nspr.m4
+%{_pkgconfigdir}/mozilla-nspr.pc
+%{_pkgconfigdir}/nspr.pc
 
 %files static
 %defattr(644,root,root,755)
-%{_libdir}/lib*.a
+%{_libdir}/libnspr4.a
+%{_libdir}/libplc4.a
+%{_libdir}/libplds4.a