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: 22-Jun-2007 11:17:38
Branch: HEAD Handle: 2007062210173800
Modified files:
openpkg-src/apr apr.spec
Log:
remove Apache 2 conflict marker, fix building against Berkeley-DB and
add iconv support
Summary:
Revision Changes Path
1.41 +5 -3 openpkg-src/apr/apr.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/apr/apr.spec
============================================================================
$ cvs diff -u -r1.40 -r1.41 apr.spec
--- openpkg-src/apr/apr.spec 22 Jun 2007 09:01:11 -0000 1.40
+++ openpkg-src/apr/apr.spec 22 Jun 2007 09:17:38 -0000 1.41
@@ -48,11 +48,10 @@
BuildRoot: %{l_buildroot}
BuildPreReq: OpenPKG, openpkg >= 20040130, make
PreReq: OpenPKG, openpkg >= 20040130
-BuildPreReq: db, expat
-PreReq: db, expat
+BuildPreReq: db, expat, libiconv
+PreReq: db, expat, libiconv
AutoReq: no
AutoReqProv: no
-Conflicts: apache2
%description
Apache Portable Runtime (APR) is a library of C data structures
@@ -103,7 +102,10 @@
--prefix=%{l_prefix} \
--includedir=%{l_prefix}/include/apr \
--datadir=%{l_prefix}/share/apr \
+ --with-dbm=db45 \
+ --with-berkeley-db=%{l_prefix} \
--with-expat=%{l_prefix} \
+ --with-iconv=%{l_prefix}
--disable-shared
%{l_make} %{l_mflags -O}
) || exit $?
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List [email protected]
