- updated to 4.9.1

- upstream now installs nspr.pc, so use it instead of additional source;
  added pc patch to provide Libs.private, include mozilla-nspr.pc symlink for compatibility

Changed files:
    nspr-mozilla-nspr.pc -> 1.5
    nspr-pc.patch -> 1.1
    nspr.spec -> 1.74

diff --git a/nspr-mozilla-nspr.pc b/nspr-mozilla-nspr.pc
deleted file mode 100644 (file)
index 8fc18c5..0000000
--- a/nspr-mozilla-nspr.pc
+++ /dev/null
@@ -1,10 +0,0 @@
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-includedir=@includedir@
-
-Name: NSPR
-Description: The Netscape Portable Runtime
-Version: @MOD_MAJOR_VERSION@.@MOD_MINOR_VERSION@.@MOD_PATCH_VERSION@
-Libs: -L${libdir} -lplds4 -lplc4 -lnspr4 -lpthread -ldl -lc -lpthread
-Cflags: -I${includedir}

diff --git a/nspr-pc.patch b/nspr-pc.patch
new file mode 100644 (file)
index 0000000..a9c7d8c
--- /dev/null
+++ b/nspr-pc.patch
@@ -0,0 +1,8 @@
+--- nspr-4.9.1/mozilla/nsprpub/config/nspr.pc.in.orig  2012-05-19 00:26:17.000000000 +0200
++++ nspr-4.9.1/mozilla/nsprpub/config/nspr.pc.in       2012-06-03 08:08:25.428360499 +0200
+@@ -7,4 +7,5 @@
+ Description: The Netscape Portable Runtime
+ Version: @MOD_MAJOR_VERSION@.@MOD_MINOR_VERSION@.@MOD_PATCH_VERSION@
+ Libs: -L@libdir@ -lplds@MOD_MAJOR_VERSION@ -lplc@MOD_MAJOR_VERSION@ -lnspr@MOD_MAJOR_VERSION@
++Libs.private: -lpthread -ldl
+ Cflags: -I@includedir@

diff --git a/nspr.spec b/nspr.spec
index be10d95b08bc7a7800c4f216d6a04ca5138b00f6..ec3193ed04c4c96a4318a2137e0a87bf07b0010b 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.9
+Version:       4.9.1
 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: aa0c960b23a9d66a3c30c3e6ba80a99a
-Source1:       %{name}-mozilla-nspr.pc
+# Source0-md5: d36d7b65a38f5b43ebd50ad3ad227120
 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
@@ -56,8 +56,7 @@ Statyczna biblioteka NSPR.
 %setup -q
 %patch0 -p1
 %patch1 -p0
-
-install %{SOURCE1} mozilla/nsprpub/nspr-mozilla-nspr.pc.in
+%patch2 -p1
 
 # Win32-specific, requires autoconf2.13
 %{__rm} mozilla/nsprpub/build/autoconf/acwinpaths.m4 \
@@ -80,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}
@@ -89,9 +86,8 @@ 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}