Author: pawelz Date: Fri Apr 23 00:03:58 2010 GMT
Module: packages Tag: HEAD
---- Log message:
- Don't force specific jdk.
---- Files affected:
packages/java-stax:
java-stax.spec (1.4 -> 1.5)
packages/java-xml-commons-resolver:
java-xml-commons-resolver.spec (1.16 -> 1.17)
---- Diffs:
================================================================
Index: packages/java-stax/java-stax.spec
diff -u packages/java-stax/java-stax.spec:1.4
packages/java-stax/java-stax.spec:1.5
--- packages/java-stax/java-stax.spec:1.4 Wed Jan 20 13:41:00 2010
+++ packages/java-stax/java-stax.spec Fri Apr 23 02:03:49 2010
@@ -4,11 +4,6 @@
%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
%include /usr/lib/rpm/macros.java
#
%define apiversion 1.0.1
@@ -24,10 +19,8 @@
Patch0: %{name}-sourcetarget.patch
URL: http://stax.codehaus.org/
BuildRequires: ant >= 1.7.1-4
-%{!?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
Provides: java(Stax) = %{apiversion}
@@ -129,6 +122,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.5 2010/04/23 00:03:49 pawelz
+- Don't force specific jdk.
+
Revision 1.4 2010/01/20 12:41:00 pawelz
- rel 1
================================================================
Index: packages/java-xml-commons-resolver/java-xml-commons-resolver.spec
diff -u packages/java-xml-commons-resolver/java-xml-commons-resolver.spec:1.16
packages/java-xml-commons-resolver/java-xml-commons-resolver.spec:1.17
--- packages/java-xml-commons-resolver/java-xml-commons-resolver.spec:1.16
Thu Oct 22 00:18:09 2009
+++ packages/java-xml-commons-resolver/java-xml-commons-resolver.spec Fri Apr
23 02:03:53 2010
@@ -1,9 +1,4 @@
# $Revision$, $Date$
-%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 xml-commons-resolver
@@ -18,10 +13,8 @@
# Source0-md5: 46d52acdb67ba60f0156043f30108766
URL: http://xml.apache.org/commons/
BuildRequires: ant
-%{!?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
Requires: jpackage-utils
@@ -93,6 +86,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.17 2010/04/23 00:03:53 pawelz
+- Don't force specific jdk.
+
Revision 1.16 2009/10/21 22:18:09 pawelz
- dropped obsolete hacks
- distro dependent jdk bconds
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/java-stax/java-stax.spec?r1=1.4&r2=1.5&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/java-xml-commons-resolver/java-xml-commons-resolver.spec?r1=1.16&r2=1.17&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
