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 openpkg$ Date: 09-Mar-2003 12:29:19
Branch: HEAD Handle: 2003030911291503
Modified files:
openpkg-re/vcheck vc.ant
openpkg-src/ant ant.spec
openpkg-web news.txt
Log:
upgrading package: ant 1.5.1 -> 1.5.2
Summary:
Revision Changes Path
1.3 +2 -2 openpkg-re/vcheck/vc.ant
1.9 +14 -21 openpkg-src/ant/ant.spec
1.3626 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-re/vcheck/vc.ant
============================================================================
$ cvs diff -u -r1.2 -r1.3 vc.ant
--- openpkg-re/vcheck/vc.ant 29 Nov 2002 18:57:18 -0000 1.2
+++ openpkg-re/vcheck/vc.ant 9 Mar 2003 11:29:15 -0000 1.3
@@ -2,8 +2,8 @@
}
prog ant = {
- version = 1.5.1
+ version = 1.5.2
url = http://www.apache.org/dist/ant/binaries/
- regex = jakarta-ant-(__VER__)-bin\.tar\.bz2
+ regex = apache-ant-(__VER__)-bin\.tar\.bz2
}
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/ant/ant.spec
============================================================================
$ cvs diff -u -r1.8 -r1.9 ant.spec
--- openpkg-src/ant/ant.spec 8 Jan 2003 15:12:30 -0000 1.8
+++ openpkg-src/ant/ant.spec 9 Mar 2003 11:29:18 -0000 1.9
@@ -32,11 +32,11 @@
Distribution: OpenPKG [EVAL]
Group: Development
License: Apache Software License
-Version: 1.5.1
-Release: 20030108
+Version: 1.5.2
+Release: 20030309
# list of sources
-Source0:
http://www.apache.org/dist/ant/binaries/jakarta-ant-%{version}-bin.tar.bz2
+Source0:
http://www.apache.org/dist/ant/binaries/apache-ant-%{version}-bin.tar.bz2
Source1: ant.conf
Source2: rc.ant
@@ -53,7 +53,7 @@
without make's wrinkles.
%prep
- %setup -q -n jakarta-ant-%{version}
+ %setup -q -n apache-ant-%{version}
%build
# Note that there is nothing to build since the Ant binary distribution
@@ -62,45 +62,38 @@
# 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.
-
- # The only things done here are some minor path adjustments and remove
- # those nasty Windows line breaks
( cd bin
%{l_shtool} subst \
- -e 's;^#!/usr/bin/perl;#! @l_prefix@/bin/perl;' \
+ -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;#! @l_prefix@/bin/python;' \
+ -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
- )
+ ant antRun antRun.pl complete-ant-cmd.pl runant.pl runant.py )
%install
rm -rf $RPM_BUILD_ROOT
- %{l_shtool} mkdir -f -p -m 755 $RPM_BUILD_ROOT%{l_prefix}/bin
- %{l_shtool} mkdir -f -p -m 755 $RPM_BUILD_ROOT%{l_prefix}/etc/ant
- %{l_shtool} mkdir -f -p -m 755 $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d
- %{l_shtool} mkdir -f -p -m 755 $RPM_BUILD_ROOT%{l_prefix}/lib
-
+ %{l_shtool} mkdir -f -p -m 755 \
+ $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' \
+ %{l_shtool} install -c -m 755 \
+ -e 's;@l_prefix@;%{l_prefix};g' \
bin/$i $RPM_BUILD_ROOT%{l_prefix}/bin/
done
-
%{l_shtool} install -c -m 644 \
lib/*.jar $RPM_BUILD_ROOT%{l_prefix}/lib/
-
%{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' \
%{SOURCE rc.ant} $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d/
-
%{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std}
%files -f files
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.3625 -r1.3626 news.txt
--- openpkg-web/news.txt 9 Mar 2003 11:24:19 -0000 1.3625
+++ openpkg-web/news.txt 9 Mar 2003 11:29:16 -0000 1.3626
@@ -1,3 +1,4 @@
+09-Mar-2003: Upgraded package: P<ant-1.5.2-20030309>
09-Mar-2003: Upgraded package: P<gcc-3.2.2-20030309>
09-Mar-2003: Upgraded package: P<netpbm-10.11.6-20030309>
09-Mar-2003: Upgraded package: P<scponly-3.6-20030309>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
