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