[packages/nspr] - updated to 4.10 - updated acfix,pc patches - removed obsolete sparc64 patch
qboosh
qboosh at pld-linux.org
Sat Jun 8 06:58:01 CEST 2013
commit ac204f033d10b9687bb4e6986d1d42fb0510539d
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Sat Jun 8 06:57:48 2013 +0200
- updated to 4.10
- updated acfix,pc patches
- removed obsolete sparc64 patch
nspr-acfix.patch | 29 ++++-------------------------
nspr-pc.patch | 4 ++--
nspr-sparc64.patch | 54 ------------------------------------------------------
nspr.spec | 19 ++++++++-----------
4 files changed, 14 insertions(+), 92 deletions(-)
---
diff --git a/nspr.spec b/nspr.spec
index a5d1a47..12db48d 100644
--- a/nspr.spec
+++ b/nspr.spec
@@ -1,16 +1,15 @@
Summary: Netscape Portable Runtime (NSPR)
Summary(pl.UTF-8): Przenośne biblioteki uruchomieniowe Netscape
Name: nspr
-Version: 4.9.6
+Version: 4.10
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: 62b1e9d376d503d972f90c3c0031d879
+# Source0-md5: f5466def95726b3c900d8a0227bdd034
Patch0: %{name}-acfix.patch
-Patch1: %{name}-sparc64.patch
-Patch2: %{name}-pc.patch
+Patch1: %{name}-pc.patch
URL: http://www.mozilla.org/projects/nspr/
BuildRequires: autoconf >= 2.12
BuildRequires: automake
@@ -55,15 +54,14 @@ Statyczna biblioteka NSPR.
%prep
%setup -q
%patch0 -p1
-%patch1 -p0
-%patch2 -p1
+%patch1 -p1
# Win32-specific, requires autoconf2.13
-%{__rm} mozilla/nsprpub/build/autoconf/acwinpaths.m4 \
- mozilla/nsprpub/aclocal.m4
+%{__rm} nspr/build/autoconf/acwinpaths.m4 \
+ nspr/aclocal.m4
%build
-cd mozilla/nsprpub
+cd nspr
cp -f /usr/share/automake/config.sub build/autoconf
%{__autoconf}
%configure \
@@ -81,9 +79,8 @@ cp -f /usr/share/automake/config.sub build/autoconf
%install
rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{_pkgconfigdir}
-%{__make} -C mozilla/nsprpub install \
+%{__make} -C nspr install \
DESTDIR=$RPM_BUILD_ROOT
# for compatibility (upstream installs only nspr.nc); to be dropped sometime?
diff --git a/nspr-acfix.patch b/nspr-acfix.patch
index e7b781b..d4afe45 100644
--- a/nspr-acfix.patch
+++ b/nspr-acfix.patch
@@ -1,27 +1,6 @@
---- 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);],
-- [ac_cv_prog_host_cc_works=1 AC_MSG_RESULT([yes])],
-+ [ac_cv_prog_host_cc_works=1
-+ AC_MSG_RESULT([yes])],
- AC_MSG_ERROR([installation or configuration problem: $host compiler $HOST_CC cannot create executables.]) )
-
- CC=$_SAVE_CC
-@@ -2708,8 +2709,8 @@
- ;;
- *)
- AC_CHECK_LIB(dl, dlopen,
-- AC_CHECK_HEADER(dlfcn.h,
-- OS_LIBS="-ldl $OS_LIBS"))
-+ [AC_CHECK_HEADER(dlfcn.h,
-+ OS_LIBS="-ldl $OS_LIBS")])
- ;;
- esac
-
-@@ -3350,7 +3351,7 @@
+--- 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 ========================================================
@@ -30,7 +9,7 @@
Makefile
config/Makefile
config/autoconf.mk
-@@ -3380,41 +3381,17 @@
+@@ -3224,41 +3224,17 @@
pr/src/threads/Makefile
pr/tests/Makefile
pr/tests/dll/Makefile
diff --git a/nspr-pc.patch b/nspr-pc.patch
index a9c7d8c..46aa2a6 100644
--- a/nspr-pc.patch
+++ b/nspr-pc.patch
@@ -1,5 +1,5 @@
---- 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
+--- nspr-4.10/nspr/config/nspr.pc.in.orig 2012-05-19 00:26:17.000000000 +0200
++++ nspr-4.10/nspr/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 at .@MOD_MINOR_VERSION at .@MOD_PATCH_VERSION@
diff --git a/nspr-sparc64.patch b/nspr-sparc64.patch
deleted file mode 100644
index 3d6ae2b..0000000
--- a/nspr-sparc64.patch
+++ /dev/null
@@ -1,54 +0,0 @@
---- mozilla/nsprpub/pr/include/md/_linux.cfg.orig 2008-01-09 15:24:27.000000000 +0000
-+++ mozilla/nsprpub/pr/include/md/_linux.cfg 2008-01-09 15:24:45.000000000 +0000
-@@ -322,6 +322,51 @@
- #define PR_BYTES_PER_WORD_LOG2 2
- #define PR_BYTES_PER_DWORD_LOG2 3
-
-+#elif (defined(__sparc__) && defined(__arch64__))
-+
-+#undef IS_LITTLE_ENDIAN
-+#define IS_BIG_ENDIAN 1
-+
-+#define PR_BYTES_PER_BYTE 1
-+#define PR_BYTES_PER_SHORT 2
-+#define PR_BYTES_PER_INT 4
-+#define PR_BYTES_PER_INT64 8
-+#define PR_BYTES_PER_LONG 8
-+#define PR_BYTES_PER_FLOAT 4
-+#define PR_BYTES_PER_DOUBLE 8
-+#define PR_BYTES_PER_WORD 8
-+#define PR_BYTES_PER_DWORD 8
-+
-+#define PR_BITS_PER_BYTE 8
-+#define PR_BITS_PER_SHORT 16
-+#define PR_BITS_PER_INT 32
-+#define PR_BITS_PER_INT64 64
-+#define PR_BITS_PER_LONG 64
-+#define PR_BITS_PER_FLOAT 32
-+#define PR_BITS_PER_DOUBLE 64
-+#define PR_BITS_PER_WORD 64
-+
-+#define PR_BITS_PER_BYTE_LOG2 3
-+#define PR_BITS_PER_SHORT_LOG2 4
-+#define PR_BITS_PER_INT_LOG2 5
-+#define PR_BITS_PER_INT64_LOG2 6
-+#define PR_BITS_PER_LONG_LOG2 6
-+#define PR_BITS_PER_FLOAT_LOG2 5
-+#define PR_BITS_PER_DOUBLE_LOG2 6
-+#define PR_BITS_PER_WORD_LOG2 6
-+
-+#define PR_ALIGN_OF_SHORT 2
-+#define PR_ALIGN_OF_INT 4
-+#define PR_ALIGN_OF_LONG 8
-+#define PR_ALIGN_OF_INT64 8
-+#define PR_ALIGN_OF_FLOAT 4
-+#define PR_ALIGN_OF_DOUBLE 8
-+#define PR_ALIGN_OF_POINTER 8
-+#define PR_ALIGN_OF_WORD 8
-+
-+#define PR_BYTES_PER_WORD_LOG2 3
-+#define PR_BYTES_PER_DWORD_LOG2 3
-+
- #elif defined(__sparc__)
-
- #undef IS_LITTLE_ENDIAN
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/nspr.git/commitdiff/ac204f033d10b9687bb4e6986d1d42fb0510539d
More information about the pld-cvs-commit
mailing list