Author: pawelz Date: Tue Feb 17 13:59:25 2009 GMT Module: SPECS Tag: HEAD ---- Log message: - enable javadocs bcond by default. It seems to work. - use java-gcj-compat-devel - correct dir for javadoc - rel 1
---- Files affected: SPECS: java-commons-discovery.spec (1.10 -> 1.11) ---- Diffs: ================================================================ Index: SPECS/java-commons-discovery.spec diff -u SPECS/java-commons-discovery.spec:1.10 SPECS/java-commons-discovery.spec:1.11 --- SPECS/java-commons-discovery.spec:1.10 Mon Feb 2 13:20:09 2009 +++ SPECS/java-commons-discovery.spec Tue Feb 17 14:59:20 2009 @@ -1,19 +1,21 @@ # $Revision$, $Date$ -%bcond_with javadoc # broken +%bcond_without javadoc # Build api docs %include /usr/lib/rpm/macros.java -Summary: Jakarta Commons Discovery - discovering implementations for pluggable interfaces -Summary(pl.UTF-8): Pakiet Jakarta Commons Discovery - wykrywanie implementacji dołączalnych interfejsów +%define srcname commons-discovery +Summary: Commons Discovery - discovering implementations for pluggable interfaces +Summary(pl.UTF-8): Pakiet Commons Discovery - wykrywanie implementacji dołączalnych interfejsów Name: java-commons-discovery Version: 0.2 -Release: 0.1 +Release: 1 License: Apache Group: Libraries/Java -Source0: http://www.apache.org/dist/jakarta/commons/discovery/source/commons-discovery-%{version}-src.tar.gz +Source0: http://www.apache.org/dist/commons/discovery/source/commons-discovery-%{version}-src.tar.gz # Source0-md5: 57968a150ea9b7158ac0e995c8f24080 -Patch0: %{name}-source.patch -URL: http://jakarta.apache.org/commons/discovery/ +Patch0: jakarta-commons-discovery-source.patch +URL: http://commons.apache.org/commons/discovery/ BuildRequires: ant BuildRequires: java-commons-logging >= 1.0.1 +BuildRequires: java-gcj-compat-devel BuildRequires: jpackage-utils BuildRequires: junit >= 3.7 BuildRequires: rpm-javaprov @@ -59,7 +61,8 @@ %build cd discovery -%ant \ +export SHELL=/bin/sh +%ant -Dbuild.compiler=extJavac \ -Dcompile.source=1.4 \ -Djunit.jar=%{_javadir}/junit.jar \ -Dlogger.jar=%{_javadir}/commons-logging.jar \ @@ -76,16 +79,16 @@ # javadoc %if %{with javadoc} -install -d $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version} -cp -pr 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 -pr dist/docs/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{srcname}-%{version} +ln -s %{srcname}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{srcname} # ghost symlink %endif %clean rm -rf $RPM_BUILD_ROOT %post javadoc -ln -sf %{name}-%{version} %{_javadocdir}/%{name} +ln -sf %{srcname}-%{version} %{_javadocdir}/%{srcname} %files %defattr(644,root,root,755) @@ -95,8 +98,8 @@ %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"`) @@ -105,6 +108,12 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.11 2009/02/17 13:59:20 pawelz +- enable javadocs bcond by default. It seems to work. +- use java-gcj-compat-devel +- correct dir for javadoc +- rel 1 + Revision 1.10 2009/02/02 12:20:09 glen - fix package name ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/java-commons-discovery.spec?r1=1.10&r2=1.11&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
