OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Thomas Lotterer
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 09-Oct-2004 14:00:22
Branch: HEAD Handle: 2004100913002101
Modified files:
openpkg-src/ethereal ethereal.patch ethereal.spec
Log:
oops, LIBS fiddling was outside Solaris "case", fix by creating a new
"case" block following similar existing structures
Summary:
Revision Changes Path
1.11 +15 -0 openpkg-src/ethereal/ethereal.patch
1.44 +1 -2 openpkg-src/ethereal/ethereal.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/ethereal/ethereal.patch
============================================================================
$ cvs diff -u -r1.10 -r1.11 ethereal.patch
--- openpkg-src/ethereal/ethereal.patch 14 Jul 2004 06:17:22 -0000 1.10
+++ openpkg-src/ethereal/ethereal.patch 9 Oct 2004 12:00:21 -0000 1.11
@@ -70,3 +70,18 @@
@PCRE_LIBS@ \
@GLIB_LIBS@ -lm \
@PCAP_LIBS@ @SOCKET_LIBS@ @NSL_LIBS@ @ADNS_LIBS@
+Index: configure
+--- configure.orig 2004-10-09 13:34:16 +0200
++++ configure 2004-10-09 13:35:01 +0200
+@@ -15190,6 +15190,11 @@
+
+ if test "x$want_ssl" = "xyes"; then
+ LIBS="-lcrypto"
++case "$host_os" in
++ solaris*)
++ LIBS="$LIBS -lsocket -lnsl"
++ ;;
++esac
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/ethereal/ethereal.spec
============================================================================
$ cvs diff -u -r1.43 -r1.44 ethereal.spec
--- openpkg-src/ethereal/ethereal.spec 8 Oct 2004 20:17:45 -0000 1.43
+++ openpkg-src/ethereal/ethereal.spec 9 Oct 2004 12:00:22 -0000 1.44
@@ -34,7 +34,7 @@
Group: Network
License: GPL
Version: 0.10.6
-Release: 20041008
+Release: 20041009
# package options
%option with_zlib yes
@@ -93,7 +93,6 @@
%prep
%setup -q
%patch -p0
- %{l_shtool} subst -e 's;LIBS="-lcrypto";LIBS="-lcrypto -lsocket -lnsl";'
configure
%build
CC="%{l_cc}" \
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
