SPECS: beanshell.spec - -javadoc R: jpackage-utils for parent dirs...

[glen]

Author: glen                         Date: Fri Dec  8 01:02:00 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- -javadoc R: jpackage-utils for parent dirs; rel 2

---- Files affected:
SPECS:
   beanshell.spec (1.6 -> 1.7) 

---- Diffs:

================================================================
Index: SPECS/beanshell.spec
diff -u SPECS/beanshell.spec:1.6 SPECS/beanshell.spec:1.7
--- SPECS/beanshell.spec:1.6	Thu May 25 13:27:51 2006
+++ SPECS/beanshell.spec	Fri Dec  8 02:01:55 2006
@@ -3,24 +3,25 @@
 # Conditional build:
 %bcond_without	bsf	# without BSF support
 #
+%define		_beta	b4
+%define		_rel	2
 Summary:	BeanShell - Lightweight Scripting for Java
 Summary(pl):	BeanShell - lekkie skrypty dla Javy
 Name:		beanshell
 Version:	2.0
-%define	_beta	b4
-Release:	0.%{_beta}.1
+Release:	0.%{_beta}.%{_rel}
 License:	Sun Public License or LGPL
 Group:		Development/Languages/Java
 Source0:	http://www.beanshell.org/bsh-%{version}%{_beta}-src.jar
 # Source0-md5:	49c9cc9872f26d562bffb1e5ec8aa377
 URL:		http://www.beanshell.org/
-%{?with_bsf:BuildRequires:	bsf}
 BuildRequires:	ant >= 1.3
+%{?with_bsf:BuildRequires:	bsf}
 BuildRequires:	jdk >= 1.3
 BuildRequires:	jpackage-utils
 BuildRequires:	rpmbuild(macros) >= 1.300
-BuildRequires:	unzip
 BuildRequires:	servlet
+BuildRequires:	unzip
 Requires:	jre >= 1.1
 BuildArch:	noarch
 ExclusiveArch:	i586 i686 pentium3 pentium4 athlon %{x8664} noarch
@@ -44,6 +45,7 @@
 Summary:	BeanShell API documentation
 Summary(pl):	Dokumentacja API BeanShell
 Group:		Documentation
+Requires:	jpackage-utils
 
 %description javadoc
 BeanShell API documentation.
@@ -52,13 +54,13 @@
 Dokumentacja API BeanShell.
 
 %prep
-%setup -q -n BeanShell-%{version}%{_beta} 
+%setup -q -n BeanShell-%{version}%{_beta}
 
 %build
 export CLASSPATH="`build-classpath %{?with_bsf:bsf} servlet`"
 export JAVA_HOME="%{java_home}"
 
-ant jarall javadoc \
+%ant jarall javadoc \
 	%{!?with_bsf:-Dexclude-bsf='bsh/util/BeanShellBSFEngine.java,TestBshBSF.java'}
 
 cp -R docs/manual/html manual
@@ -86,11 +88,15 @@
 %doc %{_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.7  2006/12/08 01:01:55  glen
+- -javadoc R: jpackage-utils for parent dirs; rel 2
+
 Revision 1.6  2006/05/25 11:27:51  jajcus
 - Version: 2.0b4
 - BR: jpackage-utils, rpmbuild(macros) >= 1.300
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/beanshell.spec?r1=1.6&r2=1.7&f=u