packages: java-commons-lang/java-commons-lang.spec - up to 2.4 - unified pe...

[pawelz]

Author: pawelz                       Date: Sun Sep 20 21:51:32 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- up to 2.4
- unified per distro jdk bconds
- standard java BRs
- source/target = 1.4 (because of enum used as identifier)
- do not package LICENSE.txt. It contains well known Apache v2 license.

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

---- Diffs:

================================================================
Index: packages/java-commons-lang/java-commons-lang.spec
diff -u packages/java-commons-lang/java-commons-lang.spec:1.17 packages/java-commons-lang/java-commons-lang.spec:1.18
--- packages/java-commons-lang/java-commons-lang.spec:1.17	Sun Mar 29 17:57:39 2009
+++ packages/java-commons-lang/java-commons-lang.spec	Sun Sep 20 23:51:26 2009
@@ -5,7 +5,9 @@
 %bcond_with	java_sun	# build with java-sun
 
 %if "%{pld_release}" == "ti"
-%define	with_java_sun	1
+%bcond_without	java_sun	# build with gcj
+%else
+%bcond_with	java_sun	# build with java-sun
 %endif
 
 %include	/usr/lib/rpm/macros.java
@@ -14,19 +16,21 @@
 Summary:	Commons Lang - utility functions and components
 Summary(pl.UTF-8):	Commons Lang - funkcje i komponenty narzędziowe
 Name:		java-commons-lang
-Version:	2.1
-Release:	4
+Version:	2.4
+Release:	1
 License:	Apache v2.0
 Group:		Libraries/Java
 Source0:	http://www.apache.org/dist/commons/lang/source/commons-lang-%{version}-src.tar.gz
-# Source0-md5:	d8379e93f597b2ae6d1f7b4bb7e83fce
+# 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:	jpackage-utils
-BuildRequires:	rpmbuild(macros) >= 1.294
+BuildRequires:	rpm >= 4.4.9-56
+BuildRequires:	rpm-javaprov
+BuildRequires:	rpmbuild(macros) >= 1.300
 Obsoletes:	jakarta-commons-lang
 Provides:	jakarta-commons-lang
 BuildArch:	noarch
@@ -57,10 +61,13 @@
 Javadoc pour Commons Lang.
 
 %prep
-%setup -q -n commons-lang-%{version}
+%setup -q -n commons-lang-%{version}-src
 
 %build
-%ant jar %{?with_javadoc:javadoc}
+
+%ant jar %{?with_javadoc:javadoc} \
+  -Dcompile.source=1.4 \
+  -Dcompile.target=1.4
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -84,7 +91,7 @@
 
 %files
 %defattr(644,root,root,755)
-%doc LICENSE.txt PROPOSAL.html RELEASE-NOTES.txt STATUS.html
+%doc PROPOSAL.html RELEASE-NOTES.txt
 %{_javadir}/*.jar
 
 %if %{with javadoc}
@@ -100,6 +107,13 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.18  2009/09/20 21:51:26  pawelz
+- up to 2.4
+- unified per distro jdk bconds
+- standard java BRs
+- source/target = 1.4 (because of enum used as identifier)
+- do not package LICENSE.txt. It contains well known Apache v2 license.
+
 Revision 1.17  2009/03/29 15:57:39  pawelz
 - it uses Apache License v 2.0 not 1.1
 - rel 4
================================================================

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