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 12:25:04
Branch: HEAD Handle: 2007082711250103
Modified files:
openpkg-src/ant ant.spec
openpkg-src/css2xslfo css2xslfo.spec
openpkg-src/ditaa ditaa.spec
openpkg-src/fop fop.spec
openpkg-src/groovy groovy.spec
openpkg-src/honeyd honeyd.spec
openpkg-src/jboss jboss.spec
openpkg-src/tomcat tomcat.spec
Log:
use new virtual target JAVA-JDK to require a real JDK as the backend
for 'java'
Summary:
Revision Changes Path
1.48 +1 -1 openpkg-src/ant/ant.spec
1.19 +1 -1 openpkg-src/css2xslfo/css2xslfo.spec
1.12 +2 -2 openpkg-src/ditaa/ditaa.spec
1.25 +1 -1 openpkg-src/fop/fop.spec
1.3 +1 -1 openpkg-src/groovy/groovy.spec
1.68 +1 -1 openpkg-src/honeyd/honeyd.spec
1.18 +2 -2 openpkg-src/jboss/jboss.spec
1.62 +1 -1 openpkg-src/tomcat/tomcat.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/ant/ant.spec
============================================================================
$ cvs diff -u -r1.47 -r1.48 ant.spec
--- openpkg-src/ant/ant.spec 27 Aug 2007 08:44:16 -0000 1.47
+++ openpkg-src/ant/ant.spec 27 Aug 2007 10:25:01 -0000 1.48
@@ -52,7 +52,7 @@
Prefix: %{l_prefix}
BuildRoot: %{l_buildroot}
BuildPreReq: OpenPKG, openpkg >= 20060823, infozip
-PreReq: OpenPKG, openpkg >= 20060823, java, java-jdk15
+PreReq: OpenPKG, openpkg >= 20060823, java, java-jdk
AutoReq: no
AutoReqProv: no
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/css2xslfo/css2xslfo.spec
============================================================================
$ cvs diff -u -r1.18 -r1.19 css2xslfo.spec
--- openpkg-src/css2xslfo/css2xslfo.spec 27 Aug 2007 08:58:24 -0000
1.18
+++ openpkg-src/css2xslfo/css2xslfo.spec 27 Aug 2007 10:25:03 -0000
1.19
@@ -48,7 +48,7 @@
Prefix: %{l_prefix}
BuildRoot: %{l_buildroot}
BuildPreReq: OpenPKG, openpkg >= 20040130
-PreReq: OpenPKG, openpkg >= 20040130, java, java-jdk15, xalan
+PreReq: OpenPKG, openpkg >= 20040130, java, JAVA-JDK, xalan
AutoReq: no
AutoReqProv: no
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/ditaa/ditaa.spec
============================================================================
$ cvs diff -u -r1.11 -r1.12 ditaa.spec
--- openpkg-src/ditaa/ditaa.spec 27 Aug 2007 08:33:23 -0000 1.11
+++ openpkg-src/ditaa/ditaa.spec 27 Aug 2007 10:25:02 -0000 1.12
@@ -46,8 +46,8 @@
# build information
Prefix: %{l_prefix}
BuildRoot: %{l_buildroot}
-BuildPreReq: OpenPKG, openpkg >= 20040130, java, java-jdk15
-PreReq: OpenPKG, openpkg >= 20040130, java, java-jdk15
+BuildPreReq: OpenPKG, openpkg >= 20040130
+PreReq: OpenPKG, openpkg >= 20040130, java, JAVA-JDK
AutoReq: no
AutoReqProv: no
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/fop/fop.spec
============================================================================
$ cvs diff -u -r1.24 -r1.25 fop.spec
--- openpkg-src/fop/fop.spec 27 Aug 2007 08:56:01 -0000 1.24
+++ openpkg-src/fop/fop.spec 27 Aug 2007 10:25:03 -0000 1.25
@@ -43,7 +43,7 @@
Prefix: %{l_prefix}
BuildRoot: %{l_buildroot}
BuildPreReq: OpenPKG, openpkg >= 20040130
-PreReq: OpenPKG, openpkg >= 20040130, java, java-jdk15
+PreReq: OpenPKG, openpkg >= 20040130, java, JAVA-JDK
AutoReq: no
AutoReqProv: no
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/groovy/groovy.spec
============================================================================
$ cvs diff -u -r1.2 -r1.3 groovy.spec
--- openpkg-src/groovy/groovy.spec 27 Aug 2007 08:40:24 -0000 1.2
+++ openpkg-src/groovy/groovy.spec 27 Aug 2007 10:25:03 -0000 1.3
@@ -42,7 +42,7 @@
Prefix: %{l_prefix}
BuildRoot: %{l_buildroot}
BuildPreReq: OpenPKG, openpkg >= 20060823
-PreReq: OpenPKG, openpkg >= 20060823, java, java-jdk15
+PreReq: OpenPKG, openpkg >= 20060823, java, JAVA-JDK
AutoReq: no
AutoReqProv: no
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/honeyd/honeyd.spec
============================================================================
$ cvs diff -u -r1.67 -r1.68 honeyd.spec
--- openpkg-src/honeyd/honeyd.spec 27 Aug 2007 09:05:10 -0000 1.67
+++ openpkg-src/honeyd/honeyd.spec 27 Aug 2007 10:25:04 -0000 1.68
@@ -76,7 +76,7 @@
PreReq: fsl >= 1.2.0
%endif
%if "%{with_gui}" == "yes"
-PreReq: java, java-jdk15
+PreReq: java, JAVA-JDK
%endif
AutoReq: no
AutoReqProv: no
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/jboss/jboss.spec
============================================================================
$ cvs diff -u -r1.17 -r1.18 jboss.spec
--- openpkg-src/jboss/jboss.spec 27 Aug 2007 08:48:06 -0000 1.17
+++ openpkg-src/jboss/jboss.spec 27 Aug 2007 10:25:01 -0000 1.18
@@ -46,8 +46,8 @@
# build information
Prefix: %{l_prefix}
BuildRoot: %{l_buildroot}
-BuildPreReq: OpenPKG, openpkg >= 2.0.0, java, java-jdk15, ant
-PreReq: OpenPKG, openpkg >= 2.0.0, java, java-jdk15, netcat
+BuildPreReq: OpenPKG, openpkg >= 2.0.0, java, JAVA-JDK, ant
+PreReq: OpenPKG, openpkg >= 2.0.0, java, JAVA-JDK, netcat
AutoReq: no
AutoReqProv: no
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/tomcat/tomcat.spec
============================================================================
$ cvs diff -u -r1.61 -r1.62 tomcat.spec
--- openpkg-src/tomcat/tomcat.spec 27 Aug 2007 08:50:28 -0000 1.61
+++ openpkg-src/tomcat/tomcat.spec 27 Aug 2007 10:25:01 -0000 1.62
@@ -43,7 +43,7 @@
Prefix: %{l_prefix}
BuildRoot: %{l_buildroot}
BuildPreReq: OpenPKG, openpkg >= 20060823
-PreReq: OpenPKG, openpkg >= 20060823, java, java-jdk15
+PreReq: OpenPKG, openpkg >= 20060823, java, JAVA-JDK
AutoReq: no
AutoReqProv: no
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List [email protected]
