Author: pawelz Date: Mon Feb 16 08:35:04 2009 GMT Module: SPECS Tag: HEAD ---- Log message: - use java-gcj-compat-devel - do not generate javadoc when being built --without javadoc - do not package LICENSE.txt since it contains well known Apache 2 license - rel 3
---- Files affected: SPECS: java-commons-el.spec (1.10 -> 1.11) ---- Diffs: ================================================================ Index: SPECS/java-commons-el.spec diff -u SPECS/java-commons-el.spec:1.10 SPECS/java-commons-el.spec:1.11 --- SPECS/java-commons-el.spec:1.10 Thu Dec 25 21:02:43 2008 +++ SPECS/java-commons-el.spec Mon Feb 16 09:34:58 2009 @@ -4,11 +4,13 @@ %bcond_without javadoc # don't build javadoc %include /usr/lib/rpm/macros.java + +%define srcname commons-el Summary: The Commons Extension Language Summary(pl.UTF-8): Commons Extension Language - język rozszerzeń Commons Name: java-commons-el Version: 1.0 -Release: 2 +Release: 3 License: Apache Group: Libraries/Java Source0: http://www.apache.org/dist/commons/el/source/commons-el-%{version}-src.tar.gz @@ -17,6 +19,7 @@ Patch1: commons-el-ant.patch URL: http://commons.apache.org/commons/el/ BuildRequires: ant +BuildRequires: java-gcj-compat-devel BuildRequires: jpackage-utils >= 0:1.6 BuildRequires: jsp BuildRequires: junit @@ -60,7 +63,7 @@ %build cat > build.properties <<EOF -build.compiler=modern +build.compiler=extJavac servlet-api.jar=$(find-jar servlet) jsp-api.jar=$(find-jar jsp-api) junit.jar=$(find-jar junit) @@ -69,11 +72,18 @@ jspapi.build.notrequired=true EOF -%ant \ - -Dcompile.source=1.4 \ +%ant -Dcompile.source=1.4 \ -Dfinal.name=commons-el \ -Dj2se.javadoc=%{_javadocdir}/java \ - jar javadoc + jar + +%if %{with javadoc} +export SHELL=/bin/sh +%ant -Dcompile.source=1.4 \ + -Dfinal.name=commons-el \ + -Dj2se.javadoc=%{_javadocdir}/java \ + javadoc +%endif %install rm -rf $RPM_BUILD_ROOT @@ -85,9 +95,9 @@ # javadoc %if %{with javadoc} -install -d $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version} -cp -a dist/docs/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version} -ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name} # ghost symlink +install -d $RPM_BUILD_ROOT%{_javadocdir}/%{srcname}-%{version} +cp -a dist/docs/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{srcname}-%{version} +ln -s %{srcname}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{srcname} # ghost symlink %endif %clean @@ -98,14 +108,14 @@ %files %defattr(644,root,root,755) -%doc LICENSE.txt STATUS.html +%doc STATUS.html %{_javadir}/*.jar %if %{with javadoc} %files javadoc %defattr(644,root,root,755) -%{_javadocdir}/%{name}-%{version} -%ghost %{_javadocdir}/%{name} +%{_javadocdir}/%{srcname}-%{version} +%ghost %{_javadocdir}/%{srcname} %endif %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) @@ -114,6 +124,12 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.11 2009/02/16 08:34:58 pawelz +- use java-gcj-compat-devel +- do not generate javadoc when being built --without javadoc +- do not package LICENSE.txt since it contains well known Apache 2 license +- rel 3 + Revision 1.10 2008/12/25 20:02:43 pawelz - added Provides/Obsoletes old name in subpackage ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/java-commons-el.spec?r1=1.10&r2=1.11&f=u _______________________________________________ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
