- unify java package, builds with java 1.5

Changed files:
    jakarta-commons-validator.spec -> 1.10

1 files changed, 36 insertions, 8 deletions

diff --git a/jakarta-commons-validator.spec b/jakarta-commons-validator.spec
index c7a65b3..00e1085 100644
--- a/jakarta-commons-validator.spec
+++ b/jakarta-commons-validator.spec
@@ -14,6 +14,8 @@ BuildRequires:	jakarta-commons-collections
 BuildRequires:	jakarta-commons-digester
 BuildRequires:	jakarta-commons-logging
 BuildRequires:	jakarta-oro
+BuildRequires:	jpackage-utils
+BuildRequires:	rpmbuild(macros) >= 1.300
 Requires:	jakarta-commons-digester
 Requires:	jakarta-oro
 BuildArch:	noarch
@@ -31,27 +33,53 @@ definiowania "validatorów" (metod kontrolujących poprawność danych),
 oraz reguł określających poprawność w pliku XML. Pakiet obsługuje
 zlokalizowane reguły poprawności oraz komunikaty błędów.
 
+%package javadoc
+Summary:	Online manual for %{name}
+Summary(pl.UTF-8):	Dokumentacja online do %{name}
+Group:		Documentation
+Requires:	jpackage-utils
+
+%description javadoc
+Documentation for %{name}.
+
 %prep
 %setup -q -n commons-validator-%{version}
 
 %build
-ant dist \
-	-Dcommons-beanutils.jar=%{_javadir}/commons-beanutils.jar \
-	-Dcommons-collections.jar=%{_javadir}/commons-collections.jar \
-	-Dcommons-digester.jar=%{_javadir}/commons-digester.jar \
-	-Dcommons-logging.jar=%{_javadir}/commons-logging.jar \
-	-Doro.jar=%{_javadir}/oro.jar
+required_jars="commons-beanutils commons-collections commons-digester commons-logging oro"
+export CLASSPATH=$(/usr/bin/build-classpath $required_jars)
+%ant dist
 
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT%{_javadir}
+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
 
-install dist/*.jar $RPM_BUILD_ROOT%{_javadir}
+# javadoc
+install -d $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
+cp -pr dist/docs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%post javadoc
+rm -f %{_javadocdir}/%{name}
+ln -s %{name}-%{version} %{_javadocdir}/%{name}
+
+%postun javadoc
+if [ "$1" = "0" ]; then
+	rm -f %{_javadocdir}/%{name}
+fi
+
 %files
 %defattr(644,root,root,755)
-%doc LICENSE.txt dist/docs/api
+%doc LICENSE.txt
 %{_javadir}/*.jar
+
+%files javadoc
+%defattr(644,root,root,755)
+%{_javadocdir}/%{name}-%{version}