rpm/bsf
SHA256
1
0
Fork 0
forked from pool/bsf
Code Pull Requests Activity

Accepting request 399938 from Java:packages

Browse Source 
OBS-URL: https://build.opensuse.org/request/show/399938
OBS-URL: https://build.opensuse.org/package/show/Java:packages/bsf?expand=0&rev=24
This commit is contained in:
Tomáš Chvátal 2016-06-03 09:23:56 +00:00 committed by Git OBS Bridge
parent e2b6a2d61c
commit 855fffaf3b
4 changed files with 5 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
bsf.changes
View File

@ -1,10 +1,3 @@
-------------------------------------------------------------------
Fri Jun 3 07:11:39 UTC 2016 - fstrba@suse.com
- Add patch:
* build-file-doclint.patch: Disable doclint feature while
building javadoc with java-1_8_0-openjdk
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Mar 25 09:24:47 UTC 2015 - tchvatal@suse.com Wed Mar 25 09:24:47 UTC 2015 - tchvatal@suse.com

6
bsf.spec
View File

@ -1,7 +1,7 @@
# #
# spec file for package bsf # spec file for package bsf
# #
# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -29,7 +29,6 @@ Source1000: http://www.apache.org/dist/commons/bsf/source/%{name}-src-%{vers
Source1001: bsf.keyring Source1001: bsf.keyring
Patch0: build-file.patch Patch0: build-file.patch
Patch1: build.properties.patch Patch1: build.properties.patch
Patch2: build-file-doclint.patch
BuildRequires: ant BuildRequires: ant
BuildRequires: apache-commons-logging BuildRequires: apache-commons-logging
BuildRequires: java-devel BuildRequires: java-devel
@ -93,9 +92,6 @@ rm -fr bsf
%patch0 -p1 %patch0 -p1
%patch1 -p1 %patch1 -p1
%if 0%{?suse_version} >= 1330
%patch2 -p1
%endif
%build %build
[ -z "$JAVA_HOME" ] && export JAVA_HOME=%{_jvmdir}/java [ -z "$JAVA_HOME" ] && export JAVA_HOME=%{_jvmdir}/java

12
build-file-doclint.patch
View File

@ -1,12 +0,0 @@
Index: bsf-2.4.0/build.xml
===================================================================
--- bsf-2.4.0.orig/build.xml
+++ bsf-2.4.0/build.xml
@@ -272,6 +274,7 @@ Copyright:
<fileset dir="${src.dir}">
<patternset refid="java.source.files"></patternset>
</fileset>
+ <arg value="-Xdoclint:none"/>
</javadoc>
</target>

10
build-file.patch
View File

@ -1,8 +1,6 @@
Index: bsf-2.4.0/build.xml --- 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
--- bsf-2.4.0.orig/build.xml @@ -102,7 +102,7 @@
+++ bsf-2.4.0/build.xml
@@ -102,7 +102,7 @@ Copyright:
<pathelement location="${build.tests}"/> <pathelement location="${build.tests}"/>
</path> </path>
@ -11,7 +9,7 @@ Index: bsf-2.4.0/build.xml
<tstamp /> <tstamp />
@@ -134,11 +134,13 @@ Copyright: @@ -134,11 +134,13 @@
<available property="junit.present" classname="junit.framework.TestCase" /> <available property="junit.present" classname="junit.framework.TestCase" />