packages: java-bsf/java-bsf.spec, java-bsf/java-bsf-buildprops.patch (NEW) ...

Sat Feb 12 09:19:16 CET 2011

Author: qboosh                       Date: Sat Feb 12 08:19:16 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- updated to 2.4.0
- added buildprops patch (missing build-properties.xml taken from svn)
- js/rhino engine builds now, jython engine is not ready for current jython

---- Files affected:
packages/java-bsf:
   java-bsf.spec (1.27 -> 1.28) , java-bsf-buildprops.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/java-bsf/java-bsf.spec
diff -u packages/java-bsf/java-bsf.spec:1.27 packages/java-bsf/java-bsf.spec:1.28

--- packages/java-bsf/java-bsf.spec:1.27	Sun Apr 18 14:48:15 2010
+++ packages/java-bsf/java-bsf.spec	Sat Feb 12 09:19:11 2011
@@ -1,4 +1,6 @@
 # $Revision$, $Date$
+# NOTE: there is bsf 3.1 now, bsf 2 and bsf 3 implement different specs;
+#       so move 2.4 to java-bsf2.spec and upgrade this to 3.1 or the opposite
 %include	/usr/lib/rpm/macros.java
 #
 %define		pkgname	bsf
@@ -6,18 +8,21 @@
 Summary:	Bean Scripting Framework
 Summary(pl.UTF-8):	Bean Scripting Framework - środowisko skryptowe
 Name:		java-%{pkgname}
-Version:	2.3.0
-Release:	2
+Version:	2.4.0
+Release:	1
 License:	Apache v1.1
 Group:		Development/Languages/Java
-Source0:	http://cvs.apache.org/dist/jakarta/bsf/v2.3.0rc1/src/%{pkgname}-src-%{version}.tar.gz
-# Source0-md5:	78bae3747ca5734bb7554eed6868b7da
+Source0:	http://www.apache.org/dist/jakarta/bsf/source/%{pkgname}-src-%{version}.tar.gz
+# Source0-md5:	7e58b2a009c0f70ab36bbef420b25c07
+Patch0:		%{name}-buildprops.patch
 URL:		http://jakarta.apache.org/bsf/
 BuildRequires:	ant
 BuildRequires:	jacl
 BuildRequires:	jpackage-utils
+BuildRequires:	java-commons-logging
 BuildRequires:	java-netrexx
-#BuildRequires:	java-rhino < 1.5R4
+BuildRequires:	java-rhino
+#BuildRequires:	jython < 2.5
 BuildRequires:	rpm-javaprov
 BuildRequires:	rpmbuild(macros) >= 1.300
 BuildRequires:	sed >= 4.0
@@ -48,29 +53,23 @@
 
 %prep
 %setup -qn %{pkgname}-%{version}
-
-# hack to disable rhino engine (not ready for new rhino debugger API)
-sed -i -e 's/available property="rhino.present/available property="rhino.blah/' \
-	src/bsf/build.xml
-
-# jython obsoleted jpython long time ago - don't try to build
-sed -i -e 's/available property="jpython.present/available property="jpython.blah/' \
-	src/bsf/build.xml
+%patch0 -p1
 
 %build
-required_jars="jacl jython NetRexxC NetRexxR xalan xsltc"
+# disabled: jython (not ready for 2.5)
+required_jars="commons-logging jacl tcljava js NetRexxC NetRexxR xalan xsltc"
 export CLASSPATH=$(build-classpath $required_jars)
-%ant -f src/build.xml compile javadocs
+%ant compile javadocs
 
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT%{_javadir}
 
-install src/build/lib/%{pkgname}.jar $RPM_BUILD_ROOT%{_javadir}/%{pkgname}-%{version}.jar
+install lib/%{pkgname}.jar $RPM_BUILD_ROOT%{_javadir}/%{pkgname}-%{version}.jar
 ln -s %{pkgname}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{pkgname}.jar
 
 install -d $RPM_BUILD_ROOT%{_javadocdir}/%{pkgname}-%{version}
