SPECS: jakarta-struts-legacy.spec - unify java package, builds wit...

[glen]

Author: glen                         Date: Mon Apr  9 22:51:14 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- unify java package, builds with java 1.5

---- Files affected:
SPECS:
   jakarta-struts-legacy.spec (1.8 -> 1.9) 

---- Diffs:

================================================================
Index: SPECS/jakarta-struts-legacy.spec
diff -u SPECS/jakarta-struts-legacy.spec:1.8 SPECS/jakarta-struts-legacy.spec:1.9
--- SPECS/jakarta-struts-legacy.spec:1.8	Tue Feb 13 09:06:35 2007
+++ SPECS/jakarta-struts-legacy.spec	Tue Apr 10 00:51:09 2007
@@ -13,6 +13,8 @@
 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
@@ -33,35 +35,70 @@
 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}
-
-cp dist/*.jar $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
+
+# 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}
+
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
 * %{date} PLD Team <feedback at pld-linux.org>
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.9  2007/04/09 22:51:09  glen
+- unify java package, builds with java 1.5
+
 Revision 1.8  2007/02/13 08:06:35  glen
 - tabs in preamble
 
@@ -79,7 +116,7 @@
 
 Revision 1.3  2004/07/15 14:49:24  pluto
 - BR fixed.
-- %%{_javadir}.
+- %{_javadir}.
 
 Revision 1.2  2003/07/03 22:29:37  qboosh
 - description, pl
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/jakarta-struts-legacy.spec?r1=1.8&r2=1.9&f=u