Author: pawelz Date: Fri Feb 27 19:04:59 2009 GMT Module: SPECS Tag: HEAD ---- Log message: - javadoc bcond
---- Files affected: SPECS: nekohtml.spec (1.8 -> 1.9) ---- Diffs: ================================================================ Index: SPECS/nekohtml.spec diff -u SPECS/nekohtml.spec:1.8 SPECS/nekohtml.spec:1.9 --- SPECS/nekohtml.spec:1.8 Fri Feb 27 18:36:07 2009 +++ SPECS/nekohtml.spec Fri Feb 27 20:04:54 2009 @@ -1,4 +1,8 @@ # $Revision$, $Date$ +# +# Conditional build: +%bcond_without javadoc # don't build apidocs +# Summary: HTML scanner and tag balancer Summary(pl.UTF-8): Narzędzie do skanowania i równoważenia znaczników HTML Name: nekohtml @@ -14,7 +18,8 @@ URL: http://www.apache.org/~andyc/neko/doc/html/ BuildRequires: ant BuildRequires: java-gcj-compat-devel -BuildRequires: xerces-j >= 2.3.0 +BuildRequires: java-xerces >= 2.3.0 +%{?with_javadoc:BuildRequires: java-xerces-javadoc >= 2.3.0} Requires: xerces-j >= 2.3.0 BuildArch: noarch BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -82,9 +87,11 @@ -Djarfile=%{name}-%{version}.jar \ -DjarfileXni=%{name}-xni-%{version}.jar \ -DjarfileSamples=%{name}-samples-%{version}.jar \ +%if %{with javadoc} -Dj2se.javadoc=%{_javadocdir}/java \ - -Dxni.javadoc=%{_javadocdir}/xerces-j2-xni \ - -Dxerces.javadoc=%{_javadocdir}/xerces-j2-impl \ + -Dxni.javadoc=%{_javadocdir}/xerces/xni \ + -Dxerces.javadoc=%{_javadocdir}/xerces/xerces2 \ +%endif clean package jar-xni test %install @@ -104,11 +111,13 @@ install -p %{name}-samples-%{version}.jar \ $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version} +%if %{with javadoc} # Javadocs install -d $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version} cp -a bin/package/nekohtml-*/doc/html/javadoc/* \ $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version} ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name} # ghost symlink +%endif # Avoid having javadocs in %doc. rm -rf bin/package/nekohtml-*/doc/html/javadoc @@ -120,9 +129,11 @@ %clean rm -rf $RPM_BUILD_ROOT +%if %{with javadoc} %post javadoc rm -f %{_javadocdir}/%{name} ln -s %{name}-%{version} %{_javadocdir}/%{name} +%endif %files %defattr(644,root,root,755) @@ -145,6 +156,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.9 2009/02/27 19:04:54 pawelz +- javadoc bcond + Revision 1.8 2009/02/27 17:36:07 pawelz - rel 1 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/nekohtml.spec?r1=1.8&r2=1.9&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
