- unify java package, builds with java 1.5

Changed files:
    java-struts-legacy.spec -> 1.9

1 files changed, 39 insertions, 5 deletions

diff --git a/java-struts-legacy.spec b/java-struts-legacy.spec
index 76a3014..c37d753 100644
--- a/java-struts-legacy.spec
+++ b/java-struts-legacy.spec
@@ -12,6 +12,8 @@ BuildRequires:	ant >= 1.6
 BuildRequires:	jakarta-commons-beanutils
 BuildRequires:	jakarta-commons-collections
 BuildRequires:	jdbc-stdext >= 2.0-2
+BuildRequires:	jpackage-utils
+BuildRequires:	rpmbuild(macros) >= 1.300
 BuildRequires:	servlet
 Requires:	jakarta-commons-beanutils
 Requires:	jakarta-commons-collections
@@ -32,25 +34,57 @@ dystrybucji Struts, ale mogą nadal być interesujące. Klasy te są
 uznane za "stabilne", ale *nie* są aktywnie utrzymywane (stąd nazwa
 "legacy").
 
+%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}.
+
+%description javadoc -l pl.UTF-8
+Dokumentacja do %{name}a -
+
 %prep
 %setup -q -n struts-legacy-%{version}-src
 
 %build
-ant dist \
-	-Dcommons-logging.jar=%{_datadir}/java/commons-logging.jar \
+required_jars="commons-logging"
+export CLASSPATH=$(/usr/bin/build-classpath $required_jars)
+%ant dist \
 	-Djdk.version=1.4 \
-	-Djdbc20ext.jar=%{_datadir}/java/jdbc-stdext.jar
 
 %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
 
-cp 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 dist/docs/api dist/LICENSE.txt
+%doc dist/LICENSE.txt
 %{_javadir}/*.jar
+
+%files javadoc
+%defattr(644,root,root,755)
+%{_javadocdir}/%{name}-%{version}