Accepting request 496986 from Java:packages

- Remove jython from dependencies, not needed

- New build dependency: javapackages-local
- Spec file cleaned

OBS-URL: https://build.opensuse.org/request/show/496986
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/bsf?expand=0&rev=23
This commit is contained in:
Dominique Leuenberger 2017-05-31 11:31:56 +00:00 committed by Git OBS Bridge
commit 0e0a1fa5a1
2 changed files with 14 additions and 6 deletions

View File

@ -1,3 +1,14 @@
-------------------------------------------------------------------
Sat May 20 18:41:16 UTC 2017 - tchvatal@suse.com
- Remove jython from dependencies, not needed
-------------------------------------------------------------------
Fri May 19 11:38:11 UTC 2017 - pcervinka@suse.com
- New build dependency: javapackages-local
- Spec file cleaned
-------------------------------------------------------------------
Wed Mar 25 09:24:47 UTC 2015 - tchvatal@suse.com

View File

@ -1,7 +1,7 @@
#
# spec file for package bsf
#
# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -32,10 +32,9 @@ Patch1: build.properties.patch
BuildRequires: ant
BuildRequires: apache-commons-logging
BuildRequires: java-devel
BuildRequires: javapackages-local
BuildRequires: javapackages-tools
BuildRequires: jython
BuildRequires: rhino
#!BuildIgnore: mysql-connector-java
BuildRequires: xalan-j2
BuildRequires: xml-commons-apis
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@ -66,8 +65,6 @@ In addition, the following languages are supported with their own
%package javadoc
Summary: Javadoc for bsf
Group: Development/Libraries/Java
# FIXME: use proper Requires(pre/post/preun/...)
PreReq: coreutils
%description javadoc
Bean Scripting Framework (BSF) is a set of Java classes which provides
@ -95,7 +92,7 @@ rm -fr bsf
%build
[ -z "$JAVA_HOME" ] && export JAVA_HOME=%{_jvmdir}/java
export CLASSPATH=$(build-classpath apache-commons-logging rhino xalan-j2 jython servlet jspapi)
export CLASSPATH=$(build-classpath apache-commons-logging rhino xalan-j2 servlet jspapi)
ant jar
rm -rf bsf/src/org/apache/bsf/engines/java
ant javadocs