From 8f0c913d12da0f3ca1d28e16c883026e138190e036e5662298f20e4443814b0b Mon Sep 17 00:00:00 2001 From: Wolfgang Rosenauer Date: Fri, 1 Jun 2012 20:34:23 +0000 Subject: [PATCH] - update to version 4.9.1 * Android fixes * pkgconfig file included (removed our patch) * added Hurd support * honor EHOSTDOWN * a few smaller fixes - license change from tri-license to MPL-2.0 - update to version 4.9 OBS-URL: https://build.opensuse.org/package/show/mozilla:Factory/mozilla-nspr?expand=0&rev=40 --- mozilla-nspr.changes | 13 +++++++++- mozilla-nspr.spec | 6 ++--- nspr-4.9.0.tar.bz2 | 3 --- nspr-4.9.1.tar.bz2 | 3 +++ pkgconfig.patch | 61 -------------------------------------------- 5 files changed, 17 insertions(+), 69 deletions(-) delete mode 100644 nspr-4.9.0.tar.bz2 create mode 100644 nspr-4.9.1.tar.bz2 delete mode 100644 pkgconfig.patch diff --git a/mozilla-nspr.changes b/mozilla-nspr.changes index 2145c96..3bdda72 100644 --- a/mozilla-nspr.changes +++ b/mozilla-nspr.changes @@ -1,7 +1,18 @@ +------------------------------------------------------------------- +Fri Jun 1 14:57:37 UTC 2012 - wr@rosenauer.org + +- update to version 4.9.1 + * Android fixes + * pkgconfig file included (removed our patch) + * added Hurd support + * honor EHOSTDOWN + * a few smaller fixes +- license change from tri-license to MPL-2.0 + ------------------------------------------------------------------- Thu Feb 16 08:22:35 UTC 2012 - wr@rosenauer.org -- update to version 4.9 RTM +- update to version 4.9 - added testsuite in %check ------------------------------------------------------------------- diff --git a/mozilla-nspr.spec b/mozilla-nspr.spec index d102f06..63885c5 100644 --- a/mozilla-nspr.spec +++ b/mozilla-nspr.spec @@ -18,10 +18,10 @@ Name: mozilla-nspr -Version: 4.9.0 +Version: 4.9.1 Release: 0 Summary: Netscape Portable Runtime -License: MPL-1.1 or GPL-2.0+ or LGPL-2.1+ +License: MPL-2.0 Group: System/Libraries Url: http://www.mozilla.org/projects/nspr/ BuildRequires: gcc-c++ @@ -33,7 +33,6 @@ Obsoletes: mozilla-nspr-64bit # Source: ftp://ftp.mozilla.org/pub/nspr/releases/v%{version}/src/nspr-%{version}.tar.bz2 Source1: baselibs.conf -Patch: pkgconfig.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -63,7 +62,6 @@ memory management (malloc and free), and shared library linking. %prep %setup -n nspr-%{version} -q cd mozilla -%patch -p2 %build # set buildtime to "last-modification-time" diff --git a/nspr-4.9.0.tar.bz2 b/nspr-4.9.0.tar.bz2 deleted file mode 100644 index 4e7f5cf..0000000 --- a/nspr-4.9.0.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7baeef71b85fe2ca78c32a8a1082bf00630143adb411ab53a77984930c6320ab -size 910293 diff --git a/nspr-4.9.1.tar.bz2 b/nspr-4.9.1.tar.bz2 new file mode 100644 index 0000000..c39fc14 --- /dev/null +++ b/nspr-4.9.1.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d643a0355ff31faefa889d5f9746ba55997237071a9d44206fff81d54a5c0347 +size 879435 diff --git a/pkgconfig.patch b/pkgconfig.patch deleted file mode 100644 index e464f0d..0000000 --- a/pkgconfig.patch +++ /dev/null @@ -1,61 +0,0 @@ -diff -uprN '--exclude=CVS' nspr-4.9.0/mozilla/nsprpub/config/Makefile.in nspr-4.9.0.new/mozilla/nsprpub/config/Makefile.in ---- nspr-4.9.0/mozilla/nsprpub/config/Makefile.in 2009-05-20 21:54:24.000000000 +0200 -+++ nspr-4.9.0.new/mozilla/nsprpub/config/Makefile.in 2012-02-04 11:24:45.216139811 +0100 -@@ -52,9 +52,9 @@ VISIBILITY_FLAGS = - - # autoconf.mk must be deleted last (from the top-level directory) - # because it is included by every makefile. --DIST_GARBAGE = nsprincl.mk nsprincl.sh nspr-config -+DIST_GARBAGE = nsprincl.mk nsprincl.sh nspr-config nspr.pc - --RELEASE_BINS = nspr-config -+RELEASE_BINS = nspr-config nspr.pc - - include $(topsrcdir)/config/config.mk - -@@ -135,6 +135,7 @@ endef - - export:: $(TARGETS) - rm -f $(dist_bindir)/nspr-config -+ rm -f $(dist_bindir)/nspr.pc - - ifdef WRAP_SYSTEM_INCLUDES - export:: -diff -uprN '--exclude=CVS' nspr-4.9.0/mozilla/nsprpub/config/nspr.pc.in nspr-4.9.0.new/mozilla/nsprpub/config/nspr.pc.in ---- nspr-4.9.0/mozilla/nsprpub/config/nspr.pc.in 1970-01-01 01:00:00.000000000 +0100 -+++ nspr-4.9.0.new/mozilla/nsprpub/config/nspr.pc.in 2012-02-04 11:24:45.216139811 +0100 -@@ -0,0 +1,12 @@ -+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} -lplds@MOD_MAJOR_VERSION@ -lplc@MOD_MAJOR_VERSION@ -lnspr@MOD_MAJOR_VERSION@ -lpthread -ldl -+Cflags: -I${includedir} -+ -+ -diff -uprN '--exclude=CVS' nspr-4.9.0/mozilla/nsprpub/configure nspr-4.9.0.new/mozilla/nsprpub/configure ---- nspr-4.9.0/mozilla/nsprpub/configure 2012-02-04 10:59:12.000000000 +0100 -+++ nspr-4.9.0.new/mozilla/nsprpub/configure 2012-02-04 11:26:29.135863171 +0100 -@@ -6694,6 +6694,7 @@ MAKEFILES=" - config/nsprincl.mk - config/nsprincl.sh - config/nspr-config -+ config/nspr.pc - lib/Makefile - lib/ds/Makefile - lib/libc/Makefile -diff -uprN '--exclude=CVS' nspr-4.9.0/mozilla/nsprpub/configure.in nspr-4.9.0.new/mozilla/nsprpub/configure.in ---- nspr-4.9.0/mozilla/nsprpub/configure.in 2012-02-04 10:59:12.000000000 +0100 -+++ nspr-4.9.0.new/mozilla/nsprpub/configure.in 2012-02-04 11:26:01.873276991 +0100 -@@ -3357,6 +3357,7 @@ MAKEFILES=" - config/nsprincl.mk - config/nsprincl.sh - config/nspr-config -+ config/nspr.pc - lib/Makefile - lib/ds/Makefile - lib/libc/Makefile