Accepting request 107522 from Java:packages
- ignore mysql-connector-java from build to break a build cycle OBS-URL: https://build.opensuse.org/request/show/107522 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/bsf?expand=0&rev=15
This commit is contained in:
Stephan Kulow
Git OBS Bridge
commit
b7928c5178
@ -1,75 +0,0 @@
|
||||
diff -Naur ../bsf-2.3.0.orig/src/bsf/build.xml ./src/bsf/build.xml
|
||||
--- ../bsf-2.3.0.orig/src/bsf/build.xml 2002-11-13 07:28:54.000000000 +0100
|
||||
+++ ./src/bsf/build.xml 2006-09-25 14:25:56.000000000 +0200
|
||||
@@ -208,7 +208,8 @@
|
||||
</fileset>
|
||||
</copy>
|
||||
|
||||
- <javac srcdir="${src.dir}" destdir="${build.dest}" debug="${debug}">
|
||||
+ <javac srcdir="${src.dir}" destdir="${build.dest}" debug="${debug}"
|
||||
+ source="1.4" target="1.4">
|
||||
<patternset refid="javac.source.files"/>
|
||||
<classpath location="${bsf.extraclasspath}"/>
|
||||
</javac>
|
||||
@@ -250,19 +251,19 @@
|
||||
<javac srcdir="${build.samples.calc}"
|
||||
destdir="${build.samples.calc}"
|
||||
classpath="${build.lib}/${name}.jar"
|
||||
- debug="${debug}"/>
|
||||
+ debug="${debug}" source="1.4" target="1.4"/>
|
||||
<javac srcdir="${build.samples.jsplike}"
|
||||
destdir="${build.samples.jsplike}"
|
||||
classpath="${build.lib}/${name}.jar"
|
||||
- debug="${debug}"/>
|
||||
+ debug="${debug}" source="1.4" target="1.4"/>
|
||||
<javac srcdir="${build.samples.scriptedui}"
|
||||
destdir="${build.samples.scriptedui}"
|
||||
classpath="${build.lib}/${name}.jar"
|
||||
- debug="${debug}"/>
|
||||
+ debug="${debug}" source="1.4" target="1.4"/>
|
||||
<javac srcdir="${build.samples.xsl}"
|
||||
destdir="${build.samples.xsl}"
|
||||
classpath="${build.lib}/${name}.jar"
|
||||
- debug="${debug}"/>
|
||||
+ debug="${debug}" source="1.4" target="1.4"/>
|
||||
</target>
|
||||
|
||||
<!-- =================================================================== -->
|
||||
diff -Naur ../bsf-2.3.0.orig/src/bsf_debug/build.xml ./src/bsf_debug/build.xml
|
||||
--- ../bsf-2.3.0.orig/src/bsf_debug/build.xml 2002-11-13 07:28:55.000000000 +0100
|
||||
+++ ./src/bsf_debug/build.xml 2006-09-25 14:27:22.000000000 +0200
|
||||
@@ -98,7 +98,8 @@
|
||||
</fileset>
|
||||
</copy>
|
||||
|
||||
- <javac srcdir="${src.dir}" destdir="${build.dest}" debug="${debug}"/>
|
||||
+ <javac srcdir="${src.dir}" destdir="${build.dest}" debug="${debug}"
|
||||
+ source="1.4" target="1.4"/>
|
||||
|
||||
<!-- ================================================================= -->
|
||||
<!-- Produces the jar file -->
|
||||
diff -Naur ../bsf-2.3.0.orig/src/jsdb/build.xml ./src/jsdb/build.xml
|
||||
--- ../bsf-2.3.0.orig/src/jsdb/build.xml 2002-11-13 07:28:54.000000000 +0100
|
||||
+++ ./src/jsdb/build.xml 2006-09-25 14:26:22.000000000 +0200
|
||||
@@ -99,7 +99,7 @@
|
||||
</fileset>
|
||||
</copy>
|
||||
|
||||
- <javac srcdir="${src.dir}" destdir="${build.dest}" debug="${debug}" classpath="${bsf_debug}/build/lib/bsf_debug.jar"/>
|
||||
+ <javac srcdir="${src.dir}" destdir="${build.dest}" debug="${debug}" classpath="${bsf_debug}/build/lib/bsf_debug.jar" source="1.4" target="1.4"/>
|
||||
|
||||
<!-- ================================================================= -->
|
||||
<!-- Produces the jar file -->
|
||||
diff -Naur ../bsf-2.3.0.orig/src/taglib/build.xml ./src/taglib/build.xml
|
||||
--- ../bsf-2.3.0.orig/src/taglib/build.xml 2002-11-13 07:28:53.000000000 +0100
|
||||
+++ ./src/taglib/build.xml 2006-09-25 14:26:53.000000000 +0200
|
||||
@@ -157,7 +157,8 @@
|
||||
<target name="compile" depends="prepare">
|
||||
<copy file="${conf.src}/taglib.tld"
|
||||
tofile="${build.library}/META-INF/taglib.tld"/>
|
||||
- <javac srcdir="${library.src}" destdir="${build.library}" debug="on">
|
||||
+ <javac srcdir="${library.src}" destdir="${build.library}" debug="on"
|
||||
+ source="1.4" target="1.4">
|
||||
<classpath>
|
||||
<pathelement location="${servlet.jar}"/>
|
||||
<pathelement location="${taglib.extraclasspath}"/>
|
||||
@ -1,3 +1,8 @@
|
||||
-------------------------------------------------------------------
|
||||
Tue Feb 28 14:14:36 UTC 2012 - mvyskocil@suse.cz
|
||||
|
||||
- ignore mysql-connector-java from build to break a build cycle
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sat Sep 17 20:56:11 UTC 2011 - jengelh@medozas.de
|
||||
|
||||
|
||||
10
bsf.spec
10
bsf.spec
@ -1,7 +1,7 @@
|
||||
#
|
||||
# spec file for package bsf
|
||||
#
|
||||
# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
||||
# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
||||
#
|
||||
# All modifications and additions to the file contributed by third parties
|
||||
# remain the property of their copyright owners, unless otherwise agreed
|
||||
@ -14,9 +14,9 @@
|
||||
|
||||
# Please submit bugfixes or comments via http://bugs.opensuse.org/
|
||||
#
|
||||
|
||||
# icecream 0
|
||||
|
||||
|
||||
%define name bsf
|
||||
%define version 2.3.0
|
||||
%define release 8jpp
|
||||
@ -26,15 +26,16 @@ Name: bsf
|
||||
BuildRequires: ant
|
||||
BuildRequires: java-devel
|
||||
BuildRequires: jython
|
||||
#!BuildIgnore: mysql-connector-java
|
||||
BuildRequires: servletapi4
|
||||
BuildRequires: xalan-j2
|
||||
BuildRequires: xml-commons-apis
|
||||
Version: 2.3.0
|
||||
Release: 324
|
||||
Release: 0
|
||||
Summary: Bean Scripting Framework
|
||||
License: Apache-2.0
|
||||
Url: http://jakarta.apache.org/bsf/
|
||||
Group: Development/Libraries/Java
|
||||
Url: http://jakarta.apache.org/bsf/
|
||||
Source0: http://jakarta.apache.org/builds/jakarta-%{name}/dev/v%{version}/src/%{name}-src-%{version}.tar.bz2
|
||||
Source1: bsf-component-info.xml
|
||||
Source2: bsf-2.3.0.pom
|
||||
@ -71,7 +72,6 @@ In addition, the following languages are supported with their own
|
||||
|
||||
|
||||
%package javadoc
|
||||
License: Apache-2.0
|
||||
PreReq: coreutils
|
||||
Summary: Javadoc for bsf
|
||||
Group: Development/Libraries/Java
|
||||
|
||||
Loading…
Reference in New Issue
Block a user