- up to 4.9.5

[packages/nspr.git] / nspr.spec

diff --git a/nspr.spec b/nspr.spec
index 6b151317831ec5d69186cc8bb12720bdb8b563a1..d317896bd5e2db7c390bc9a0131e5bb70c5f4824 100644 (file)
--- a/nspr.spec
+++ b/nspr.spec
@@ -1,16 +1,16 @@
 Summary:       Netscape Portable Runtime (NSPR)
 Summary(pl.UTF-8):     Przenośne biblioteki uruchomieniowe Netscape
 Name:          nspr
-Version:       4.7.1
+Version:       4.9.5
 Release:       1
 Epoch:         1
 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: 7c6e75a0867ce2b9ec62e399a908b5ac
-Source1:       %{name}-mozilla-nspr.pc
+# Source0-md5: b6ccfa8fcbbeb17ebeb19a3edff612bd
 Patch0:                %{name}-acfix.patch
 Patch1:                %{name}-sparc64.patch
+Patch2:                %{name}-pc.patch
 URL:           http://www.mozilla.org/projects/nspr/
 BuildRequires: autoconf >= 2.12
 BuildRequires: automake
@@ -23,7 +23,8 @@ Libraries that implement cross-platform runtime services from
 Netscape.
 
 %description -l pl.UTF-8
-Biblioteki z wieloplatformową implementacją usług z Netscape.
+Biblioteki z wieloplatformową implementacją usług
+uruchomieniowych Netscape'a.
 
 %package devel
 Summary:       NSPR library header files for development
@@ -36,7 +37,7 @@ Obsoletes:    nspr-pthreads-devel
 Header files for the NSPR library from Netscape.
 
 %description devel -l pl.UTF-8
-Pliki nagłówkowe bibliotek NSPR z Netscape.
+Pliki nagłówkowe bibliotek NSPR Netscape'a.
 
 %package static
 Summary:       Static NSPR library
@@ -55,8 +56,11 @@ Statyczna biblioteka NSPR.
 %setup -q
 %patch0 -p1
 %patch1 -p0
+%patch2 -p1
 
-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
@@ -75,8 +79,6 @@ 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}
@@ -84,11 +86,10 @@ install -d $RPM_BUILD_ROOT%{_pkgconfigdir}
 %{__make} -C mozilla/nsprpub 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}
+%{__rm} $RPM_BUILD_ROOT%{_bindir}/{compile-et.pl,prerr.properties}
 
 %clean
 rm -rf $RPM_BUILD_ROOT