Author: pawelz Date: Sun Apr 18 16:05:27 2010 GMT
Module: packages Tag: HEAD
---- Log message:
- don't force specific jdk
- updated java deps
---- Files affected:
packages/java-xalan:
java-xalan.spec (1.64 -> 1.65)
---- Diffs:
================================================================
Index: packages/java-xalan/java-xalan.spec
diff -u packages/java-xalan/java-xalan.spec:1.64
packages/java-xalan/java-xalan.spec:1.65
--- packages/java-xalan/java-xalan.spec:1.64 Sat Apr 17 21:31:02 2010
+++ packages/java-xalan/java-xalan.spec Sun Apr 18 18:05:18 2010
@@ -2,15 +2,10 @@
#
# Conditional build:
%bcond_without doc # do not build documentation
-%if "%{pld_release}" == "ti"
-%bcond_without java_sun # build with any JDK present
-%else
-%bcond_with java_sun # build with java-sun
-%endif
%define ver %(echo %{version} | tr . _)
%define srcname xalan
-%include /usr/lib/rpm/macros.java
+%include /usr/lib/rpm/macros.java
Summary: XSLT processor for Java
Summary(pl.UTF-8): Procesor XSLT napisany w Javie
Name: java-xalan
@@ -24,20 +19,17 @@
URL: http://xml.apache.org/xalan-j/
BuildRequires: ant >= 1.5
BuildRequires: jakarta-bcel
-%{!?with_java_sun:BuildRequires: jdk}
-%{?with_java_sun:BuildRequires: java-sun}
+BuildRequires: java(servlet)
+BuildRequires: java-cup
BuildRequires: java-xerces
BuildRequires: java-xml-commons-external
-BuildRequires: java-cup
+BuildRequires: jdk
BuildRequires: jlex
BuildRequires: jpackage-utils
-BuildRequires: rpm >= 4.4.9-56
BuildRequires: rpmbuild(macros) >= 1.300
-BuildRequires: java(Servlet)
-BuildRequires: java-xerces
-Requires: java(Servlet)
-Requires: jaxp_parser_impl
-Provides: jaxp_transform_impl
+Requires: java(jaxp_parser_impl)
+Requires: java(servlet)
+Provides: java(jaxp_transform_impl)
Provides: xalan-j
Obsoletes: xalan-j
BuildArch: noarch
@@ -140,6 +132,10 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.65 2010/04/18 16:05:18 pawelz
+- don't force specific jdk
+- updated java deps
+
Revision 1.64 2010/04/17 19:31:02 jajcus
- do not require gcj
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/java-xalan/java-xalan.spec?r1=1.64&r2=1.65&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
