OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 27-Aug-2007 10:33:23
Branch: HEAD Handle: 2007082709332300
Modified files:
openpkg-src/ditaa ditaa.spec
Log:
switch to new Java toolkit world order
Summary:
Revision Changes Path
1.11 +4 -5 openpkg-src/ditaa/ditaa.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/ditaa/ditaa.spec
============================================================================
$ cvs diff -u -r1.10 -r1.11 ditaa.spec
--- openpkg-src/ditaa/ditaa.spec 25 Aug 2007 17:36:46 -0000 1.10
+++ openpkg-src/ditaa/ditaa.spec 27 Aug 2007 08:33:23 -0000 1.11
@@ -37,7 +37,7 @@
Group: Diagram
License: GPL
Version: %{V_opkg}
-Release: 20070825
+Release: 20070827
# list of sources
Source0:
http://switch.dl.sourceforge.net/sourceforge/ditaa/ditaa%{V_dist}.jar
@@ -46,8 +46,8 @@
# build information
Prefix: %{l_prefix}
BuildRoot: %{l_buildroot}
-BuildPreReq: OpenPKG, openpkg >= 20040130, j2se
-PreReq: OpenPKG, openpkg >= 20040130, j2se
+BuildPreReq: OpenPKG, openpkg >= 20040130, java, java-jdk15
+PreReq: OpenPKG, openpkg >= 20040130, java, java-jdk15
AutoReq: no
AutoReqProv: no
@@ -81,8 +81,7 @@
%{l_shtool} install -c -m 644 \
%{SOURCE ditaa%{V_dist}.jar}
$RPM_BUILD_ROOT%{l_prefix}/libexec/ditaa/ditaa.jar
( echo "#!/bin/sh"
- echo "CLASSPATH=\"%{l_prefix}/libexec/j2se/jre/lib\"; export CLASSPATH"
- echo "exec %{l_prefix}/bin/java -jar
%{l_prefix}/libexec/ditaa/ditaa.jar \"[EMAIL PROTECTED]""
+ echo "exec %{l_prefix}/bin/java -Vsun-jdk -jar
%{l_prefix}/libexec/ditaa/ditaa.jar \"[EMAIL PROTECTED]""
) >ditaa
cp -r ditaa%{V_dist}_manual/* $RPM_BUILD_ROOT%{l_prefix}/share/ditaa/
%{l_shtool} install -c -m 755 \
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List [email protected]
