OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: r...@openpkg.org
Module: openpkg-src Date: 25-Sep-2009 10:57:20
Branch: HEAD Handle: 2009092509571900
Modified files:
openpkg-src/antlr antlr.sh antlr.spec
Log:
upgrading package: antlr 3.1.3 -> 3.2
Summary:
Revision Changes Path
1.2 +1 -8 openpkg-src/antlr/antlr.sh
1.24 +13 -11 openpkg-src/antlr/antlr.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/antlr/antlr.sh
============================================================================
$ cvs diff -u -r1.1 -r1.2 antlr.sh
--- openpkg-src/antlr/antlr.sh 8 Feb 2008 18:39:22 -0000 1.1
+++ openpkg-src/antlr/antlr.sh 25 Sep 2009 08:57:19 -0000 1.2
@@ -3,16 +3,9 @@
## antlr.sh -- ANTLR startup wrapper script
##
-cp=""
-for jar in \
- @l_prefix@/libexec/antlr/antlr-3.*.jar \
- @l_prefix@/libexec/antlr/stringtemplate-*.jar \
- @l_prefix@/libexec/antlr/antlr-2.*jar; do
- if [ ".$cp" = . ]; then cp="$jar"; else cp="$cp:$jar"; fi
-done
@l_prefix@/bin/java \
-Vsun-jdk \
- -cp "$cp" \
+ -cp @l_prefix@/libexec/antlr/antlr-3.*.jar \
org.antlr.Tool \
${1+"$@"}
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/antlr/antlr.spec
============================================================================
$ cvs diff -u -r1.23 -r1.24 antlr.spec
--- openpkg-src/antlr/antlr.spec 18 Apr 2009 13:08:27 -0000 1.23
+++ openpkg-src/antlr/antlr.spec 25 Sep 2009 08:57:19 -0000 1.24
@@ -22,7 +22,7 @@
##
# package version
-%define V_antlr 3.1.3
+%define V_antlr 3.2
%define V_antlrworks 1.2.3
# package information
@@ -36,13 +36,14 @@
Group: CompilerCompiler
License: GPL
Version: %{V_antlr}
-Release: 20090318
+Release: 20090925
# list of sources
-Source0: http://www.antlr.org/download/antlr-%{V_antlr}.tar.gz
-Source1: http://www.antlr.org/download/antlrworks-%{V_antlrworks}.jar
-Source2: antlr.sh
-Source3: antlrworks.sh
+Source0: http://www.antlr.org/download/antlr-%{V_antlr}.jar
+Source1: http://www.antlr.org/download/antlr-runtime-%{V_antlr}.jar
+Source2: http://www.antlr.org/download/antlrworks-%{V_antlrworks}.jar
+Source3: antlr.sh
+Source4: antlrworks.sh
# build information
Prefix: %{l_prefix}
@@ -66,7 +67,7 @@
prog antlr = {
version = %{V_antlr}
url = http://www.antlr.org/download.html
- regex = antlr-(__VER__)\.tar\.gz
+ regex = antlr-(__VER__)\.jar
}
prog antlr:antrlworks = {
version = %{V_antlrworks}
@@ -75,7 +76,7 @@
}
%prep
- %setup -q
+ %setup -q -T -c
%build
@@ -85,9 +86,10 @@
$RPM_BUILD_ROOT%{l_prefix}/bin \
$RPM_BUILD_ROOT%{l_prefix}/libexec/antlr
%{l_shtool} install -c -m 644 \
- lib/*.jar $RPM_BUILD_ROOT%{l_prefix}/libexec/antlr/
- %{l_shtool} install -c -m 644 \
- %{SOURCE1} $RPM_BUILD_ROOT%{l_prefix}/libexec/antlr/
+ %{SOURCE antlr-%{V_antlr}.jar} \
+ %{SOURCE antlr-runtime-%{V_antlr}.jar} \
+ %{SOURCE antlrworks-%{V_antlrworks}.jar} \
+ $RPM_BUILD_ROOT%{l_prefix}/libexec/antlr/
%{l_shtool} install -c -m 755 %{l_value -s -a} \
%{SOURCE antlr.sh} $RPM_BUILD_ROOT%{l_prefix}/bin/antlr
%{l_shtool} install -c -m 755 %{l_value -s -a} \
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
