Accepting request 105666 from mozilla:Factory

OBS-URL: https://build.opensuse.org/request/show/105666 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/mozilla-nspr?expand=0&rev=34
2012-02-17 14:00:45 +00:00 · 2012-02-17 14:00:45 +00:00 · 851624cff1
commit 851624cff1
parent 5093c7ab5f c95648fd50
5 changed files with 55 additions and 41 deletions
--- a/mozilla-nspr.changes
+++ b/mozilla-nspr.changes
@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Feb 16 08:22:35 UTC 2012 - wr@rosenauer.org
+
+- update to version 4.9 RTM
+- added testsuite in %check
+
 -------------------------------------------------------------------
 Wed Sep 21 09:01:27 UTC 2011 - wr@rosenauer.org

--- a/mozilla-nspr.spec
+++ b/mozilla-nspr.spec
@ -1,8 +1,8 @@
 #
 # spec file for package mozilla-nspr
 #
-# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
-#               2006-2011 Wolfgang Rosenauer
+# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
+#               2006-2012 Wolfgang Rosenauer
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@ -17,12 +17,12 @@
 #


-
 Name:           mozilla-nspr
-Version:        4.8.9
-Release:        1
-License:        MPL-1.1 or GPL-2.0+ or LGPL-2.1+
+Version:        4.9.0
+Release:        0
 Summary:        Netscape Portable Runtime
+License:        MPL-1.1 or GPL-2.0+ or LGPL-2.1+
+Group:          System/Libraries
 Url:            http://www.mozilla.org/projects/nspr/
 BuildRequires:  gcc-c++
 BuildRequires:  pkg-config
@ -31,7 +31,6 @@ BuildRequires:  pkg-config
 Obsoletes:      mozilla-nspr-64bit
 %endif
 #
-Group:          System/Libraries
 Source:         ftp://ftp.mozilla.org/pub/nspr/releases/v%{version}/src/nspr-%{version}.tar.bz2
 Source1:        baselibs.conf
 Patch:          pkgconfig.patch
@ -45,7 +44,6 @@ memory management (malloc and free), and shared library linking.


 %package devel
-License:        MPL-1.1 or GPL-2.0+ or LGPL-2.1+
 Summary:        Netscape Portable Runtime development files
 Group:          Development/Libraries/Other
 Requires:       mozilla-nspr = %{version}
@ -98,6 +96,16 @@ cp -rL mozilla/nsprpub/dist/include/nspr/* %{buildroot}%{_includedir}/nspr4/
 # #31667
 chmod -x %{buildroot}%{_includedir}/nspr4/prvrsion.h

+%check
+# Run test suite
+perl ./mozilla/nsprpub/pr/tests/runtests.pl 2>&1 | tee output.log
+TEST_FAILURES=`grep -c FAILED ./output.log` || :
+if [ $TEST_FAILURES -ne 0 ]; then
+  echo "error: test suite returned failure(s)"
+  exit 1
+fi
+echo "test suite completed"
+
 %clean
 rm -rf %{buildroot}

--- a/nspr-4.8.9.tar.bz2
+++ b/nspr-4.8.9.tar.bz2
@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:09abcd7e2df6edaba5f70454913ad3f8cfa750c040ae8a365d3f0b78dcb00962
-size 959107
--- a/nspr-4.9.0.tar.bz2
+++ b/nspr-4.9.0.tar.bz2
@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:7baeef71b85fe2ca78c32a8a1082bf00630143adb411ab53a77984930c6320ab
+size 910293
--- a/pkgconfig.patch
+++ b/pkgconfig.patch
@ -1,7 +1,7 @@
-diff -urN nspr-4.5.99.old/mozilla/nsprpub/config/Makefile.in nspr-4.5.99/mozilla/nsprpub/config/Makefile.in
--- nspr-4.5.99.old/mozilla/nsprpub/config/Makefile.in	2005-05-03 11:16:45.000000000 +0200
-+++ nspr-4.5.99/mozilla/nsprpub/config/Makefile.in	2005-05-18 12:05:53.000000000 +0200
-@@ -52,9 +52,9 @@
+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.
@ -13,7 +13,7 @@ diff -urN nspr-4.5.99.old/mozilla/nsprpub/config/Makefile.in nspr-4.5.99/mozilla
 
 include $(topsrcdir)/config/config.mk
 
-@@ -139,6 +139,7 @@
+@@ -135,6 +135,7 @@ endef
 
 export:: $(TARGETS)
 	rm -f $(dist_bindir)/nspr-config
@ -21,9 +21,9 @@ diff -urN nspr-4.5.99.old/mozilla/nsprpub/config/Makefile.in nspr-4.5.99/mozilla
 
 ifdef WRAP_SYSTEM_INCLUDES
 export::
-diff -urN nspr-4.5.99.old/mozilla/nsprpub/config/nspr.pc.in nspr-4.5.99/mozilla/nsprpub/config/mozilla-nspr.pc.in
--- nspr-4.5.99.old/mozilla/nsprpub/config/nspr.pc.in	1970-01-01 01:00:00.000000000 +0100
-+++ nspr-4.5.99/mozilla/nsprpub/config/nspr.pc.in	2005-05-18 12:03:36.000000000 +0200
+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@
@ -37,25 +37,25 @@ diff -urN nspr-4.5.99.old/mozilla/nsprpub/config/nspr.pc.in nspr-4.5.99/mozilla/
 +Cflags: -I${includedir}
 +
 +
-diff -urN nspr-4.5.99.old/mozilla/nsprpub/configure nspr-4.5.99/mozilla/nsprpub/configure
--- nspr-4.5.99.old/mozilla/nsprpub/configure	2005-05-13 09:33:07.000000000 +0200
-+++ nspr-4.5.99/mozilla/nsprpub/configure	2005-05-18 12:07:00.000000000 +0200
-@@ -5718,6 +5718,7 @@
- config/nsprincl.mk
- config/nsprincl.sh
- config/nspr-config
-+config/nspr.pc
- lib/Makefile 
- lib/ds/Makefile 
- lib/libc/Makefile 
-diff -urN nspr-4.5.99.old/mozilla/nsprpub/configure.in nspr-4.5.99/mozilla/nsprpub/configure.in
--- nspr-4.5.99.old/mozilla/nsprpub/configure.in	2005-05-13 09:33:07.000000000 +0200
-+++ nspr-4.5.99/mozilla/nsprpub/configure.in	2005-05-18 12:06:42.000000000 +0200
-@@ -2569,6 +2569,7 @@
- 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 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