- drop obsolete and outdated manual inclusion of rpm macros

[packages/java-commons-chain.git] / java-commons-chain.spec

diff --git a/java-commons-chain.spec b/java-commons-chain.spec
index 4f675033e9015b86d9b78ede2558c7625e1ad022..6dcbc6c5ed1e99072824ad5dadc73c384bfdec9a 100644 (file)
--- a/java-commons-chain.spec
+++ b/java-commons-chain.spec
@@ -1,45 +1,42 @@
-# TODO:
-# - %%install and %%files
-# - package BRed java-myfaces
 #
 # Conditional build:
-%bcond_without javadoc         # don't build javadoc
-%bcond_without tests           # don't build and run tests
+%bcond_with    javadoc         # don't build javadoc
+%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
 
-# Name without java- prefix. If it is aplication, not a library,
-# just do s/srcname/name/g
 %define                srcname         commons-chain
 Summary:       "Chain of Responsibility" pattern implemention
 Name:          java-commons-chain
 Version:       1.2
-Release:       0.1
+Release:       6
 License:       Apache v2.0
 Group:         Libraries/Java
-Source0:       http://www.apache.org/dist/commons/chain/source/commons-chain-1.2-src.tar.gz
+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
-%{!?with_java_sun:BuildRequires:       java-gcj-compat-devel}
-%{?with_java_sun:BuildRequires:        java-sun}
-BuildRequires: java(JavaServerFaces) = 1.1
-BuildRequires: java-commons-logging
+BuildRequires: ant
+BuildRequires: java(jsf) = 1.1
 BuildRequires: java-commons-digester >= 1.8
-BuildRequires: java-portletapi10
+BuildRequires: java-commons-logging
+BuildRequires: java-pluto
+BuildRequires: jdk
 BuildRequires: jpackage-utils
-BuildRequires: rpm >= 4.4.9-56
 BuildRequires: rpm-javaprov
 BuildRequires: rpmbuild(macros) >= 1.300
-Requires:      java(JavaServerFaces) = 1.1
-Requires:      java-commons-logging
+%if %{with tests}
+BuildRequires: ant-junit
+BuildRequires: java-commons-beanutils
+BuildRequires: java-commons-collections
+BuildRequires: java-junit
+%endif
+BuildRequires: java(servlet)
+BuildRequires: sed >= 4
+Requires:      java(jsf) = 1.1
+Requires:      java(servlet)
 Requires:      java-commons-digester >= 1.8
-Requires:      java-portletapi10
+Requires:      java-commons-logging
+Requires:      java-pluto
 Requires:      jpackage-utils
 BuildArch:     noarch
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -102,34 +99,32 @@ Manual for %{name}.
 
 %prep
 %setup -q -n %{srcname}-%{version}-src
-#%{__sed} -i -e 's,\r$,,' build.xml
+
+%{__sed} -i -e 's,\r$,,' build.xml
+%patch0 -p1
 
 %build
 export JAVA_HOME="%{java_home}"
 
-required_jars="servlet commons-logging commons-digester portletapi10 faces-api-1.1"
-CLASSPATH=$(build-classpath $required_jars)
-export CLASSPATH
+required_jars="servlet-api commons-logging commons-digester portlet-api-1.0 faces-api-1.1"
+%if %{with tests}
+required_jars=$required_jars" junit commons-collections commons-beanutils-core"
+%endif
+
+CLASSPATH=$(build-classpath $required_jars):target/classes:target/test-classes
 
 export LC_ALL=en_US # source code not US-ASCII
 
-%ant -Dbuild.sysclasspath=only
+%ant -Dbuild.sysclasspath=only %{?with_tests:test} jar %{?with_javadoc:javadoc}
 
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT%{_javadir}
 
 # jars
-cp -a dist/%{srcname}.jar $RPM_BUILD_ROOT%{_javadir}/%{srcname}-%{version}.jar
+cp -a target/%{srcname}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{srcname}-%{version}.jar
 ln -s %{srcname}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{srcname}.jar
 
-# for jakarta packages:
-for a in dist/*.jar; do
-       jar=${a##*/}
-       cp -a dist/$jar $RPM_BUILD_ROOT%{_javadir}/${jar%%.jar}-%{version}.jar
-       ln -s ${jar%%.jar}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/$jar
-done
-
 # javadoc
 %if %{with javadoc}
 install -d $RPM_BUILD_ROOT%{_javadocdir}/%{srcname}-%{version}
@@ -137,10 +132,6 @@ cp -a dist/docs/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{srcname}-%{version}
 ln -s %{srcname}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{srcname} # ghost symlink
 %endif
 
-# demo
-install -d $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
-cp -a demo/* $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -151,16 +142,6 @@ ln -nfs %{srcname}-%{version} %{_javadocdir}/%{srcname}
 %defattr(644,root,root,755)
 %{_javadir}/*.jar
 
-%files doc
-%defattr(644,root,root,755)
-%doc docs/*
-
-%if 0
-%files demo
-%defattr(644,root,root,755)
-%{_examplesdir}/%{name}-%{version}
-%endif
-
 %if %{with javadoc}
 %files javadoc
 %defattr(644,root,root,755)