Author: pawelz Date: Sun Sep 20 19:38:56 2009 GMT
Module: packages Tag: HEAD
---- Log message:
- per distro jdk bconds
- standard java BRs
- rewrapped descriptions using proper encoding
- there is no need to export CLASSPATH since %ant macro passes it to ant
- unified directories for javadoc
- correct license info (it is Apache License v 2.0, not 1.1)
- rel 3
---- Files affected:
packages/java-commons-cli:
java-commons-cli.spec (1.17 -> 1.18)
---- Diffs:
================================================================
Index: packages/java-commons-cli/java-commons-cli.spec
diff -u packages/java-commons-cli/java-commons-cli.spec:1.17
packages/java-commons-cli/java-commons-cli.spec:1.18
--- packages/java-commons-cli/java-commons-cli.spec:1.17 Sat Jan 24
23:10:18 2009
+++ packages/java-commons-cli/java-commons-cli.spec Sun Sep 20 21:38:50 2009
@@ -3,14 +3,21 @@
# Conditional build:
%bcond_without javadoc # don't build javadoc
%bcond_without tests # don't run tests
-#
+
+%if "%{pld_release}" == "ti"
+%bcond_without java_sun # build with gcj
+%else
+%bcond_with java_sun # build with java-sun
+%endif
+
%include /usr/lib/rpm/macros.java
+%define srcname commons-cli
Summary: Commons CLI - API for working with command line
Summary(pl.UTF-8): Commons CLI - API do pracy z linią poleceń
Name: java-commons-cli
Version: 1.1
-Release: 2
-License: Apache v1.1
+Release: 3
+License: Apache v2
Group: Libraries/Java
Source0:
http://www.apache.org/dist/commons/cli/source/commons-cli-%{version}-src.tar.gz
# Source0-md5: ccc1aa194132e2387557bbb7f65391f4
@@ -19,10 +26,13 @@
BuildRequires: ant
BuildRequires: java-commons-lang
BuildRequires: java-commons-logging
+%{!?with_java_sun:BuildRequires: java-gcj-compat-devel}
+%{?with_java_sun:BuildRequires: java-sun}
BuildRequires: jaxp_parser_impl
BuildRequires: jdk >= 1.4
BuildRequires: jpackage-utils
%{?with_tests:BuildRequires: junit}
+BuildRequires: rpm >= 4.4.9-56
BuildRequires: rpm-javaprov
BuildRequires: rpmbuild(macros) >= 1.300
Requires: jpackage-utils
@@ -33,12 +43,12 @@
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%description
-Commons CLI provides a simple API for working with the command
-line arguments and options.
+Commons CLI provides a simple API for working with the command line
+arguments and options.
%description -l pl.UTF-8
-Commons CLI dostarcza prostego API do pracy z argumentami i
-opcjami linii poleceń.
+Commons CLI dostarcza prostego API do pracy z argumentami i opcjami
+linii poleceń.
%package javadoc
Summary: Commons CLI documentation
@@ -59,7 +69,8 @@
%build
required_jars="commons-lang"
-export CLASSPATH=$(build-classpath $required_jars)
+CLASSPATH=$(build-classpath $required_jars)
+
%ant dist \
-Dnoget="true"
@@ -71,16 +82,16 @@
ln -sf commons-cli-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/commons-cli.jar
%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
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)
@@ -90,8 +101,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"`)
@@ -100,6 +111,15 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.18 2009/09/20 19:38:50 pawelz
+- per distro jdk bconds
+- standard java BRs
+- rewrapped descriptions using proper encoding
+- there is no need to export CLASSPATH since %ant macro passes it to ant
+- unified directories for javadoc
+- correct license info (it is Apache License v 2.0, not 1.1)
+- rel 3
+
Revision 1.17 2009/01/24 22:10:18 qboosh
- unified
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/java-commons-cli/java-commons-cli.spec?r1=1.17&r2=1.18&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
