From 6d047c1b2cb18a40ea7c4eb6bd261a2b076db0bb40b519c85f85c3f653e99369 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= <tchvatal@suse.com>
Date: Fri, 9 Jun 2017 10:21:19 +0000
Subject: [PATCH] - Drop javadoc so we can bootstrap using gcj

OBS-URL: https://build.opensuse.org/package/show/Java:packages/oro?expand=0&rev=11
---
 oro.changes |  5 +++++
 oro.spec    | 30 ++----------------------------
 2 files changed, 7 insertions(+), 28 deletions(-)

diff --git a/oro.changes b/oro.changes
index d2f58d5..eb9128f 100644
--- a/oro.changes
+++ b/oro.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Fri Jun  9 10:22:50 UTC 2017 - tchvatal@suse.com
+
+- Drop javadoc so we can bootstrap using gcj
+
 -------------------------------------------------------------------
 Sat May 20 18:16:52 UTC 2017 - tchvatal@suse.com
 
diff --git a/oro.spec b/oro.spec
index 70db991..833789f 100644
--- a/oro.spec
+++ b/oro.spec
@@ -16,7 +16,6 @@
 #
 
 
-%define name		oro
 %define full_name	jakarta-%{name}
 Name:           oro
 Version:        2.0.8
@@ -29,6 +28,7 @@ Source0:        %{full_name}-%{version}.tar.gz
 BuildRequires:  ant
 BuildRequires:  xml-commons-apis
 Provides:       %{full_name} = %{version}-%{release}
+Obsoletes:      %{name}-javadoc
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildArch:      noarch
 
@@ -43,24 +43,6 @@ the Jakarta Project by Daniel Savarese (www.savarese.org), the
 copyright holder of the ORO libraries. Daniel will continue to
 participate in their development under the Jakarta Project.
 
-%package javadoc
-Summary:        Javadoc for oro
-Group:          Development/Libraries/Java
-Provides:       %{full_name}-javadoc = %{version}-%{release}
-
-%description javadoc
-The Jakarta-ORO Java classes are a set of text-processing Java classes
-that provide Perl5 compatible regular expressions, AWK-like regular
-expressions, glob expressions, and utility classes for performing
-substitutions, splits, filtering filenames, etc. This library is the
-successor to the OROMatcher, AwkTools, PerlTools, and TextTools
-libraries from ORO, Inc. (www.oroinc.com). They have been donated to
-the Jakarta Project by Daniel Savarese (www.savarese.org), the
-copyright holder of the ORO libraries. Daniel will continue to
-participate in their development under the Jakarta Project.
-
-This package contains the javadoc documentation for ORO.
-
 %prep
 %setup -q -n %{full_name}-%{version}
 # remove all binary libs
@@ -72,7 +54,7 @@ for file in `find . -type f -name .cvsignore`; do rm -rf $file; done
 %build
 ant \
 	-Dant.build.javac.source=1.5 -Dant.build.javac.target=1.5 \
-	-Dfinal.name=%{name} jar javadocs
+	-Dfinal.name=%{name} jar
 
 %install
 #jars
@@ -80,18 +62,10 @@ install -d -m 755 %{buildroot}%{_javadir}
 install -m 644 %{name}.jar %{buildroot}%{_javadir}/%{name}-%{version}.jar
 (cd %{buildroot}%{_javadir} && for jar in *-%{version}*; do ln -sf ${jar} `echo $jar| sed  "s|-%{version}||g"`; done)
 (cd %{buildroot}%{_javadir} && for jar in oro*.jar; do ln -sf ${jar} jakarta-${jar}; done)
-#javadoc
-install -d -m 755 %{buildroot}%{_javadocdir}/%{name}-%{version}
-cp -pr docs/api/* %{buildroot}%{_javadocdir}/%{name}-%{version}
-rm -rf docs/api
 
 %files
 %defattr(-,root,root)
 %doc COMPILE ISSUES README TODO CHANGES CONTRIBUTORS LICENSE STYLE
 %{_javadir}/*.jar
 
-%files javadoc
-%defattr(-,root,root)
-%{_javadocdir}/%{name}-%{version}
-
 %changelog