From 6d56cc093a62d6417001af9e83ef4e232a957aba Mon Sep 17 00:00:00 2001 From: cvsdist Date: Thu, 9 Sep 2004 08:08:25 +0000 Subject: [PATCH] auto-import lynx-2.8.5-11 from lynx-2.8.5-11.src.rpm --- lynx.spec | 32 ++++++++++++++++++++++++++------ 1 file changed, 26 insertions(+), 6 deletions(-) diff --git a/lynx.spec b/lynx.spec index 40f86e6..8b3b406 100644 --- a/lynx.spec +++ b/lynx.spec @@ -1,7 +1,7 @@ Summary: A text-based Web browser. Name: lynx Version: 2.8.5 -Release: 7.1 +Release: 11 License: GPL Group: Applications/Internet Source: http://lynx.isc.org/current/lynx2.8.5dev.7.tar.bz2 @@ -17,7 +17,7 @@ Patch3: lynx-284-ipv6-salen.patch Patch4: lynx2.8.4rel.1c.patch Requires: indexhtml Provides: webclient -BuildRequires: openssl-devel, ncurses-devel, slang-devel, zlib-devel +BuildRequires: openssl-devel, pkgconfig, ncurses-devel, slang-devel, zlib-devel Buildroot: %{_tmppath}/%{name}-root %description @@ -50,7 +50,12 @@ done exec /usr/bin/gcc \$ARGS EOF chmod 0755 gcc -export CFLAGS="-ggdb $RPM_OPT_FLAGS -DNCURSES -DNCURSES_MOUSE_VERSION" CXXFLAGS="-ggdb $RPM_OPT_FLAGS -DNCURSES -DNCURSES_MOUSE_VERSION" +CFLAGS="-ggdb $RPM_OPT_FLAGS -DNCURSES -DNCURSES_MOUSE_VERSION" ; export CFLAGS +CXXFLAGS="-ggdb $RPM_OPT_FLAGS -DNCURSES -DNCURSES_MOUSE_VERSION" ; export CXXFLAGS +if pkg-config openssl ; then + CPPFLAGS=`pkg-config --cflags openssl` ; export CPPFLAGS + LDFLAGS=`pkg-config --libs-only-L openssl` ; export LDFLAGS +fi %configure --libdir=/etc \ --with-screen=ncurses --enable-warnings \ --enable-default-colors --enable-externs \ @@ -64,8 +69,8 @@ export CFLAGS="-ggdb $RPM_OPT_FLAGS -DNCURSES -DNCURSES_MOUSE_VERSION" CXXFLAGS= --enable-justify-elts --enable-scrollbar \ --enable-libjs --enable-cgi-links --enable-nls \ --enable-ipv6 \ - --with-ssl=/usr -OLD_PO_FILE_INPUT=yes make + --with-ssl=%{_libdir} +OLD_PO_FILE_INPUT=yes make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT @@ -109,9 +114,24 @@ rm -rf $RPM_BUILD_ROOT %lang(sk) %config %{_sysconfdir}/lynx.cfg.sk %changelog -* Wed Jan 22 2003 Tim Waugh 2.8.5-7.1 +* Wed Jan 22 2003 Tim Powers +- rebuilt + +* Wed Jan 22 2003 Tim Waugh 2.8.5-10 - Fix CRLF issue. +* Tue Jan 7 2003 Nalin Dahyabhai 2.8.5-9 +- rebuild + +* Fri Dec 20 2002 Elliot Lee 2.8.5-8 +- _smp_mflags + +* Thu Dec 12 2002 Nalin Dahyabhai +- use openssl pkg-config data, if available + +* Wed Nov 20 2002 Tim Powers +- rebuild on all arches + * Thu Aug 08 2002 Karsten Hopp - remove menu entry (#69457)