Author: pawelz Date: Tue Feb 17 12:16:40 2009 GMT Module: SPECS Tag: HEAD ---- Log message: - build with java-gcj-compat-devel and GNU libraries - correct dir for javadoc - rel 2
---- Files affected: SPECS: java-commons-httpclient.spec (1.13 -> 1.14) ---- Diffs: ================================================================ Index: SPECS/java-commons-httpclient.spec diff -u SPECS/java-commons-httpclient.spec:1.13 SPECS/java-commons-httpclient.spec:1.14 --- SPECS/java-commons-httpclient.spec:1.13 Mon Feb 2 13:28:35 2009 +++ SPECS/java-commons-httpclient.spec Tue Feb 17 13:16:34 2009 @@ -1,10 +1,14 @@ # $Revision$, $Date$ +# TODO: +# - do not mark -manual files as %%doc (?) +%bcond_with tests # tests disabled by default sinc it requires java-sun %include /usr/lib/rpm/macros.java +%define srcname commons-httpclient Summary: Commons HTTPClient Package Summary(pl.UTF-8): Pakiet Commons HTTPClient Name: java-commons-httpclient Version: 3.1 -Release: 1 +Release: 2 License: Apache Source0: http://www.apache.net.pl/httpcomponents/commons-httpclient/source/commons-httpclient-%{version}-src.tar.gz # Source0-md5: 2c9b0f83ed5890af02c0df1c1776f39b @@ -13,6 +17,7 @@ BuildRequires: ant BuildRequires: java-commons-codec BuildRequires: java-commons-logging >= 1.0.3 +BuildRequires: java-gcj-compat-devel BuildRequires: jce >= 1.2.2 BuildRequires: jpackage-utils BuildRequires: jsse >= 1.0.3.01 @@ -104,13 +109,14 @@ %build export LC_ALL=en_US # source code not US-ASCII -required_jars="jsse jce junit commons-codec commons-logging" +required_jars="glibj jsse jce junit commons-codec commons-logging" export CLASSPATH=$(build-classpath $required_jars) -%ant \ - -Dbuild.sysclasspath=first \ +export SHELL=/bin/sh + +%ant -Dbuild.compiler=extJavac \ -Djavadoc.j2sdk.link=%{_javadocdir}/java \ -Djavadoc.logging.link=%{_javadocdir}/java-commons-logging \ - dist test + dist %{?with_tests:test} rm -f dist/docs/{BUILDING,TESTING}.txt rm -rf apidoc @@ -125,9 +131,9 @@ ln -s commons-httpclient-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/commons-httpclient.jar # javadoc -install -d $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version} -cp -a apidoc/* $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 apidoc/* $RPM_BUILD_ROOT%{_javadocdir}/%{srcname}-%{version} +ln -s %{srcname}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{srcname} # ghost symlink # demo install -d $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version} @@ -137,7 +143,7 @@ rm -rf $RPM_BUILD_ROOT %post javadoc -ln -nfs %{name}-%{version} %{_javadocdir}/%{name} +ln -nfs %{srcname}-%{version} %{_javadocdir}/%{srcname} %files %defattr(644,root,root,755) @@ -146,8 +152,8 @@ %files javadoc %defattr(644,root,root,755) -%{_javadocdir}/%{name}-%{version} -%ghost %{_javadocdir}/%{name} +%{_javadocdir}/%{srcname}-%{version} +%ghost %{_javadocdir}/%{srcname} %files demo %defattr(644,root,root,755) @@ -163,6 +169,11 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.14 2009/02/17 12:16:34 pawelz +- build with java-gcj-compat-devel and GNU libraries +- correct dir for javadoc +- rel 2 + Revision 1.13 2009/02/02 12:28:35 glen - Libraries/Java group ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/java-commons-httpclient.spec?r1=1.13&r2=1.14&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
