SPECS: rhino.spec - unify java package - -javadoc added

[glen]

Author: glen                         Date: Sun Dec  9 00:59:05 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- unify java package
- -javadoc added

---- Files affected:
SPECS:
   rhino.spec (1.15 -> 1.16) 

---- Diffs:

================================================================
Index: SPECS/rhino.spec
diff -u SPECS/rhino.spec:1.15 SPECS/rhino.spec:1.16
--- SPECS/rhino.spec:1.15	Thu Sep  6 22:05:42 2007
+++ SPECS/rhino.spec	Sun Dec  9 01:59:00 2007
@@ -1,9 +1,10 @@
 # $Revision$, $Date$
+%include	/usr/lib/rpm/macros.java
+%define	fver	%(echo %{version} | tr . _)
 Summary:	Rhino - JavaScript for Java
 Summary(pl.UTF-8):	Rhino - JavaScript dla Javy
 Name:		rhino
 Version:	1.6R7
-%define	fver	%(echo %{version} | tr . _)
 Release:	1
 License:	MPL 1.1 or GPL v2+
 Group:		Development/Languages/Java
@@ -11,13 +12,14 @@
 # Source0-md5:	7be259ae496aae78feaafe7099e09897
 URL:		http://www.mozilla.org/rhino/
 #BuildRequires:	ant
+BuildRequires:	jpackage-utils
+BuildRequires:	rpm-javaprov
+BuildRequires:	rpmbuild(macros) >= 1.300
 BuildRequires:	unzip
-Requires:	jre
+Requires:	jpackage-utils
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define		_javalibdir	%{_datadir}/java
-
 %description
 Rhino is an open-source implementation of JavaScript written entirely
 in Java. It is typically embedded into Java applications to provide
@@ -28,6 +30,21 @@
 całkowicie w Javie. Zwykle jest osadzana w aplikacjach w Javie aby
 pozwolić użytkownikom na używanie skryptó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}.
+
+%description javadoc -l pl.UTF-8
+Dokumentacja do %{name} -
+
+%description javadoc -l fr.UTF-8
+Javadoc pour %{name}.
+
 %prep
 %setup -q -n %{name}%{fver}
 
@@ -38,17 +55,31 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{_javalibdir}
+install -d $RPM_BUILD_ROOT%{_javadir}
 
-install js.jar $RPM_BUILD_ROOT%{_javalibdir}
+# jars
+install js.jar $RPM_BUILD_ROOT%{_javadir}/js-%{version}.jar
+ln -s js-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/js.jar
+
+# javadoc
+install -d $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
+cp -a javadoc/* $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 javadoc/*
-%{_javalibdir}/*.jar
+%{_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
@@ -56,6 +87,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.16  2007-12-09 00:59:00  glen
+- unify java package
+- -javadoc added
+
 Revision 1.15  2007-09-06 20:05:42  qboosh
 - updated to 1.6R7
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/rhino.spec?r1=1.15&r2=1.16&f=u