-cp -a src/build/javadocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{pkgname}-%{version}
+cp -a build/javadocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{pkgname}-%{version}
 ln -s %{pkgname}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{pkgname} # ghost symlink
 
 %clean
@@ -81,8 +80,9 @@
 
 %files
 %defattr(644,root,root,755)
-%doc license.txt src/{AUTHORS,CHANGES,README,TODO}
-%{_javadir}/*.jar
+%doc AUTHORS.txt CHANGES.txt LICENSE.txt NOTICE.txt README.txt RELEASE-NOTE.txt TODO.txt
+%{_javadir}/bsf-%{version}.jar
+%{_javadir}/bsf.jar
 
 %files javadoc
 %defattr(644,root,root,755)
@@ -95,6 +95,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.28  2011/02/12 08:19:11  qboosh
+- updated to 2.4.0
+- added buildprops patch (missing build-properties.xml taken from svn)
+- js/rhino engine builds now, jython engine is not ready for current jython
+
 Revision 1.27  2010/04/18 12:48:15  jajcus
 - Obsoletes: bsf
 

================================================================
Index: packages/java-bsf/java-bsf-buildprops.patch
diff -u /dev/null packages/java-bsf/java-bsf-buildprops.patch:1.1
--- /dev/null	Sat Feb 12 09:19:16 2011
+++ packages/java-bsf/java-bsf-buildprops.patch	Sat Feb 12 09:19:11 2011
@@ -0,0 +1,47 @@
+--- bsf-2.4.0/build-properties.xml.orig	1970-01-01 01:00:00.000000000 +0100
++++ bsf-2.4.0/build-properties.xml	2011-02-12 07:51:34.716693904 +0100
+@@ -0,0 +1,44 @@
++<?xml version="1.0" encoding="utf-8"?>
++<project name="props">
++    <property name="project.name" value="bsf"/>
++    <property name="project.fullName" value="Bean Scripting Framework"/>
++    <property name="project.version" value="2.4.1-20061208"/>
++    <property name="project.debug" value="on"/>
++    <property name="project.deprecation" value="on"/>
++
++    <property name="build.file" value="build.xml"/>
++    <property name="build.properties.file" value="build-properties.xml"/>
++    <property name="build.dir" value="build"/>
++    <property name="build.dest" value="build/classes"/>
++    <property name="build.lib" value="build/lib"/>
++    <property name="build.lib.win32" value="build/lib/win32"/>
++    <property name="build.samples" value="build/samples"/>
++    <property name="build.samples.calc" value="build/samples/calc"/>
++    <property name="build.samples.scriptedui" value="build/samples/scriptedui"/>
++    <property name="build.samples.xsl" value="build/samples/xsl"/>
++    <property name="build.javadocs" value="build/javadocs"/>
++    <property name="build.tests" value="build/testcases" />
++
++    <property name="dist.dir" value="dist"/>
++    <property name="dist.dir.root" value="${dist.dir}/${project.name}-${project.version}"/>
++    <property name="dist.bin.file" value="${dist.dir}/${project.name}-bin-${project.version}"/>
++    <property name="dist.src.file" value="${dist.dir}/${project.name}-src-${project.version}"/>
++
++    <property name="packages" value="org.apache.*"/>
++
++    <property name="samples.dir" value="samples"/>
++
++    <property name="site.src" location="xdocs"/>
++    <property name="site.dest" location="docs"/>
++    <property name="site.projectFile" value="stylesheets/project.xml"/>
++
++    <property name="source.level" value="1.3" />
++
++    <property name="src.dir" value="src"/>
++
++    <property name="templ.path" location="xdocs/stylesheets"/>
++
++    <property name="tests.dir" value="test"/>
++
++    <property name="velocity.props" location="${site.src}/velocity.properties"/>
++</project>
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/java-bsf/java-bsf.spec?r1=1.27&r2=1.28&f=u

