OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Michael van Elst
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src openpkg-web Date: 08-Jul-2003 10:44:55
Branch: HEAD Handle: 2003070809445301
Modified files:
openpkg-src/html2text html2text.spec
openpkg-web news.txt
Log:
really use our compiler, fix building with gcc3.3
Summary:
Revision Changes Path
1.3 +15 -6 openpkg-src/html2text/html2text.spec
1.5429 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/html2text/html2text.spec
============================================================================
$ cvs diff -u -r1.2 -r1.3 html2text.spec
--- openpkg-src/html2text/html2text.spec 11 Feb 2003 18:49:42 -0000 1.2
+++ openpkg-src/html2text/html2text.spec 8 Jul 2003 08:44:54 -0000 1.3
@@ -33,7 +33,7 @@
Group: Converter
License: GPL
Version: 1.3.1
-Release: 20030211
+Release: 20030708
# list of sources
Source0:
ftp://ftp.ibiblio.org/pub/linux/apps/www/converters/html2text-%{version}.tar.gz
@@ -57,14 +57,23 @@
%prep
%setup -q
+ # make configure use CXX from environment
+ %{l_shtool} subst \
+ -e 's;CXX=unknown;CXX=${CXX-unknown};' \
+ -e 's;\("CC"\);"${CXX}" \1;' \
+ configure
+ # avoid warning about antiquated C++ headers
+ %{l_shtool} subst \
+ -e 's;^\(CXXFLAGS *= *\);\1%{l_cxxflags} -Wno-deprecated ;' \
+ Makefile.in
+ # simulate deprecated strstream.h
+ %{l_shtool} subst \
+ -e 's;<strstream.h>;<strstream>;' \
+ -e 's;ostrstream;std::ostrstream;g' \
+ format.C
%build
- CC="%{l_cc}" \
CXX="%{l_cxx}" \
- CFLAGS="%{l_cflags -O}" \
- CXXFLAGS="%{l_cxxflags -O}" \
- CPPFLAGS="%{l_cppflags}" \
- LDFLAGS="%{l_ldflags}" \
./configure
%{l_make} %{l_mflags -O}
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.5428 -r1.5429 news.txt
--- openpkg-web/news.txt 8 Jul 2003 08:43:47 -0000 1.5428
+++ openpkg-web/news.txt 8 Jul 2003 08:44:53 -0000 1.5429
@@ -1,3 +1,4 @@
+08-Jul-2003: Upgraded package: P<html2text-1.3.1-20030708>
08-Jul-2003: Upgraded package: P<perl-util-20030708-20030708>
07-Jul-2003: Upgraded package: P<perl-util-20030705-20030707>
07-Jul-2003: Upgraded package: P<m4-1.4o-20030707>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]