SPECS: xp.spec - unify java package, add -javadoc

[glen]

Author: glen                         Date: Thu Feb 14 17:20:37 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- unify java package, add -javadoc

---- Files affected:
SPECS:
   xp.spec (1.22 -> 1.23) 

---- Diffs:

================================================================
Index: SPECS/xp.spec
diff -u SPECS/xp.spec:1.22 SPECS/xp.spec:1.23
--- SPECS/xp.spec:1.22	Thu Feb 14 17:27:26 2008
+++ SPECS/xp.spec	Thu Feb 14 18:20:32 2008
@@ -1,11 +1,11 @@
 # $Revision$, $Date$
+%include	/usr/lib/rpm/macros.java
 Summary:	XP - an XML Parser in Java
 Summary(pl.UTF-8):	XP - analizator składniowy XML-a napisany w Javie
 Name:		xp
 Version:	0.5
 Release:	4
 Epoch:		1
-Vendor:		James Clark
 License:	Free
 Group:		Applications/Publishing/XML/Java
 Source0:	ftp://ftp.jclark.com/pub/xml/%{name}.zip
@@ -13,17 +13,14 @@
 Patch0:		%{name}-latin2.patch
 URL:		http://www.jclark.com/xml/
 BuildRequires:	jar
-BuildRequires:	jikes
+BuildRequires:	jpackage-utils
+BuildRequires:	rpm-javaprov
+BuildRequires:	rpmbuild(macros) >= 1.300
 BuildRequires:	sax
 BuildRequires:	unzip
-Requires:	jre
-BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
+Requires:	jpackage-utils
 BuildArch:	noarch
-
-%define		_javaclassdir	%{_datadir}/java
-%define 	_jredir %{java_home}/jre
-# _javaclasspath exported in build as $CLASSPATH by rpm
-%define		_javaclasspath %{_jredir}/lib/rt.jar:%{_javaclassdir}/sax.jar:.
+BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
 XP - an XML Parser in Java.
@@ -31,30 +28,61 @@
 %description -l pl.UTF-8
 XP - analizator składniowy XML-a napisany w Javie.
 
+%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}.
+
+%description javadoc -l fr.UTF-8
+Javadoc pour %{name}.
+
 %prep
-%setup -q -c -T
-unzip -qa %{SOURCE0}
-chmod -R a+rX *
+%define	__unzip	/usr/bin/unzip -a
+%setup -qc
 %patch0 -p1
+rm -f %{name}.jar
 
 %build
-rm -f %{name}.jar
-find com -name "*.java"  | xargs jikes -depend
-find com -name "*.class" | xargs jar -c0f %{name}.jar
+required_jars="sax"
+CLASSPATH=$(build-classpath $required_jars)
+export CLASSPATH
+
+%javac -source 1.4 $(find com -name '*.java')
+%jar -c0f %{name}.jar $(find com -name '*.class')
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{_javaclassdir}
-
-install %{name}.jar $RPM_BUILD_ROOT%{_javaclassdir}
+install -d $RPM_BUILD_ROOT%{_javadir}
+# jars
+cp -a %{name}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
+ln -s %{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
+
+install -d $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
+cp -a docs/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
+ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name} # ghost symlink
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%post javadoc
+ln -nfs %{name}-%{version} %{_javadocdir}/%{name}
+
 %files
 %defattr(644,root,root,755)
-%doc docs
-%{_javaclassdir}/*
+%doc docs/index.html
+%{_javadir}/*.jar
+
+%files javadoc
+%defattr(644,root,root,755)
+%{_javadocdir}/%{name}-%{version}
+%ghost %{_javadocdir}/%{name}
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -62,6 +90,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.23  2008-02-14 17:20:32  glen
+- unify java package, add -javadoc
+
 Revision 1.22  2008-02-14 16:27:26  hawk
 - fixed javaclassdir path
 
@@ -107,7 +138,7 @@
   Group field using gettext).
 
 Revision 1.8  2002/01/18 02:15:43  kloczek
-perl -pi -e "s/pld-list\@pld.org.pl/feedback\@pld.org.pl/"
+- perl -pi -e "s/pld-list\@pld.org.pl/feedback\@pld.org.pl/"
 
 Revision 1.7  2001/09/15 19:38:26  bonkey
 - Group changed to Applications/Publishing/XML/Java
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/xp.spec?r1=1.22&r2=1.23&f=u