Author: pawelz Date: Fri Apr 23 00:03:02 2010 GMT
Module: packages Tag: HEAD
---- Log message:
- Don't force specific jdk.
---- Files affected:
packages/java-jaxen:
java-jaxen.spec (1.8 -> 1.9)
packages/java-jcommon:
java-jcommon.spec (1.10 -> 1.11)
---- Diffs:
================================================================
Index: packages/java-jaxen/java-jaxen.spec
diff -u packages/java-jaxen/java-jaxen.spec:1.8
packages/java-jaxen/java-jaxen.spec:1.9
--- packages/java-jaxen/java-jaxen.spec:1.8 Mon Mar 30 07:53:20 2009
+++ packages/java-jaxen/java-jaxen.spec Fri Apr 23 02:02:53 2010
@@ -5,12 +5,6 @@
# Conditional build:
%bcond_without javadoc # don't build javadoc
%bcond_without tests # don't build and run tests
-%if "%{pld_release}" == "ti"
-%bcond_without java_sun # build with gcj
-%else
-%bcond_with java_sun # build with java-sun
-%endif
-
%define srcname jaxen
%include /usr/lib/rpm/macros.java
Summary: Jaxen
@@ -23,10 +17,8 @@
# Source0-md5: b598ae6b7e765a92e13667b0a80392f4
URL: http://jaxen.codehaus.org/
BuildRequires: java-dom4j
-%{!?with_java_sun:BuildRequires: java-gcj-compat-devel}
-%{?with_java_sun:BuildRequires: java-sun}
+BuildRequires: jdk
BuildRequires: jpackage-utils
-BuildRequires: rpm >= 4.4.9-56
BuildRequires: rpm-javaprov
BuildRequires: rpmbuild(macros) >= 1.300
BuildArch: noarch
@@ -123,6 +115,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.9 2010/04/23 00:02:53 pawelz
+- Don't force specific jdk.
+
Revision 1.8 2009/03/30 05:53:20 pawelz
- close %%if
================================================================
Index: packages/java-jcommon/java-jcommon.spec
diff -u packages/java-jcommon/java-jcommon.spec:1.10
packages/java-jcommon/java-jcommon.spec:1.11
--- packages/java-jcommon/java-jcommon.spec:1.10 Tue Apr 6 14:32:11 2010
+++ packages/java-jcommon/java-jcommon.spec Fri Apr 23 02:02:57 2010
@@ -4,12 +4,6 @@
%bcond_without javadoc # don't build javadoc
%bcond_with tests # don't build tests
-%if "%{pld_release}" == "ti"
-%bcond_without java_sun # build with gcj
-%else
-%bcond_with java_sun # build with java-sun
-%endif
-
%include /usr/lib/rpm/macros.java
%define srcname jcommon
Summary: Common library for Object Refinery Projects
@@ -23,11 +17,9 @@
# Source0-md5: 5fb774c225cdc7d15a99c9702031ae05
URL: http://www.jfree.org/jcommon/index.html
BuildRequires: ant
-%{!?with_java_sun:BuildRequires: java-gcj-compat-devel}
-%{?with_java_sun:BuildRequires: java-sun}
+BuildRequires: jdk
BuildRequires: jpackage-utils >= 0:1.5
%{?with_tests:BuildRequires: junit}
-BuildRequires: rpm >= 4.4.9-56
BuildRequires: rpm-javaprov
BuildRequires: rpmbuild(macros) >= 1.300
BuildArch: noarch
@@ -131,6 +123,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.11 2010/04/23 00:02:57 pawelz
+- Don't force specific jdk.
+
Revision 1.10 2010/04/06 12:32:11 pawelz
- code is US-ASCII, so there is no need to play with LC_ALL
- rel 1
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/java-jaxen/java-jaxen.spec?r1=1.8&r2=1.9&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/java-jcommon/java-jcommon.spec?r1=1.10&r2=1.11&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
