From 855fffaf3bdf3c511a03ee152cdb92f359e29ec0adaa61c84f5b841b3d5db93d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= <tchvatal@suse.com>
Date: Fri, 3 Jun 2016 09:23:56 +0000
Subject: [PATCH] Accepting request 399938 from Java:packages

OBS-URL: https://build.opensuse.org/request/show/399938
OBS-URL: https://build.opensuse.org/package/show/Java:packages/bsf?expand=0&rev=24
---
 bsf.changes              |  7 -------
 bsf.spec                 |  6 +-----
 build-file-doclint.patch | 12 ------------
 build-file.patch         | 10 ++++------
 4 files changed, 5 insertions(+), 30 deletions(-)
 delete mode 100644 build-file-doclint.patch

diff --git a/bsf.changes b/bsf.changes
index d84816b..6bcb6b5 100644
--- a/bsf.changes
+++ b/bsf.changes
@@ -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
 
diff --git a/bsf.spec b/bsf.spec
index 62e3f5b..47237f7 100644
--- a/bsf.spec
+++ b/bsf.spec
@@ -1,7 +1,7 @@
 #
 # 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
 # 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
 Patch0:         build-file.patch
 Patch1:         build.properties.patch
-Patch2:         build-file-doclint.patch
 BuildRequires:  ant
 BuildRequires:  apache-commons-logging
 BuildRequires:  java-devel
@@ -93,9 +92,6 @@ rm -fr bsf
 
 %patch0 -p1
 %patch1 -p1
-%if 0%{?suse_version} >= 1330
-%patch2 -p1
-%endif
 
 %build
 [ -z "$JAVA_HOME" ] && export JAVA_HOME=%{_jvmdir}/java
diff --git a/build-file-doclint.patch b/build-file-doclint.patch
deleted file mode 100644
index 15bc5a9..0000000
--- a/build-file-doclint.patch
+++ /dev/null
@@ -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>
diff --git a/build-file.patch b/build-file.patch
index d44a47b..7c15cfd 100644
--- a/build-file.patch
+++ b/build-file.patch
@@ -1,8 +1,6 @@
-Index: bsf-2.4.0/build.xml
-===================================================================
---- bsf-2.4.0.orig/build.xml
-+++ bsf-2.4.0/build.xml
-@@ -102,7 +102,7 @@ Copyright:
+--- 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>
  
@@ -11,7 +9,7 @@ Index: bsf-2.4.0/build.xml
  		<tstamp />
  
  
-@@ -134,11 +134,13 @@ Copyright:
+@@ -134,11 +134,13 @@
  
  		<available property="junit.present" classname="junit.framework.TestCase" />