SPECS: bsf.spec - Release: 1 (although there is "rc" in URL this s...

[jajcus]

Author: jajcus                       Date: Wed May 24 13:33:44 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- Release: 1 (although there is "rc" in URL this seems an official version)
- BR: jpackage-utils, rpmbuild(macros)
- ExclusiveArch
- javadoc in -javadoc subpackage and %{_javadocdir}

---- Files affected:
SPECS:
   bsf.spec (1.16 -> 1.17) 

---- Diffs:

================================================================
Index: SPECS/bsf.spec
diff -u SPECS/bsf.spec:1.16 SPECS/bsf.spec:1.17
--- SPECS/bsf.spec:1.16	Fri May 19 13:28:19 2006
+++ SPECS/bsf.spec	Wed May 24 15:33:39 2006
@@ -3,7 +3,7 @@
 Summary(pl):	Bean Scripting Framework - środowisko skryptowe
 Name:		bsf
 Version:	2.3.0
-Release:	0.rc1.1
+Release:	1
 License:	Apache v1.1
 Group:		Development/Languages/Java
 Source0:	http://cvs.apache.org/dist/jakarta/bsf/v2.3.0rc1/src/%{name}-src-%{version}.tar.gz
@@ -14,9 +14,12 @@
 BuildRequires:	jython
 BuildRequires:	netrexx
 #BuildRequires:	rhino < 1.5R4
+BuildRequires:	jpackage-utils
+BuildRequires:	rpmbuild(macros) >= 1.300
 BuildRequires:	sed >= 4.0
 BuildRequires:	xalan-j
 BuildArch:	noarch
+ExclusiveArch:	i586 i686 pentium3 pentium4 athlon %{x8664} noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -25,21 +28,20 @@
 %description -l pl
 Bean Scripting Framework - środowisko skryptowe.
 
-%package doc
+%package javadoc
 Summary:	Bean Scripting Framework documentation
 Summary(pl):	Dokumentacja do Bean Scripting Framework
 Group:		Development/Languages/Java
+Obsoletes:	bsf-doc
 
-%description doc
+%description javadoc
 Bean Scripting Framework documentation.
 
-%description doc -l pl
+%description javadoc -l pl
 Dokumentacja do Bean Scripting Framework.
 
 %prep
 %setup -q
-# cleanup
-rmdir ../bsf
 
 # hack to disable rhino engine (not ready for new rhino debugger API)
 sed -i -e 's/available property="rhino.present/available property="rhino.blah/' \
@@ -50,14 +52,19 @@
 	src/bsf/build.xml
 
 %build
+export CLASSPATH="`build-classpath jacl jython NetRexxC NetRexxR xalan xsltc`"
+export JAVA_HOME="%{java_home}"
 cd src
 ant compile javadocs
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{_javadir}
+install -d $RPM_BUILD_ROOT{%{_javadir},%{_javadocdir}/%{name}-%{version}}
 
-install src/build/lib/bsf.jar $RPM_BUILD_ROOT%{_javadir}
+install src/build/lib/%{name}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
+ln -s %{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
+
+cp -R src/build/javadocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -67,9 +74,9 @@
 %doc license.txt src/{AUTHORS,CHANGES,README,TODO}
 %{_javadir}/*.jar
 
-%files doc
+%files javadoc
 %defattr(644,root,root,755)
-%doc src/build/javadocs/*
+%doc %{_javadocdir}/%{name}-%{version}
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -77,6 +84,12 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.17  2006/05/24 13:33:39  jajcus
+- Release: 1 (although there is "rc" in URL this seems an official version)
+- BR: jpackage-utils, rpmbuild(macros)
+- ExclusiveArch
+- javadoc in -javadoc subpackage and %{_javadocdir}
+
 Revision 1.16  2006/05/19 11:28:19  jajcus
 - s/jakarta-ant/ant/ in BR
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/bsf.spec?r1=1.16&r2=1.17&f=u