Author: pawelz Date: Sun Mar 29 15:55:18 2009 GMT Module: SPECS Tag: HEAD ---- Log message: - jdk bconds - proper P/O after changing Name - include java rpm macros - simplified %%build: - dropped "export SHELL=/bin/sh" (fixed gjdoc) - dropped "-Dbuil.compiler=extJavac" (fixed java-gcj-compat-devel)
---- Files affected: SPECS: java-commons-lang.spec (1.15 -> 1.16) ---- Diffs: ================================================================ Index: SPECS/java-commons-lang.spec diff -u SPECS/java-commons-lang.spec:1.15 SPECS/java-commons-lang.spec:1.16 --- SPECS/java-commons-lang.spec:1.15 Wed Feb 18 16:50:00 2009 +++ SPECS/java-commons-lang.spec Sun Mar 29 17:55:13 2009 @@ -2,7 +2,14 @@ # # Conditional build: %bcond_without javadoc # don't build apidocs -# +%bcond_with java_sun # build with java-sun + +%if "%{pld_release}" == "ti" +%define with_java_sun 1 +%endif + +%include /usr/lib/rpm/macros.java + %define srcname commons-lang Summary: Commons Lang - utility functions and components Summary(pl.UTF-8): Commons Lang - funkcje i komponenty narzędziowe @@ -15,11 +22,13 @@ # Source0-md5: d8379e93f597b2ae6d1f7b4bb7e83fce URL: http://commons.apache.org/lang/ BuildRequires: ant >= 1.5 -BuildRequires: java-gcj-compat-devel +%{!?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 Obsoletes: jakarta-commons-lang +Provides: jakarta-commons-lang BuildArch: noarch BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -36,6 +45,7 @@ Summary(pl.UTF-8): Dokumentacja online do Commons Lang Group: Documentation Requires: jpackage-utils +Obsoletes: jakarta-commons-lang-javadoc %description javadoc Documentation for Commons Lang. @@ -50,12 +60,7 @@ %setup -q -n commons-lang-%{version} %build -%ant -Dbuild.compiler=extJavac jar - -%if %{with javadoc} -export SHELL=/bin/sh -%ant javadoc -%endif +%ant jar %{?with_javadoc:javadoc} %install rm -rf $RPM_BUILD_ROOT @@ -95,6 +100,14 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.16 2009/03/29 15:55:13 pawelz +- jdk bconds +- proper P/O after changing Name +- include java rpm macros +- simplified %%build: +- dropped "export SHELL=/bin/sh" (fixed gjdoc) +- dropped "-Dbuil.compiler=extJavac" (fixed java-gcj-compat-devel) + Revision 1.15 2009/02/18 15:50:00 qboosh - unified ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/java-commons-lang.spec?r1=1.15&r2=1.16&f=u _______________________________________________ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit