Author: glen Date: Sun Nov 25 22:41:35 2007 GMT Module: SPECS Tag: HEAD ---- Log message: - update to 1.1
---- Files affected: SPECS: jakarta-commons-cli.spec (1.10 -> 1.11) ---- Diffs: ================================================================ Index: SPECS/jakarta-commons-cli.spec diff -u SPECS/jakarta-commons-cli.spec:1.10 SPECS/jakarta-commons-cli.spec:1.11 --- SPECS/jakarta-commons-cli.spec:1.10 Tue Feb 13 09:06:35 2007 +++ SPECS/jakarta-commons-cli.spec Sun Nov 25 23:41:30 2007 @@ -1,13 +1,14 @@ # $Revision$, $Date$ +%include /usr/lib/rpm/macros.java Summary: Jakarta Commons CLI - API for working with command line Summary(pl.UTF-8): Jakarta Commons CLI - API do pracy z linią poleceń Name: jakarta-commons-cli -Version: 1.0 -Release: 2 +Version: 1.1 +Release: 1 License: Apache v1.1 Group: Development/Languages/Java -Source0: http://www.apache.org/dist/jakarta/commons/cli/source/cli-%{version}-src.tar.gz -# Source0-md5: ba34d585046b1f17dacbb13b377f4255 +Source0: http://www.apache.org/dist/commons/cli/source/commons-cli-%{version}-src.tar.gz +# Source0-md5: ccc1aa194132e2387557bbb7f65391f4 URL: http://jakarta.apache.org/commons/cli/ BuildRequires: ant BuildRequires: jakarta-commons-lang @@ -15,7 +16,8 @@ BuildRequires: jaxp_parser_impl BuildRequires: jdk >= 1.4 BuildRequires: jpackage-utils -BuildRequires: rpmbuild(macros) >= 1.294 +BuildRequires: rpm-javaprov +BuildRequires: rpmbuild(macros) >= 1.300 Requires: jre >= 1.4 BuildArch: noarch BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -28,24 +30,25 @@ Jakarta Commons CLI dostarcza prostego API do pracy z argumentami i opcjami linii poleceń. -%package doc +%package javadoc Summary: Jakarta Commons CLI documentation Summary(pl.UTF-8): Dokumentacja do Jakarta Commons CLI -Group: Development/Languages/Java +Group: Documentation +Requires: jpackage-utils +Obsoletes: jakarta-commons-cli-doc -%description doc +%description javadoc Jakarta Commons CLI documantation. -%description doc -l pl.UTF-8 +%description javadoc -l pl.UTF-8 Dokumentacja do Jakarta Commons CLI. %prep -%setup -q -n commons-cli-%{version} +%setup -q -n commons-cli-%{version}-src %build -install -d lib -# Doesn't build without it, thou it gets the rest deps OK -ln -s %{_javadir}/commons-lang.jar lib/commons-lang.jar +required_jars="commons-lang" +export CLASSPATH=$(build-classpath $required_jars) %ant dist \ -Dnoget="true" @@ -53,20 +56,28 @@ rm -rf $RPM_BUILD_ROOT install -d $RPM_BUILD_ROOT%{_javadir} -install dist/*.jar $RPM_BUILD_ROOT%{_javadir} -ln -sf commons-cli-%{version}-beta-2-dev.jar $RPM_BUILD_ROOT%{_javadir}/commons-cli.jar +install dist/commons-cli-%{version}.jar $RPM_BUILD_ROOT%{_javadir} +ln -sf commons-cli-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/commons-cli.jar + +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 %clean rm -rf $RPM_BUILD_ROOT +%post javadoc +ln -nfs %{name}-%{version} %{_javadocdir}/%{name} + %files %defattr(644,root,root,755) %doc LICENSE.txt %{_javadir}/*.jar -%files doc +%files javadoc %defattr(644,root,root,755) -%doc dist/docs +%{_javadocdir}/%{name}-%{version} +%ghost %{_javadocdir}/%{name} %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog @@ -74,6 +85,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.11 2007-11-25 22:41:30 glen +- update to 1.1 + Revision 1.10 2007-02-13 08:06:35 glen - tabs in preamble ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/jakarta-commons-cli.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
