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
This commit is contained in:
Christoph Höger
parent
e656779dcb
commit
340dadbdba
|
|
@ -1 +1 @@
|
||||||
bsf-src-2.3.0.tar.gz
|
build-file.patch
|
||||||
|
|
|
||||||
|
|
@ -1,11 +0,0 @@
|
||||||
--- bsf-2.3.0/src/bsf/src/org/apache/bsf/util/JavaUtils.java~ 2002-11-13 06:28:54.000000000 +0000
|
|
||||||
+++ bsf-2.3.0/src/bsf/src/org/apache/bsf/util/JavaUtils.java 2005-06-01 18:11:23.000000000 +0100
|
|
||||||
@@ -82,7 +82,7 @@
|
|
||||||
};
|
|
||||||
try
|
|
||||||
{
|
|
||||||
- return new sun.tools.javac.Main(System.err, "javac").compile(args);
|
|
||||||
+ return new com.sun.tools.javac.Main().compile(args) == 0;
|
|
||||||
}
|
|
||||||
catch (Throwable th)
|
|
||||||
{
|
|
||||||
27
bsf.spec
27
bsf.spec
|
|
@ -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}}}
|
%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
|
Name: bsf
|
||||||
Version: 2.3.0
|
Version: 2.4.0
|
||||||
Release: 15%{?dist}
|
Release: 1%{?dist}
|
||||||
Epoch: 0
|
Epoch: 0
|
||||||
Summary: Bean Scripting Framework
|
Summary: Bean Scripting Framework
|
||||||
License: ASL 1.1
|
License: ASL 1.1
|
||||||
|
|
@ -42,12 +42,16 @@ Url: http://jakarta.apache.org/bsf/
|
||||||
Group: Development/Libraries/Java
|
Group: Development/Libraries/Java
|
||||||
#http://jakarta.apache.org/builds/jakarta-%{name}/dev/v%{version}/src/%{name}-src-%{version}.tar.gz
|
#http://jakarta.apache.org/builds/jakarta-%{name}/dev/v%{version}/src/%{name}-src-%{version}.tar.gz
|
||||||
Source0: %{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: jpackage-utils >= 1.6
|
||||||
BuildRequires: ant
|
BuildRequires: ant
|
||||||
BuildRequires: servlet
|
BuildRequires: servlet
|
||||||
BuildRequires: tomcat5-jsp-2.0-api
|
BuildRequires: tomcat5-jsp-2.0-api
|
||||||
BuildRequires: xalan-j2
|
BuildRequires: xalan-j2
|
||||||
|
BuildRequires: jython
|
||||||
|
BuildRequires: jakarta-commons-logging
|
||||||
|
Requires: jakarta-commons.logging
|
||||||
Requires: servletapi5
|
Requires: servletapi5
|
||||||
Requires: xalan-j2
|
Requires: xalan-j2
|
||||||
Requires: tomcat5-jsp-2.0-api
|
Requires: tomcat5-jsp-2.0-api
|
||||||
|
|
@ -102,14 +106,13 @@ Javadoc for %{name}.
|
||||||
find . -name "*.jar" -exec %{__rm} -f {} \;
|
find . -name "*.jar" -exec %{__rm} -f {} \;
|
||||||
%{__rm} -fr bsf
|
%{__rm} -fr bsf
|
||||||
|
|
||||||
|
%patch0 -p1
|
||||||
%patch1 -p1
|
%patch1 -p1
|
||||||
|
|
||||||
%build
|
%build
|
||||||
[ -z "$JAVA_HOME" ] && export JAVA_HOME=%{_jvmdir}/java
|
[ -z "$JAVA_HOME" ] && export JAVA_HOME=%{_jvmdir}/java
|
||||||
export CLASSPATH=$(build-classpath xalan-j2 servlet jspapi)
|
export CLASSPATH=$(build-classpath jakarta-commons-logging jython xalan-j2 servlet jspapi)
|
||||||
cd src
|
ant jar
|
||||||
ant realclean
|
|
||||||
ant compile
|
|
||||||
%{__rm} -rf bsf/src/org/apache/bsf/engines/java
|
%{__rm} -rf bsf/src/org/apache/bsf/engines/java
|
||||||
ant javadocs
|
ant javadocs
|
||||||
|
|
||||||
|
|
@ -117,13 +120,13 @@ ant javadocs
|
||||||
%{__rm} -fr %{buildroot}
|
%{__rm} -fr %{buildroot}
|
||||||
# jar
|
# jar
|
||||||
%{__install} -d -m 755 %{buildroot}%{_javadir}
|
%{__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
|
%{buildroot}%{_javadir}/%{name}-%{version}.jar
|
||||||
(cd %{buildroot}%{_javadir} && for jar in *-%{version}*; do \
|
(cd %{buildroot}%{_javadir} && for jar in *-%{version}*; do \
|
||||||
ln -sf ${jar} ${jar/-%{version}/}; done)
|
ln -sf ${jar} ${jar/-%{version}/}; done)
|
||||||
# javadoc
|
# javadoc
|
||||||
%{__install} -d -m 755 %{buildroot}%{_javadocdir}/%{name}-%{version}
|
%{__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})
|
(cd %{buildroot}%{_javadocdir} && ln -sf %{name}-%{version} %{name})
|
||||||
ln -s %{name}-%{version} %{buildroot}%{_javadocdir}/%{name}
|
ln -s %{name}-%{version} %{buildroot}%{_javadocdir}/%{name}
|
||||||
|
|
||||||
|
|
@ -152,7 +155,7 @@ fi
|
||||||
|
|
||||||
%files
|
%files
|
||||||
%defattr(-,root,root)
|
%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}/*
|
%{_javadir}/*
|
||||||
|
|
||||||
%if %{gcj_support}
|
%if %{gcj_support}
|
||||||
|
|
@ -166,6 +169,10 @@ fi
|
||||||
%{_javadocdir}/%{name}
|
%{_javadocdir}/%{name}
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Wed Sep 09 2009 Christoph Höger <choeger@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@lists.fedoraproject.org> - 0:2.3.0-15
|
* Fri Jul 24 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0:2.3.0-15
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,25 @@
|
||||||
|
--- 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" />
|
||||||
|
|
@ -0,0 +1,47 @@
|
||||||
|
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>
|
||||||
Loading…
Reference in New Issue