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: 09-Jul-2003 11:11:02
Branch: HEAD Handle: 2003070910110002
Modified files:
openpkg-src/tomcat4-adapter
tomcat4-adapter.patch tomcat4-adapter.spec
openpkg-web news.txt
Log:
adapt for new libtool version
Summary:
Revision Changes Path
1.2 +12 -1 openpkg-src/tomcat4-adapter/tomcat4-adapter.patch
1.7 +5 -3 openpkg-src/tomcat4-adapter/tomcat4-adapter.spec
1.5462 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/tomcat4-adapter/tomcat4-adapter.patch
============================================================================
$ cvs diff -u -r1.1 -r1.2 tomcat4-adapter.patch
--- openpkg-src/tomcat4-adapter/tomcat4-adapter.patch 14 Jan 2003 16:40:07 -0000
1.1
+++ openpkg-src/tomcat4-adapter/tomcat4-adapter.patch 9 Jul 2003 09:11:02 -0000
1.2
@@ -95,7 +95,18 @@
+ APR_LIB=apr
+ CPP=$prefix/bin/cc -E
+ SHELL=/bin/sh
-+ LIBTOOL=$prefix/bin/libtool
++ LIBTOOL=$prefix/bin/libtool --tag C
else
dnl ----------------------------------------------------------------------
+--- webapp/apache-1.3/Makefile.in.dist 2003-07-09 11:06:30.000000000 +0200
++++ webapp/apache-1.3/Makefile.in 2003-07-09 11:06:38.000000000 +0200
+@@ -86,7 +86,7 @@
+ -Wc,"$(CPPFLAGS) $(CFLAGS)" \
+ -Wl,"$(LDFLAGS) $(LIBS)" \
+ -L$(LIB_DIR) -l$(APR_LIB) \
+- $(OBJ_DIR)/*.o $<
++ $(OBJ_DIR)/*.lo $<
+
+ # +++ EXPERIMENTAL +++ LIBTOOL COMPILE, APXS LINK +++
+ # SOURCE = mod_webapp.c
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/tomcat4-adapter/tomcat4-adapter.spec
============================================================================
$ cvs diff -u -r1.6 -r1.7 tomcat4-adapter.spec
--- openpkg-src/tomcat4-adapter/tomcat4-adapter.spec 8 Jul 2003 14:42:56 -0000
1.6
+++ openpkg-src/tomcat4-adapter/tomcat4-adapter.spec 9 Jul 2003 09:11:02 -0000
1.7
@@ -33,7 +33,7 @@
Group: Web
License: Apache Software License 1.1
Version: 4.1.24
-Release: 20030408
+Release: 20030709
# list of sources
Source0:
http://jakarta.apache.org/builds/jakarta-tomcat-4.0/release/v%{version}/src/jakarta-tomcat-connectors-%{version}-src.tar.gz
@@ -43,8 +43,10 @@
# build information
Prefix: %{l_prefix}
BuildRoot: %{l_buildroot}
-BuildPreReq: OpenPKG, openpkg >= 20020206, apache, apr, autoconf, libtool, gcc
+BuildPreReq: OpenPKG, openpkg >= 20020206, apache, perl, autoconf, libtool, gcc
PreReq: OpenPKG, openpkg >= 20020206
+BuildPreReq: apr
+PreReq: apr
AutoReq: no
AutoReqProv: no
@@ -66,7 +68,7 @@
--disable-java \
--without-ant \
--with-apr=%{l_prefix}
- %{l_make} %{l_mflags -O}
+ %{l_make} %{l_mflags}
%install
rm -rf $RPM_BUILD_ROOT
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.5461 -r1.5462 news.txt
--- openpkg-web/news.txt 9 Jul 2003 09:08:59 -0000 1.5461
+++ openpkg-web/news.txt 9 Jul 2003 09:11:00 -0000 1.5462
@@ -1,3 +1,4 @@
+09-Jul-2003: Upgraded package: P<tomcat4-adapter-4.1.24-20030709>
09-Jul-2003: Upgraded package: P<apache-1.3.27-20030709>
09-Jul-2003: Upgraded package: P<xfig-3.2.4-20030709>
09-Jul-2003: Upgraded package: P<transfig-3.2.4-20030709>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
