rpms/bsf/devel build-file.patch, NONE, 1.1 build.properties.patch, NONE, 1.1 .cvsignore, 1.5, 1.6 bsf.spec, 1.20, 1.21 sources, 1.5, 1.6 bsf-javac.patch, 1.1, NONE
Christoph Höger
choeger at fedoraproject.org
Mon Sep 14 08:11:31 UTC 2009
- Previous message (by thread): rpms/taglib/F-10 .cvsignore, 1.11, 1.12 sources, 1.11, 1.12 taglib.spec, 1.30, 1.31 taglib-1.5-kde#161721.patch, 1.1, NONE
- Next message (by thread): rpms/openoffice.org/devel openoffice.org.spec,1.2003,1.2004
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: choeger
Update of /cvs/pkgs/rpms/bsf/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15799
Modified Files:
.cvsignore bsf.spec sources
Added Files:
build-file.patch build.properties.patch
Removed Files:
bsf-javac.patch
Log Message:
Update to the latest stable upstream release
* added build.properties.xml per patch (upstream release bug)
* patched build.xml around some strange ant bug
* removed javac patch (does not apply anymore)
* added jython build dependency
build-file.patch:
build.xml | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
--- NEW FILE build-file.patch ---
--- bsf-2.4.0-orig/build.xml 2009-09-09 11:51:20.000000000 +0200
+++ bsf-2.4.0/build.xml 2009-09-14 08:42:17.000000000 +0200
@@ -102,7 +102,7 @@
<pathelement location="${build.tests}"/>
</path>
- <target name="init" depends="clean">
+ <target name="init">
<tstamp />
@@ -134,11 +134,13 @@
<available property="junit.present" classname="junit.framework.TestCase" />
+ <!--
<uptodate property="javac.notRequired" targetfile="${build.lib}/${project.name}.jar">
<srcfiles dir="${src.dir}">
<patternset refid="javac.source.files" />
</srcfiles>
</uptodate>
+ -->
<uptodate property="javadoc.required" targetfile="${build.lib}/${project.name}.jar">
<srcfiles dir="${build.dir}" includes="**/*.html" />
build.properties.patch:
build-properties.xml | 43 +++++++++++++++++++++++++++++++++++++++++++
1 file changed, 43 insertions(+)
--- NEW FILE build.properties.patch ---
diff --new-file -r -u bsf-2.4.0-orig/build-properties.xml bsf-2.4.0/build-properties.xml
--- bsf-2.4.0-orig/build-properties.xml 1970-01-01 01:00:00.000000000 +0100
+++ bsf-2.4.0/build-properties.xml 2007-05-23 15:33:04.000000000 +0200
@@ -0,0 +1,43 @@
+<?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.0"/>
+ <property name="project.debug" value="on"/>
+ <property name="project.deprecation" value="on"/>
+
+ <property name="build.file" value="build.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>
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/bsf/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore 13 Mar 2007 17:22:14 -0000 1.5
+++ .cvsignore 14 Sep 2009 08:11:30 -0000 1.6
@@ -1 +1 @@
-bsf-src-2.3.0.tar.gz
+build-file.patch
Index: bsf.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bsf/devel/bsf.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- bsf.spec 24 Jul 2009 18:26:53 -0000 1.20
+++ bsf.spec 14 Sep 2009 08:11:31 -0000 1.21
@@ -33,8 +33,8 @@
%define gcj_support %{?_with_gcj_support:1}%{!?_with_gcj_support:%{?_without_gcj_support:0}%{!?_without_gcj_support:%{?_gcj_support:%{_gcj_support}}%{!?_gcj_support:0}}}
Name: bsf
-Version: 2.3.0
-Release: 15%{?dist}
+Version: 2.4.0
+Release: 1%{?dist}
Epoch: 0
Summary: Bean Scripting Framework
License: ASL 1.1
@@ -42,12 +42,16 @@ Url: http://jakarta.apache.or
Group: Development/Libraries/Java
#http://jakarta.apache.org/builds/jakarta-%{name}/dev/v%{version}/src/%{name}-src-%{version}.tar.gz
Source0: %{name}-src-%{version}.tar.gz
-Patch1: %{name}-javac.patch
+Patch0: build-file.patch
+Patch1: build.properties.patch
BuildRequires: jpackage-utils >= 1.6
BuildRequires: ant
BuildRequires: servlet
BuildRequires: tomcat5-jsp-2.0-api
BuildRequires: xalan-j2
+BuildRequires: jython
+BuildRequires: jakarta-commons-logging
+Requires: jakarta-commons.logging
Requires: servletapi5
Requires: xalan-j2
Requires: tomcat5-jsp-2.0-api
@@ -102,14 +106,13 @@ Javadoc for %{name}.
find . -name "*.jar" -exec %{__rm} -f {} \;
%{__rm} -fr bsf
+%patch0 -p1
%patch1 -p1
%build
[ -z "$JAVA_HOME" ] && export JAVA_HOME=%{_jvmdir}/java
-export CLASSPATH=$(build-classpath xalan-j2 servlet jspapi)
-cd src
-ant realclean
-ant compile
+export CLASSPATH=$(build-classpath jakarta-commons-logging jython xalan-j2 servlet jspapi)
+ant jar
%{__rm} -rf bsf/src/org/apache/bsf/engines/java
ant javadocs
@@ -117,13 +120,13 @@ ant javadocs
%{__rm} -fr %{buildroot}
# jar
%{__install} -d -m 755 %{buildroot}%{_javadir}
-%{__install} -m 644 src/build/lib/%{name}.jar \
+%{__install} -m 644 build/lib/%{name}.jar \
%{buildroot}%{_javadir}/%{name}-%{version}.jar
(cd %{buildroot}%{_javadir} && for jar in *-%{version}*; do \
ln -sf ${jar} ${jar/-%{version}/}; done)
# javadoc
%{__install} -d -m 755 %{buildroot}%{_javadocdir}/%{name}-%{version}
-%{__cp} -pr src/build/javadocs/* %{buildroot}%{_javadocdir}/%{name}-%{version}
+%{__cp} -pr build/javadocs/* %{buildroot}%{_javadocdir}/%{name}-%{version}
(cd %{buildroot}%{_javadocdir} && ln -sf %{name}-%{version} %{name})
ln -s %{name}-%{version} %{buildroot}%{_javadocdir}/%{name}
@@ -152,7 +155,7 @@ fi
%files
%defattr(-,root,root)
-%doc license.txt src/AUTHORS src/CHANGES src/CHANGES.old src/README src/TODO
+%doc LICENSE.txt AUTHORS.txt CHANGES.txt NOTICE.txt README.txt TODO.txt RELEASE-NOTE.txt
%{_javadir}/*
%if %{gcj_support}
@@ -166,6 +169,10 @@ fi
%{_javadocdir}/%{name}
%changelog
+* Wed Sep 09 2009 Christoph Höger <choeger at cs.tu-berlin.de> - 0:2.4.0-1
+- New Upstream release: 2.4.0
+- Add jython build dependency to include bsf-jython engine
+
* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0:2.3.0-15
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bsf/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources 13 Mar 2007 17:22:14 -0000 1.5
+++ sources 14 Sep 2009 08:11:31 -0000 1.6
@@ -1 +1 @@
-78bae3747ca5734bb7554eed6868b7da bsf-src-2.3.0.tar.gz
+6e460bb4f709df97bfb8b0029952ba59 build-file.patch
--- bsf-javac.patch DELETED ---
- Previous message (by thread): rpms/taglib/F-10 .cvsignore, 1.11, 1.12 sources, 1.11, 1.12 taglib.spec, 1.30, 1.31 taglib-1.5-kde#161721.patch, 1.1, NONE
- Next message (by thread): rpms/openoffice.org/devel openoffice.org.spec,1.2003,1.2004
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list