fix baselibs and sqlite3

OBS-URL: https://build.opensuse.org/package/show/mozilla:Factory/mozilla-nss?expand=0&rev=46
This commit is contained in:
Wolfgang Rosenauer 2010-03-20 19:21:31 +00:00 committed by Git OBS Bridge
parent 50185fa15a
commit 6789ba0305
3 changed files with 14 additions and 7 deletions

View File

@ -3,7 +3,7 @@ mozilla-nss
requires "libsoftokn3-<targettype>"
requires "mozilla-nss-certs-<targettype>"
libsoftokn3
requires "libfreebl3-<targettype> = <version>-<release>"
requires "libfreebl3-<targettype> = <version>"
+/usr/lib/libsoftokn3.chk
+/usr/lib/libnssdbm3.chk
libfreebl3

View File

@ -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 <release> is not a valid identifier
-------------------------------------------------------------------
Tue Mar 9 19:18:24 CET 2010 - wr@rosenauer.org

View File

@ -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