packages: java-commons-cli/java-commons-cli.spec - don't force specific jdk...

pawelz pawelz at pld-linux.org
Sun Apr 18 16:05:05 CEST 2010


Author: pawelz                       Date: Sun Apr 18 14:05:05 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- don't force specific jdk
- updated java APIs deps

---- Files affected:
packages/java-commons-cli:
   java-commons-cli.spec (1.18 -> 1.19) 

---- Diffs:

================================================================
Index: packages/java-commons-cli/java-commons-cli.spec
diff -u packages/java-commons-cli/java-commons-cli.spec:1.18 packages/java-commons-cli/java-commons-cli.spec:1.19
--- packages/java-commons-cli/java-commons-cli.spec:1.18	Sun Sep 20 21:38:50 2009
+++ packages/java-commons-cli/java-commons-cli.spec	Sun Apr 18 16:04:56 2010
@@ -4,12 +4,6 @@
 %bcond_without	javadoc		# don't build javadoc
 %bcond_without	tests		# don't 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		srcname		commons-cli
 Summary:	Commons CLI - API for working with command line
@@ -24,15 +18,12 @@
 Patch0:		%{name}-target.patch
 URL:		http://commons.apache.org/cli/
 BuildRequires:	ant
+BuildRequires:	java(jaxp_parser_impl)
 BuildRequires:	java-commons-lang
 BuildRequires:	java-commons-logging
-%{!?with_java_sun:BuildRequires:	java-gcj-compat-devel}
-%{?with_java_sun:BuildRequires:	java-sun}
-BuildRequires:	jaxp_parser_impl
 BuildRequires:	jdk >= 1.4
 BuildRequires:	jpackage-utils
 %{?with_tests:BuildRequires:	junit}
-BuildRequires:	rpm >= 4.4.9-56
 BuildRequires:	rpm-javaprov
 BuildRequires:	rpmbuild(macros) >= 1.300
 Requires:	jpackage-utils
@@ -111,6 +102,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.19  2010/04/18 14:04:56  pawelz
+- don't force specific jdk
+- updated java APIs deps
+
 Revision 1.18  2009/09/20 19:38:50  pawelz
 - per distro jdk bconds
 - standard java BRs
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/java-commons-cli/java-commons-cli.spec?r1=1.18&r2=1.19&f=u



More information about the pld-cvs-commit mailing list