From 50185fa15a5394a8a4f6b098cc3f39faaf9442a3c9b9368a08e53f2f9047d5d8 Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Thu, 18 Mar 2010 15:09:49 +0000 Subject: [PATCH 1/4] Updating link to change in openSUSE:Factory/mozilla-nss revision 32.0 OBS-URL: https://build.opensuse.org/package/show/mozilla:Factory/mozilla-nss?expand=0&rev=fc6f6bb77d5000d40aa1dcc9f102213f --- ready | 0 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 ready diff --git a/ready b/ready deleted file mode 100644 index 473a0f4..0000000 From 6789ba030544c986257d94eb9142f20d38677a6d953f9d2bde771ffef67d7fbb Mon Sep 17 00:00:00 2001 From: Wolfgang Rosenauer Date: Sat, 20 Mar 2010 19:21:31 +0000 Subject: [PATCH 2/4] fix baselibs and sqlite3 OBS-URL: https://build.opensuse.org/package/show/mozilla:Factory/mozilla-nss?expand=0&rev=46 --- baselibs.conf | 2 +- mozilla-nss.changes | 7 +++++++ nss-sqlitename.patch | 12 ++++++------ 3 files changed, 14 insertions(+), 7 deletions(-) diff --git a/baselibs.conf b/baselibs.conf index 05ab7e7..2025ef9 100644 --- a/baselibs.conf +++ b/baselibs.conf @@ -3,7 +3,7 @@ mozilla-nss requires "libsoftokn3-" requires "mozilla-nss-certs-" libsoftokn3 - requires "libfreebl3- = -" + requires "libfreebl3- = " +/usr/lib/libsoftokn3.chk +/usr/lib/libnssdbm3.chk libfreebl3 diff --git a/mozilla-nss.changes b/mozilla-nss.changes index 20dbc6c..e2c287e 100644 --- a/mozilla-nss.changes +++ b/mozilla-nss.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Sat Mar 20 20:19:50 CET 2010 - wr@rosenauer.org + +- fixed builds for older dists where internal sqlite3 is used + (nss-sqlitename.patch was not refreshed correctly) +- fixed baselibs.conf as is not a valid identifier + ------------------------------------------------------------------- Tue Mar 9 19:18:24 CET 2010 - wr@rosenauer.org diff --git a/nss-sqlitename.patch b/nss-sqlitename.patch index 54fa956..3dd9e33 100644 --- a/nss-sqlitename.patch +++ b/nss-sqlitename.patch @@ -4,7 +4,7 @@ RCS file: /cvsroot/mozilla/security/nss/cmd/platlibs.mk,v retrieving revision 1.66 diff -u -r1.66 platlibs.mk --- security/nss/cmd/platlibs.mk 4 Feb 2010 18:59:10 -0000 1.66 -+++ security/nss/cmd/platlibs.mk 9 Mar 2010 12:06:11 -0000 ++++ security/nss/cmd/platlibs.mk 17 Mar 2010 19:28:51 -0000 @@ -80,7 +80,11 @@ endif endif @@ -23,8 +23,8 @@ RCS file: /cvsroot/mozilla/security/nss/lib/softoken/config.mk,v retrieving revision 1.29 diff -u -r1.29 config.mk --- security/nss/lib/softoken/config.mk 11 Jun 2009 00:55:48 -0000 1.29 -+++ security/nss/lib/softoken/config.mk 9 Mar 2010 12:06:12 -0000 -@@ -57,12 +57,16 @@ ++++ security/nss/lib/softoken/config.mk 17 Mar 2010 19:28:52 -0000 +@@ -83,12 +83,16 @@ -L$(DIST)/lib \ -L$(NSSUTIL_LIB_DIR) \ -lnssutil3 \ @@ -39,16 +39,16 @@ diff -u -r1.29 config.mk +else +EXTRA_SHARED_LIBS += -lnsssqlite3 +endif - else # ! NS_USE_GCC + endif - EXTRA_SHARED_LIBS += \ + ifeq ($(OS_TARGET),AIX) Index: security/nss/lib/sqlite/manifest.mn =================================================================== RCS file: /cvsroot/mozilla/security/nss/lib/sqlite/manifest.mn,v retrieving revision 1.4 diff -u -r1.4 manifest.mn --- security/nss/lib/sqlite/manifest.mn 9 Jan 2010 05:04:37 -0000 1.4 -+++ security/nss/lib/sqlite/manifest.mn 9 Mar 2010 12:06:12 -0000 ++++ security/nss/lib/sqlite/manifest.mn 17 Mar 2010 19:28:52 -0000 @@ -38,9 +38,10 @@ MODULE = nss From 005d85cec5b6b2d93c458428a26ebd8891bb645004627d335f6ed4bc9c3aeaaa Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Fri, 26 Mar 2010 15:17:50 +0000 Subject: [PATCH 3/4] Accepting request 35408 from mozilla:Factory checked in (request 35408) OBS-URL: https://build.opensuse.org/request/show/35408 OBS-URL: https://build.opensuse.org/package/show/mozilla:Factory/mozilla-nss?expand=0&rev=47 --- baselibs.conf | 2 +- mozilla-nss.changes | 7 ------- nss-sqlitename.patch | 12 ++++++------ 3 files changed, 7 insertions(+), 14 deletions(-) diff --git a/baselibs.conf b/baselibs.conf index 2025ef9..05ab7e7 100644 --- a/baselibs.conf +++ b/baselibs.conf @@ -3,7 +3,7 @@ mozilla-nss requires "libsoftokn3-" requires "mozilla-nss-certs-" libsoftokn3 - requires "libfreebl3- = " + requires "libfreebl3- = -" +/usr/lib/libsoftokn3.chk +/usr/lib/libnssdbm3.chk libfreebl3 diff --git a/mozilla-nss.changes b/mozilla-nss.changes index e2c287e..20dbc6c 100644 --- a/mozilla-nss.changes +++ b/mozilla-nss.changes @@ -1,10 +1,3 @@ -------------------------------------------------------------------- -Sat Mar 20 20:19:50 CET 2010 - wr@rosenauer.org - -- fixed builds for older dists where internal sqlite3 is used - (nss-sqlitename.patch was not refreshed correctly) -- fixed baselibs.conf as is not a valid identifier - ------------------------------------------------------------------- Tue Mar 9 19:18:24 CET 2010 - wr@rosenauer.org diff --git a/nss-sqlitename.patch b/nss-sqlitename.patch index 3dd9e33..54fa956 100644 --- a/nss-sqlitename.patch +++ b/nss-sqlitename.patch @@ -4,7 +4,7 @@ RCS file: /cvsroot/mozilla/security/nss/cmd/platlibs.mk,v retrieving revision 1.66 diff -u -r1.66 platlibs.mk --- security/nss/cmd/platlibs.mk 4 Feb 2010 18:59:10 -0000 1.66 -+++ security/nss/cmd/platlibs.mk 17 Mar 2010 19:28:51 -0000 ++++ security/nss/cmd/platlibs.mk 9 Mar 2010 12:06:11 -0000 @@ -80,7 +80,11 @@ endif endif @@ -23,8 +23,8 @@ RCS file: /cvsroot/mozilla/security/nss/lib/softoken/config.mk,v retrieving revision 1.29 diff -u -r1.29 config.mk --- security/nss/lib/softoken/config.mk 11 Jun 2009 00:55:48 -0000 1.29 -+++ security/nss/lib/softoken/config.mk 17 Mar 2010 19:28:52 -0000 -@@ -83,12 +83,16 @@ ++++ security/nss/lib/softoken/config.mk 9 Mar 2010 12:06:12 -0000 +@@ -57,12 +57,16 @@ -L$(DIST)/lib \ -L$(NSSUTIL_LIB_DIR) \ -lnssutil3 \ @@ -39,16 +39,16 @@ diff -u -r1.29 config.mk +else +EXTRA_SHARED_LIBS += -lnsssqlite3 +endif - endif + else # ! NS_USE_GCC - ifeq ($(OS_TARGET),AIX) + EXTRA_SHARED_LIBS += \ Index: security/nss/lib/sqlite/manifest.mn =================================================================== RCS file: /cvsroot/mozilla/security/nss/lib/sqlite/manifest.mn,v retrieving revision 1.4 diff -u -r1.4 manifest.mn --- security/nss/lib/sqlite/manifest.mn 9 Jan 2010 05:04:37 -0000 1.4 -+++ security/nss/lib/sqlite/manifest.mn 17 Mar 2010 19:28:52 -0000 ++++ security/nss/lib/sqlite/manifest.mn 9 Mar 2010 12:06:12 -0000 @@ -38,9 +38,10 @@ MODULE = nss From f8bf0fd81fb963e7c9bc4962420516434feeaddc25a1b246e6c812c2b4fc7867 Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Fri, 26 Mar 2010 15:17:51 +0000 Subject: [PATCH 4/4] Updating link to change in openSUSE:Factory/mozilla-nss revision 33.0 OBS-URL: https://build.opensuse.org/package/show/mozilla:Factory/mozilla-nss?expand=0&rev=c77884591d377294fa590e81775018f8 --- baselibs.conf | 2 +- mozilla-nss.changes | 7 +++++++ mozilla-nss.spec | 2 +- nss-sqlitename.patch | 12 ++++++------ 4 files changed, 15 insertions(+), 8 deletions(-) diff --git a/baselibs.conf b/baselibs.conf index 05ab7e7..2025ef9 100644 --- a/baselibs.conf +++ b/baselibs.conf @@ -3,7 +3,7 @@ mozilla-nss requires "libsoftokn3-" requires "mozilla-nss-certs-" libsoftokn3 - requires "libfreebl3- = -" + requires "libfreebl3- = " +/usr/lib/libsoftokn3.chk +/usr/lib/libnssdbm3.chk libfreebl3 diff --git a/mozilla-nss.changes b/mozilla-nss.changes index 20dbc6c..e2c287e 100644 --- a/mozilla-nss.changes +++ b/mozilla-nss.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Sat Mar 20 20:19:50 CET 2010 - wr@rosenauer.org + +- fixed builds for older dists where internal sqlite3 is used + (nss-sqlitename.patch was not refreshed correctly) +- fixed baselibs.conf as is not a valid identifier + ------------------------------------------------------------------- Tue Mar 9 19:18:24 CET 2010 - wr@rosenauer.org diff --git a/mozilla-nss.spec b/mozilla-nss.spec index 7432f47..891805f 100644 --- a/mozilla-nss.spec +++ b/mozilla-nss.spec @@ -30,7 +30,7 @@ BuildRequires: sqlite3-devel %endif License: GPLv2+ ; LGPLv2.1+ ; MPL Version: 3.12.6 -Release: 1 +Release: 2 # bug437293 %ifarch ppc64 Obsoletes: mozilla-nss-64bit diff --git a/nss-sqlitename.patch b/nss-sqlitename.patch index 54fa956..3dd9e33 100644 --- a/nss-sqlitename.patch +++ b/nss-sqlitename.patch @@ -4,7 +4,7 @@ RCS file: /cvsroot/mozilla/security/nss/cmd/platlibs.mk,v retrieving revision 1.66 diff -u -r1.66 platlibs.mk --- security/nss/cmd/platlibs.mk 4 Feb 2010 18:59:10 -0000 1.66 -+++ security/nss/cmd/platlibs.mk 9 Mar 2010 12:06:11 -0000 ++++ security/nss/cmd/platlibs.mk 17 Mar 2010 19:28:51 -0000 @@ -80,7 +80,11 @@ endif endif @@ -23,8 +23,8 @@ RCS file: /cvsroot/mozilla/security/nss/lib/softoken/config.mk,v retrieving revision 1.29 diff -u -r1.29 config.mk --- security/nss/lib/softoken/config.mk 11 Jun 2009 00:55:48 -0000 1.29 -+++ security/nss/lib/softoken/config.mk 9 Mar 2010 12:06:12 -0000 -@@ -57,12 +57,16 @@ ++++ security/nss/lib/softoken/config.mk 17 Mar 2010 19:28:52 -0000 +@@ -83,12 +83,16 @@ -L$(DIST)/lib \ -L$(NSSUTIL_LIB_DIR) \ -lnssutil3 \ @@ -39,16 +39,16 @@ diff -u -r1.29 config.mk +else +EXTRA_SHARED_LIBS += -lnsssqlite3 +endif - else # ! NS_USE_GCC + endif - EXTRA_SHARED_LIBS += \ + ifeq ($(OS_TARGET),AIX) Index: security/nss/lib/sqlite/manifest.mn =================================================================== RCS file: /cvsroot/mozilla/security/nss/lib/sqlite/manifest.mn,v retrieving revision 1.4 diff -u -r1.4 manifest.mn --- security/nss/lib/sqlite/manifest.mn 9 Jan 2010 05:04:37 -0000 1.4 -+++ security/nss/lib/sqlite/manifest.mn 9 Mar 2010 12:06:12 -0000 ++++ security/nss/lib/sqlite/manifest.mn 17 Mar 2010 19:28:52 -0000 @@ -38,9 +38,10 @@ MODULE = nss