packages: java-wsdl4j/java-wsdl4j.spec - don't force specific jdk - updated...

pawelz pawelz at pld-linux.org
Sun Apr 18 18:03:47 CEST 2010


Author: pawelz                       Date: Sun Apr 18 16:03:47 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- don't force specific jdk
- updated java deps
- dropped P: wsdl4j

---- Files affected:
packages/java-wsdl4j:
   java-wsdl4j.spec (1.15 -> 1.16) 

---- Diffs:

================================================================
Index: packages/java-wsdl4j/java-wsdl4j.spec
diff -u packages/java-wsdl4j/java-wsdl4j.spec:1.15 packages/java-wsdl4j/java-wsdl4j.spec:1.16
--- packages/java-wsdl4j/java-wsdl4j.spec:1.15	Wed Aug 19 13:18:32 2009
+++ packages/java-wsdl4j/java-wsdl4j.spec	Sun Apr 18 18:03:38 2010
@@ -4,12 +4,6 @@
 
 %bcond_without  javadoc         # don't build javadoc
 
-%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	wsdl4j
@@ -27,17 +21,14 @@
 URL:		http://sourceforge.net/projects/wsdl4j/
 BuildRequires:	ant
 BuildRequires:	ant-junit
-%{!?with_java_sun:BuildRequires:	java-gcj-compat-devel}
 BuildRequires:	java-junit
-%{?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:	jaxp_parser_impl
+Requires:	java(jaxp_parser_impl)
 Provides:	java(JSR109)
 Provides:	java(JSR110)
-Provides:	wsdl4j
 Obsoletes:	wsdl4j
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -120,6 +111,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.16  2010/04/18 16:03:38  pawelz
+- don't force specific jdk
+- updated java deps
+- dropped P: wsdl4j
+
 Revision 1.15  2009/08/19 11:18:32  pawelz
 - remove duplicated BRs
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/java-wsdl4j/java-wsdl4j.spec?r1=1.15&r2=1.16&f=u



More information about the pld-cvs-commit mailing list