packages: java-commons-lang/java-commons-lang.spec - don't force specific j...

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


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

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

---- Diffs:

================================================================
Index: packages/java-commons-lang/java-commons-lang.spec
diff -u packages/java-commons-lang/java-commons-lang.spec:1.18 packages/java-commons-lang/java-commons-lang.spec:1.19
--- packages/java-commons-lang/java-commons-lang.spec:1.18	Sun Sep 20 23:51:26 2009
+++ packages/java-commons-lang/java-commons-lang.spec	Sun Apr 18 16:16:32 2010
@@ -4,12 +4,6 @@
 %bcond_without	javadoc		# don't build apidocs
 %bcond_with	java_sun	# build with java-sun
 
-%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-lang
@@ -24,15 +18,13 @@
 # Source0-md5:	625ff5f2f968dd908bca43c9469d6e6b
 URL:		http://commons.apache.org/lang/
 BuildRequires:	ant >= 1.5
-%{!?with_java_sun:BuildRequires:	java-gcj-compat-devel}
-%{?with_java_sun:BuildRequires:	java-sun}
-BuildRequires:	jaxp_parser_impl
+BuildRequires:	java(jaxp_parser_impl)
+BuildRequires:	jdk
 BuildRequires:	jpackage-utils
-BuildRequires:	rpm >= 4.4.9-56
 BuildRequires:	rpm-javaprov
 BuildRequires:	rpmbuild(macros) >= 1.300
-Obsoletes:	jakarta-commons-lang
 Provides:	jakarta-commons-lang
+Obsoletes:	jakarta-commons-lang
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -107,6 +99,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.19  2010/04/18 14:16:32  pawelz
+- don't force specific jdk
+- updated java APIs deps
+- sorted deps
+
 Revision 1.18  2009/09/20 21:51:26  pawelz
 - up to 2.4
 - unified per distro jdk bconds
================================================================

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



More information about the pld-cvs-commit mailing list