SPECS: jakarta-commons-modeler.spec - unify java package, builds w...

[glen]

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

---- Files affected:
SPECS:
   jakarta-commons-modeler.spec (1.12 -> 1.13) 

---- Diffs:

================================================================
Index: SPECS/jakarta-commons-modeler.spec
diff -u SPECS/jakarta-commons-modeler.spec:1.12 SPECS/jakarta-commons-modeler.spec:1.13
--- SPECS/jakarta-commons-modeler.spec:1.12	Tue Feb 13 09:06:35 2007
+++ SPECS/jakarta-commons-modeler.spec	Tue Apr 10 00:44:45 2007
@@ -35,46 +35,60 @@
 zasobami aplikacji z użyciem narzędzi będących implementacją API Java
 Management Extensions (JMX).
 
-%package doc
+%package javadoc
 Summary:	Jakarta Commons Modeller documentation
 Summary(pl.UTF-8):	Dokumentacja do Jakarta Commons Modeller
-Group:		Development/Languages/Java
+Group:		Documentation
+Requires:	jpackage-utils
+Obsoletes:	jakarta-commons-modeler-doc
 
-%description doc
+%description javadoc
 Jakarta Commons Modeller documentation.
 
-%description doc -l pl.UTF-8
+%description javadoc -l pl.UTF-8
 Dokumentacja do Jakarta Commons Modeller.
 
 %prep
 %setup -q -n commons-modeler-%{version}-src
 
 %build
-cat << EOF > build.properties
-commons-digester.jar=%{_javadir}/commons-digester.jar
-commons-logging.jar=%{_javadir}/commons-logging.jar
-jmx.jar=%{_javadir}/jmxri.jar
-jmxtools.jar=%{_javadir}/jmxtools.jar
-EOF
-ant dist
+required_jars="commons-digester commons-logging jre/jmx"
+export CLASSPATH=$(/usr/bin/build-classpath $required_jars)
+%ant dist
 
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT%{_javadir}
-
-install 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 LICENSE.txt PROPOSAL.html RELEASE-NOTES* STATUS.html
 %{_javadir}/*.jar
 
-%files doc
+%files javadoc
 %defattr(644,root,root,755)
-%doc dist/docs
+%{_javadocdir}/%{name}-%{version}
 
 %define	date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -82,6 +96,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.13  2007/04/09 22:44:45  glen
+- unify java package, builds with java 1.5
+
 Revision 1.12  2007/02/13 08:06:35  glen
 - tabs in preamble
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/jakarta-commons-modeler.spec?r1=1.12&r2=1.13&f=u