OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 25-May-2008 11:53:30
Branch: HEAD Handle: 2008052510532900
Modified files:
openpkg-src/nss nss.pc nss.spec
Log:
resolve conflict with OpenSSL's libssl
Summary:
Revision Changes Path
1.4 +1 -1 openpkg-src/nss/nss.pc
1.4 +2 -0 openpkg-src/nss/nss.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/nss/nss.pc
============================================================================
$ cvs diff -u -r1.3 -r1.4 nss.pc
--- openpkg-src/nss/nss.pc 25 May 2008 09:51:32 -0000 1.3
+++ openpkg-src/nss/nss.pc 25 May 2008 09:53:29 -0000 1.4
@@ -7,5 +7,5 @@
Description: Mozilla Network Security Services (NSS)
Version: @version@
Requires: nspr
-Libs: -L${libdir}/nss -lnss -lsmime -lssl -lcertdb -lcerthi -lpk11wrap
-lsoftokn -lfreebl -lnsspki -lnssdev -lnssb -lcryptohi -lsecutil
+Libs: -L${libdir}/nss -lnss -lsmime -lnssl -lcertdb -lcerthi -lpk11wrap
-lsoftokn -lfreebl -lnsspki -lnssdev -lnssb -lcryptohi -lsecutil
Cflags: -I${includedir}/nss -I${includedir}
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/nss/nss.spec
============================================================================
$ cvs diff -u -r1.3 -r1.4 nss.spec
--- openpkg-src/nss/nss.spec 25 May 2008 08:20:09 -0000 1.3
+++ openpkg-src/nss/nss.spec 25 May 2008 09:53:29 -0000 1.4
@@ -110,6 +110,8 @@
%{l_shtool} install -c -m 644 \
mozilla/dist/*.OBJ/lib/*.a \
$RPM_BUILD_ROOT%{l_prefix}/lib/nss/
+ mv $RPM_BUILD_ROOT%{l_prefix}/lib/nss/libssl.a \
+ $RPM_BUILD_ROOT%{l_prefix}/lib/nss/libnssl.a
%{l_shtool} install -c -s -m 755 \
mozilla/dist/*.OBJ/bin/* \
$RPM_BUILD_ROOT%{l_prefix}/libexec/nss/
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List [email protected]
