- updated to 4.9

- updated acfix patch

Changed files:
    nspr-acfix.patch -> 1.6
    nspr.spec -> 1.73

diff --git a/nspr-acfix.patch b/nspr-acfix.patch
index 0784fe091781fac322d51845142e37b6da407c71..e7b781b6dd95a4621effcb9919b8bef187df51cd 100644 (file)
--- a/nspr-acfix.patch
+++ b/nspr-acfix.patch
@@ -1,6 +1,6 @@
---- nspr-4.7.1/mozilla/nsprpub/configure.in.orig       2008-04-29 01:21:11.000000000 +0200
-+++ nspr-4.7.1/mozilla/nsprpub/configure.in    2008-06-04 18:20:21.085383087 +0200
-@@ -427,7 +427,8 @@
+--- nspr-4.9/mozilla/nsprpub/configure.in.orig 2012-02-14 20:06:00.000000000 +0100
++++ nspr-4.9/mozilla/nsprpub/configure.in      2012-02-22 19:51:15.304052833 +0100
+@@ -596,7 +596,8 @@
  
      AC_MSG_CHECKING([whether the $host compiler ($HOST_CC $HOST_CFLAGS $HOST_LDFLAGS) works])
      AC_TRY_COMPILE([], [return(0);], 
@@ -10,7 +10,7 @@
          AC_MSG_ERROR([installation or configuration problem: $host compiler $HOST_CC cannot create executables.]) )
  
      CC=$_SAVE_CC
-@@ -2252,8 +2253,8 @@
+@@ -2708,8 +2709,8 @@
      ;;
  *)
      AC_CHECK_LIB(dl, dlopen,
@@ -21,40 +21,53 @@
      ;;
  esac
  
-@@ -2850,7 +2851,7 @@
+@@ -3350,7 +3351,7 @@
  dnl ========================================================
  dnl Generate output files.
  dnl ========================================================
 -MAKEFILES="
 +m4_define([MAKEFILES], [
- Makefile 
- config/Makefile
- config/autoconf.mk
-@@ -2884,24 +2885,12 @@
- pr/src/threads/Makefile 
- pr/tests/Makefile 
- pr/tests/dll/Makefile 
+     Makefile
+     config/Makefile
+     config/autoconf.mk
+@@ -3380,41 +3381,17 @@
+     pr/src/threads/Makefile
+     pr/tests/Makefile
+     pr/tests/dll/Makefile
 -"
 -
--dnl lib/tests/Makefile
--dnl pr/tests/w16gui/Makefile
--dnl tools/Makefile
+-if test "$OS_TARGET" = "Linux"; then
+-    MAKEFILES="$MAKEFILES
+         pkg/linux/Makefile
+-    "
+-elif test "$OS_TARGET" = "SunOS"; then
+-    MAKEFILES="$MAKEFILES
+         pkg/solaris/Makefile
+         pkg/solaris/SUNWpr/Makefile
+         pkg/solaris/SUNWprd/Makefile
+-    "
+-fi
 -
 -if test -z "$USE_PTHREADS" && test -z "$USE_BTHREADS"; then
--    MAKEFILES="$MAKEFILES pr/src/threads/combined/Makefile"
+-    MAKEFILES="$MAKEFILES
+         pr/src/threads/combined/Makefile
+-    "
 -elif test -n "$USE_PTHREADS"; then
--    MAKEFILES="$MAKEFILES pr/src/pthreads/Makefile"
+-    MAKEFILES="$MAKEFILES
+         pr/src/pthreads/Makefile
+-    "
 -elif test -n "$USE_BTHREADS"; then
--    MAKEFILES="$MAKEFILES pr/src/bthreads/Makefile"
+-    MAKEFILES="$MAKEFILES
+         pr/src/bthreads/Makefile
+-    "
 -fi
 -
 -if test -n "$USE_CPLUS"; then
--    MAKEFILES="$MAKEFILES pr/src/cplus/Makefile pr/src/cplus/tests/Makefile"
+-    MAKEFILES="$MAKEFILES
+         pr/src/cplus/Makefile
+         pr/src/cplus/tests/Makefile
+-    "
 -fi
-+pr/src/threads/combined/Makefile
-+pr/src/pthreads/Makefile
-+pr/src/bthreads/Makefile
-+pr/src/cplus/Makefile pr/src/cplus/tests/Makefile
 +])
  
 -echo $MAKEFILES > unallmakefiles

diff --git a/nspr.spec b/nspr.spec
index 339667d4332f74c9564d75d335d6ffb9e7e9575e..be10d95b08bc7a7800c4f216d6a04ca5138b00f6 100644 (file)
--- a/nspr.spec
+++ b/nspr.spec
@@ -1,13 +1,13 @@
 Summary:       Netscape Portable Runtime (NSPR)
 Summary(pl.UTF-8):     Przenośne biblioteki uruchomieniowe Netscape
 Name:          nspr
-Version:       4.8.9
+Version:       4.9
 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: 60770d45dc08c0f181b22cdfce5be3e8
+# Source0-md5: aa0c960b23a9d66a3c30c3e6ba80a99a
 Source1:       %{name}-mozilla-nspr.pc
 Patch0:                %{name}-acfix.patch
 Patch1:                %{name}-sparc64.patch