- updated to 4.10.5

- removed obsolete acfix patch; autoconf 2.61+ is now required
- License is (GPL-compatible) MPL v2.0 now

diff --git a/nspr-acfix.patch b/nspr-acfix.patch
deleted file mode 100644 (file)
index d4afe45..0000000
--- a/nspr-acfix.patch
+++ /dev/null
@@ -1,56 +0,0 @@
---- nspr-4.10/nspr/configure.in.orig   2013-05-28 23:39:29.000000000 +0200
-+++ nspr-4.10/nspr/configure.in        2013-06-08 06:25:10.860289567 +0200
-@@ -3193,7 +3193,7 @@
- dnl ========================================================
- dnl Generate output files.
- dnl ========================================================
--MAKEFILES="
-+m4_define([MAKEFILES], [
-     Makefile
-     config/Makefile
-     config/autoconf.mk
-@@ -3224,41 +3224,17 @@
-     pr/src/threads/Makefile
-     pr/tests/Makefile
-     pr/tests/dll/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
--    "
--elif test -n "$USE_PTHREADS"; then
--    MAKEFILES="$MAKEFILES
-         pr/src/pthreads/Makefile
--    "
--elif test -n "$USE_BTHREADS"; then
--    MAKEFILES="$MAKEFILES
-         pr/src/bthreads/Makefile
--    "
--fi
--
--if test -n "$USE_CPLUS"; then
--    MAKEFILES="$MAKEFILES
-         pr/src/cplus/Makefile
-         pr/src/cplus/tests/Makefile
--    "
--fi
-+])
- 
--echo $MAKEFILES > unallmakefiles
-+echo "MAKEFILES" > unallmakefiles
- 
--AC_OUTPUT([$MAKEFILES], [chmod +x config/nspr-config])
-+AC_OUTPUT(MAKEFILES, [chmod +x config/nspr-config])

diff --git a/nspr.spec b/nspr.spec
index 769103822dfd87f65e7776bf5291d8bca71b981b..935f60f041b2bddd7a52658ae7d062edb25ce8b2 100644 (file)
--- a/nspr.spec
+++ b/nspr.spec
@@ -1,17 +1,16 @@
 Summary:       Netscape Portable Runtime (NSPR)
 Summary(pl.UTF-8):     Przenośne biblioteki uruchomieniowe Netscape
 Name:          nspr
-Version:       4.10.4
+Version:       4.10.5
 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: db8e5c40dadcf3f71a20c01f503c573a
-Patch0:                %{name}-acfix.patch
-Patch1:                %{name}-pc.patch
+# Source0-md5: c903557c620b4b84457f57ddc80934c4
+Patch0:                %{name}-pc.patch
 URL:           http://www.mozilla.org/projects/nspr/
-BuildRequires: autoconf >= 2.12
+BuildRequires: autoconf >= 2.61
 BuildRequires: automake
 BuildRequires: sed >= 4.0
 Obsoletes:     nspr-pthreads
@@ -54,11 +53,6 @@ Statyczna biblioteka NSPR.
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
-
-# Win32-specific, requires autoconf2.13
-%{__rm} nspr/build/autoconf/acwinpaths.m4 \
-       nspr/aclocal.m4
 
 %build
 cd nspr