[CVS] OpenPKG: openpkg-src/tomcat/ tomcat.spec openpkg-web/ news.txt
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src openpkg-web Date: 11-Jul-2003 11:43:48
Branch: HEAD Handle: 2003071110434502
Modified files:
openpkg-src/tomcat tomcat.spec
openpkg-web news.txt
Log:
place config stuff physically into etc and use symlink in var
Summary:
RevisionChanges Path
1.28+5 -5 openpkg-src/tomcat/tomcat.spec
1.5526 +1 -0 openpkg-web/news.txt
patch -p0 <<'@@ .'
Index: openpkg-src/tomcat/tomcat.spec
$ cvs diff -u -r1.27 -r1.28 tomcat.spec
--- openpkg-src/tomcat/tomcat.spec10 Jul 2003 07:51:15 - 1.27
+++ openpkg-src/tomcat/tomcat.spec11 Jul 2003 09:43:47 - 1.28
@@ -33,7 +33,7 @@
Group:Web
License: Apache Software License 1.1
Version: 3.3.1a
-Release: 20030710
+Release: 20030711
# list of sources
Source0:
http://jakarta.apache.org/builds/jakarta-tomcat/release/v%{version}/bin/jakarta-tomcat-%{version}.tar.gz
@@ -115,17 +115,17 @@
$RPM_BUILD_ROOT%{l_prefix}/etc/rc.d/
# reach config files through etc
-ln -s \
-%{l_prefix}/var/tomcat/conf \
+mv $RPM_BUILD_ROOT%{l_prefix}/var/tomcat/conf \
$RPM_BUILD_ROOT%{l_prefix}/etc/tomcat
+ln -s %{l_prefix}/etc/tomcat $RPM_BUILD_ROOT%{l_prefix}/var/tomcat/conf
%{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \
%{l_files_std} \
+'%config %attr(755,%{l_rusr},%{l_rgrp}) %{l_prefix}/etc/tomcat/*' \
'%attr(755,%{l_rusr},%{l_rgrp}) %{l_prefix}/var/tomcat/log' \
'%attr(755,%{l_rusr},%{l_rgrp}) %{l_prefix}/var/tomcat/work' \
'%attr(755,%{l_rusr},%{l_rgrp}) %{l_prefix}/var/tomcat/webapps' \
-'%attr(755,%{l_rusr},%{l_rgrp}) %{l_prefix}/var/tomcat/conf' \
-'%config %attr(755,%{l_rusr},%{l_rgrp}) %{l_prefix}/var/tomcat/conf/*'
+'%attr(755,%{l_rusr},%{l_rgrp}) %{l_prefix}/var/tomcat/conf'
%files -f files
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
$ cvs diff -u -r1.5525 -r1.5526 news.txt
--- openpkg-web/news.txt 11 Jul 2003 09:34:11 - 1.5525
+++ openpkg-web/news.txt 11 Jul 2003 09:43:45 - 1.5526
@@ -1,3 +1,4 @@
+11-Jul-2003: Upgraded package: P
11-Jul-2003: Upgraded package: P
11-Jul-2003: Upgraded package: P
11-Jul-2003: Upgraded package: P
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
[CVS] OpenPKG: openpkg-src/tomcat/ tomcat.spec openpkg-web/ news.txt
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src openpkg-web Date: 05-Apr-2003 20:40:47
Branch: HEAD Handle: 2003040519404501
Modified files:
openpkg-src/tomcat tomcat.spec
openpkg-web news.txt
Log:
speclint police
Summary:
RevisionChanges Path
1.24+2 -2 openpkg-src/tomcat/tomcat.spec
1.3974 +1 -0 openpkg-web/news.txt
patch -p0 <<'@@ .'
Index: openpkg-src/tomcat/tomcat.spec
$ cvs diff -u -r1.23 -r1.24 tomcat.spec
--- openpkg-src/tomcat/tomcat.spec18 Feb 2003 14:07:26 - 1.23
+++ openpkg-src/tomcat/tomcat.spec5 Apr 2003 18:40:46 - 1.24
@@ -33,7 +33,7 @@
Group:Web
License: Apache Software License 1.1
Version: 3.3.1a
-Release: 20030218
+Release: 20030405
# list of sources
Source0:
http://jakarta.apache.org/builds/jakarta-tomcat/release/v%{version}/bin/jakarta-tomcat-%{version}.tar.gz
@@ -125,7 +125,7 @@
'%attr(755,%{l_rusr},%{l_rgrp}) %{l_prefix}/var/tomcat/work' \
'%attr(755,%{l_rusr},%{l_rgrp}) %{l_prefix}/var/tomcat/webapps' \
'%attr(755,%{l_rusr},%{l_rgrp}) %{l_prefix}/var/tomcat/conf' \
-'%config %attr(755,%{l_rusr},%{l_rgrp}) %{l_prefix}/var/tomcat/conf/*' \
+'%config %attr(755,%{l_rusr},%{l_rgrp}) %{l_prefix}/var/tomcat/conf/*'
%files -f files
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
$ cvs diff -u -r1.3973 -r1.3974 news.txt
--- openpkg-web/news.txt 5 Apr 2003 18:37:30 - 1.3973
+++ openpkg-web/news.txt 5 Apr 2003 18:40:45 - 1.3974
@@ -1,3 +1,4 @@
+05-Apr-2003: Upgraded package: P
05-Apr-2003: Upgraded package: P
05-Apr-2003: Upgraded package: P
05-Apr-2003: Upgraded package: P
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
[CVS] OpenPKG: openpkg-src/tomcat/ tomcat.spec openpkg-web/ news.txt
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src openpkg-web Date: 08-Jan-2003 16:22:34
Branch: HEAD Handle: 2003010815223201
Modified files:
openpkg-src/tomcat tomcat.spec
openpkg-web news.txt
Log:
switch to JRE
Summary:
RevisionChanges Path
1.19+2 -2 openpkg-src/tomcat/tomcat.spec
1.2607 +1 -0 openpkg-web/news.txt
patch -p0 <<'@@ .'
Index: openpkg-src/tomcat/tomcat.spec
$ cvs diff -u -r1.18 -r1.19 tomcat.spec
--- openpkg-src/tomcat/tomcat.spec3 Jan 2003 10:55:20 - 1.18
+++ openpkg-src/tomcat/tomcat.spec8 Jan 2003 15:22:33 - 1.19
@@ -33,7 +33,7 @@
Group:Web
License: Apache Software License 1.1
Version: 3.2.4
-Release: 20021122
+Release: 20030108
# list of sources
Source0:
http://jakarta.apache.org/builds/jakarta-tomcat/release/v%{version}/bin/jakarta-tomcat-%{version}.tar.gz
@@ -44,7 +44,7 @@
Prefix: %{l_prefix}
BuildRoot:%{l_buildroot}
BuildPreReq: OpenPKG, openpkg >= 20021120
-PreReq: OpenPKG, openpkg >= 20021120, JDK
+PreReq: OpenPKG, openpkg >= 20021120, JRE
AutoReq: no
AutoReqProv: no
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
$ cvs diff -u -r1.2606 -r1.2607 news.txt
--- openpkg-web/news.txt 8 Jan 2003 15:18:05 - 1.2606
+++ openpkg-web/news.txt 8 Jan 2003 15:22:32 - 1.2607
@@ -1,3 +1,4 @@
+08-Jan-2003: Upgraded package: P
08-Jan-2003: Upgraded package: P
08-Jan-2003: Upgraded package: P
08-Jan-2003: Upgraded package: P
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
[CVS] OpenPKG: openpkg-src/tomcat tomcat.spec openpkg-web news.txt
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-web, openpkg-src Date: 22-Nov-2002 10:56:47
Branch: HEAD Handle: 2002112209564600
Modified files:
openpkg-src/tomcat tomcat.spec
openpkg-web news.txt
Log:
reduce dependencies
Summary:
RevisionChanges Path
1.14+6 -7 openpkg-src/tomcat/tomcat.spec
1.2087 +1 -0 openpkg-web/news.txt
Index: openpkg-src/tomcat/tomcat.spec
$ cvs diff -u -r1.13 -r1.14 tomcat.spec
--- openpkg-src/tomcat/tomcat.spec13 Aug 2002 12:50:14 - 1.13
+++ openpkg-src/tomcat/tomcat.spec22 Nov 2002 09:56:46 - 1.14
@@ -32,7 +32,7 @@
Group:Web
License: Apache Software License 1.1
Version: 3.2.4
-Release: 20020206
+Release: 20021122
# list of sources
Source0:
http://jakarta.apache.org/builds/jakarta-tomcat/release/v%{version}/bin/jakarta-tomcat-%{version}.tar.gz
@@ -42,8 +42,8 @@
# build information
Prefix: %{l_prefix}
BuildRoot:%{l_buildroot}
-BuildPreReq: OpenPKG, openpkg >= 20020206, tar, patch
-PreReq: OpenPKG, openpkg >= 20020206, JDK
+BuildPreReq: OpenPKG, openpkg >= 20021120
+PreReq: OpenPKG, openpkg >= 20021120, JDK
AutoReq: no
AutoReqProv: no
@@ -68,17 +68,16 @@
$RPM_BUILD_ROOT%{l_prefix}/var/tomcat/log
# unpack vendor distribution and relocate to final location
-%{l_prefix}/bin/tar -cf - --exclude lib/test \
+%{l_tar} -cf - --exclude lib/test \
bin/*.sh bin/ant bin/antRun conf lib src webapps |\
( umask 022; \
cd $RPM_BUILD_ROOT%{l_prefix}/libexec/tomcat/; \
-%{l_prefix}/bin/tar -xf - )
+%{l_tar} -xf - )
# patch vendor distribution
( cd $RPM_BUILD_ROOT%{l_prefix}/libexec/tomcat
cat %{SOURCE tomcat.patch} |\
-sed -e 's;@l_prefix@;%{l_prefix};g' |\
-%{l_prefix}/bin/patch -p0
+sed -e 's;@l_prefix@;%{l_prefix};g' | %{l_patch} -p0
)
# make scripts executable
Index: openpkg-web/news.txt
$ cvs diff -u -r1.2086 -r1.2087 news.txt
--- openpkg-web/news.txt 22 Nov 2002 09:54:28 - 1.2086
+++ openpkg-web/news.txt 22 Nov 2002 09:56:46 - 1.2087
@@ -1,3 +1,4 @@
+22-Nov-2002: Upgraded package: P
22-Nov-2002: Upgraded package: P
22-Nov-2002: Upgraded package: P
22-Nov-2002: Upgraded package: P
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
