#
# Conditional build:
%bcond_with javadoc # don't build javadoc
-%bcond_without tests # don't build and run tests
+%bcond_with tests # don't build and 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-chain
Summary: "Chain of Responsibility" pattern implemention
Name: java-commons-chain
Version: 1.2
-Release: 3
+Release: 6
License: Apache v2.0
Group: Libraries/Java
Source0: http://www.apache.org/dist/commons/chain/source/commons-chain-%{version}-src.tar.gz
# Source0-md5: a94fef07630d88c859fb8397ddbcb6ba
+Patch0: %{name}-notests.patch
URL: http://commons.apache.org/chain
BuildRequires: ant
-BuildRequires: java(JavaServerFaces) = 1.1
-BuildRequires: java(Portlet) = 1.0
+BuildRequires: java(jsf) = 1.1
BuildRequires: java-commons-digester >= 1.8
BuildRequires: java-commons-logging
-%{!?with_java_sun:BuildRequires: java-gcj-compat-devel}
-%{?with_java_sun:BuildRequires: java-sun}
+BuildRequires: java-pluto
+BuildRequires: jdk
BuildRequires: jpackage-utils
-BuildRequires: rpm >= 4.4.9-56
BuildRequires: rpm-javaprov
BuildRequires: rpmbuild(macros) >= 1.300
%if %{with tests}
BuildRequires: java-commons-collections
BuildRequires: java-junit
%endif
-BuildRequires: java(Servlet)
-Requires: java(JavaServerFaces) = 1.1
-Requires: java(Portlet) = 1.0
-Requires: java(Servlet)
+BuildRequires: java(servlet)
+BuildRequires: sed >= 4
+Requires: java(jsf) = 1.1
+Requires: java(servlet)
Requires: java-commons-digester >= 1.8
Requires: java-commons-logging
+Requires: java-pluto
Requires: jpackage-utils
BuildArch: noarch
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%prep
%setup -q -n %{srcname}-%{version}-src
+%{__sed} -i -e 's,\r$,,' build.xml
+%patch0 -p1
+
%build
export JAVA_HOME="%{java_home}"
export LC_ALL=en_US # source code not US-ASCII
-%ant -Dbuild.sysclasspath=only jar %{?with_javadoc:javadoc}
+%ant -Dbuild.sysclasspath=only %{?with_tests:test} jar %{?with_javadoc:javadoc}
%install
rm -rf $RPM_BUILD_ROOT