Author: pawelz Date: Sun Apr 18 16:06:53 2010 GMT
Module: packages Tag: HEAD
---- Log message:
- don't force specific jdk
- updated java deps
---- Files affected:
packages/java-xerces:
java-xerces.spec (1.47 -> 1.48)
---- Diffs:
================================================================
Index: packages/java-xerces/java-xerces.spec
diff -u packages/java-xerces/java-xerces.spec:1.47
packages/java-xerces/java-xerces.spec:1.48
--- packages/java-xerces/java-xerces.spec:1.47 Sat Apr 17 21:35:45 2010
+++ packages/java-xerces/java-xerces.spec Sun Apr 18 18:06:44 2010
@@ -1,14 +1,8 @@
# $Revision$, $Date$
#
%bcond_without javadoc # don't build javadoc
-%if "%{pld_release}" == "ti"
-%bcond_without java_sun # build with any jdk present
-%else
-%bcond_with java_sun # build with java-sun
-%endif
%define srcname xerces
-
%include /usr/lib/rpm/macros.java
Summary: XML parser for Java
Summary(pl.UTF-8): Analizator składniowy XML-a napisany w Javie
@@ -27,16 +21,14 @@
Patch0: xerces-j-target.patch
URL: http://xerces.apache.org/xerces-j/
BuildRequires: ant >= 1.7.1-4
-%{!?with_java_sun:BuildRequires: jdk}
-%{?with_java_sun:BuildRequires: java-sun}
+BuildRequires: java-xml-commons
+BuildRequires: jdk
BuildRequires: jpackage-utils
-BuildRequires: rpm >= 4.4.9-56
BuildRequires: rpm-javaprov
BuildRequires: rpmbuild(macros) >= 1.300
-BuildRequires: java-xml-commons
Requires: java-xml-commons
+Provides: java(jaxp_parser_impl)
Provides: xerces-j
-Provides: jaxp_parser_impl
Obsoletes: xerces-j
BuildArch: noarch
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -115,6 +107,10 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.48 2010/04/18 16:06:44 pawelz
+- don't force specific jdk
+- updated java deps
+
Revision 1.47 2010/04/17 19:35:45 jajcus
- do not require gcj
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/java-xerces/java-xerces.spec?r1=1.47&r2=1.48&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
