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: 09-Jul-2003 16:39:00
Branch: HEAD Handle: 2003070915385901
Modified files:
openpkg-src/ant ant.conf ant.spec
openpkg-web news.txt
Log:
simplify packaging by removing cruft
Summary:
Revision Changes Path
1.2 +3 -0 openpkg-src/ant/ant.conf
1.13 +10 -22 openpkg-src/ant/ant.spec
1.5474 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/ant/ant.conf
============================================================================
$ cvs diff -u -r1.1 -r1.2 ant.conf
--- openpkg-src/ant/ant.conf 10 Oct 2002 09:38:48 -0000 1.1
+++ openpkg-src/ant/ant.conf 9 Jul 2003 14:39:00 -0000 1.2
@@ -2,3 +2,6 @@
## @l_prefix@/etc/ant/ant.conf -- Configuration file of Apache Ant build tool
##
+ANT_HOME="@l_prefix@"
+export ANT_HOME
+
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/ant/ant.spec
============================================================================
$ cvs diff -u -r1.12 -r1.13 ant.spec
--- openpkg-src/ant/ant.spec 8 Jul 2003 14:38:35 -0000 1.12
+++ openpkg-src/ant/ant.spec 9 Jul 2003 14:39:00 -0000 1.13
@@ -37,7 +37,7 @@
Group: Development
License: Apache Software License
Version: %{V_opkg}
-Release: 20030418
+Release: 20030709
# list of sources
Source0:
http://www.apache.org/dist/ant/binaries/apache-ant-%{V_real}-bin.tar.bz2
@@ -48,7 +48,7 @@
Prefix: %{l_prefix}
BuildRoot: %{l_buildroot}
BuildPreReq: OpenPKG, openpkg >= 20020206
-PreReq: OpenPKG, openpkg >= 20020206, JRE, perl, python
+PreReq: OpenPKG, openpkg >= 20020206, JRE
AutoReq: no
AutoReqProv: no
@@ -66,19 +66,6 @@
# and egg problem. But in the end this doesn't hurt very much since we
# are talking about Java byte code and shell scripts which are portable
# anyway.
- ( cd bin
- %{l_shtool} subst \
- -e 's;^#!/usr/bin/perl;[EMAIL PROTECTED]@/bin/perl;' \
- antRun.pl complete-ant-cmd.pl runant.pl
- %{l_shtool} subst \
- -e 's;^#!/usr/bin/python;[EMAIL PROTECTED]@/bin/python;' \
- runant.py
- %{l_shtool} subst \
- -e 's;/etc/ant.conf;@l_prefix@/etc/ant/ant.conf;' \
- ant
- %{l_shtool} subst \
- -e 's;\r$;;' \
- ant antRun antRun.pl complete-ant-cmd.pl runant.pl runant.py )
%install
rm -rf $RPM_BUILD_ROOT
@@ -86,14 +73,15 @@
$RPM_BUILD_ROOT%{l_prefix}/bin \
$RPM_BUILD_ROOT%{l_prefix}/etc/ant \
$RPM_BUILD_ROOT%{l_prefix}/etc/rc.d \
- $RPM_BUILD_ROOT%{l_prefix}/lib
- for i in ant antRun antRun.pl complete-ant-cmd.pl runant.pl runant.py; do
- %{l_shtool} install -c -m 755 \
- -e 's;@l_prefix@;%{l_prefix};g' \
- bin/$i $RPM_BUILD_ROOT%{l_prefix}/bin/
- done
+ $RPM_BUILD_ROOT%{l_prefix}/libexec/ant
+ %{l_shtool} install -c -m 755 \
+ -e 's;/etc/ant.conf;@l_prefix@/etc/ant/ant.conf;' \
+ -e 's;@l_prefix@;%{l_prefix};g' \
+ -e 's;^\(ANT_LIB="\)[^"]*\("\);\1%{l_prefix}/libexec/ant\2;' \
+ -e 's;\r$;;' \
+ bin/ant $RPM_BUILD_ROOT%{l_prefix}/bin/
%{l_shtool} install -c -m 644 \
- lib/*.jar $RPM_BUILD_ROOT%{l_prefix}/lib/
+ lib/*.jar $RPM_BUILD_ROOT%{l_prefix}/libexec/ant/
%{l_shtool} install -c -m 644 -e 's;@l_prefix@;%{l_prefix};g' \
%{SOURCE ant.conf} $RPM_BUILD_ROOT%{l_prefix}/etc/ant/
%{l_shtool} install -c -m 755 -e 's;@l_prefix@;%{l_prefix};g' \
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.5473 -r1.5474 news.txt
--- openpkg-web/news.txt 9 Jul 2003 14:27:29 -0000 1.5473
+++ openpkg-web/news.txt 9 Jul 2003 14:38:59 -0000 1.5474
@@ -1,3 +1,4 @@
+09-Jul-2003: Upgraded package: P<ant-1.5.3.1-20030709>
09-Jul-2003: Upgraded package: P<kerberos-1.2.8-20030709>
09-Jul-2003: Upgraded package: P<openpkg-rc-0.7.1-20030709>
09-Jul-2003: Upgraded package: P<mysqlcc-0.9.2-20030709>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
