From 98664db2b43a2412a26845e5062899b8eb7a8752184da44734d9d4f535cc9e4d 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:56:18 +0000
Subject: [PATCH] - Drop javadoc to build with gcj and low in the buildphase

OBS-URL: https://build.opensuse.org/package/show/Java:packages/isorelax?expand=0&rev=7
---
 isorelax-build.xml |  4 +--
 isorelax.changes   |  5 ++++
 isorelax.spec      | 61 ++++++++--------------------------------------
 3 files changed, 17 insertions(+), 53 deletions(-)

diff --git a/isorelax-build.xml b/isorelax-build.xml
index 1b8a816..721bdd8 100644
--- a/isorelax-build.xml
+++ b/isorelax-build.xml
@@ -12,7 +12,7 @@
 			<include name="**/*.java" />
 		</javac>
 		
-      		<mkdir dir="apidocs"/>
+		<!--      		<mkdir dir="apidocs"/>
       		<javadoc packagenames="org.*"
                		sourcepath="src"
                		destdir="apidocs"
@@ -29,7 +29,7 @@
                		nohelp="true"
                		nonavbar="false"
                		serialwarn="false">
-      		</javadoc>
+		</javadoc>-->
 
 		<!-- create a time stamp file -->
 		<echo file="temp/version.properties">version=${DSTAMP}</echo>
diff --git a/isorelax.changes b/isorelax.changes
index 23c5c0f..1273d3f 100644
--- a/isorelax.changes
+++ b/isorelax.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Fri Jun  9 10:57:53 UTC 2017 - tchvatal@suse.com
+
+- Drop javadoc to build with gcj and low in the buildphase
+
 -------------------------------------------------------------------
 Mon Sep  9 11:05:45 UTC 2013 - tchvatal@suse.com
 
diff --git a/isorelax.spec b/isorelax.spec
index 0d86022..17af289 100644
--- a/isorelax.spec
+++ b/isorelax.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package isorelax
 #
-# Copyright (c) 2013 SUSE LINUX Products 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
@@ -16,30 +16,22 @@
 #
 
 
-%define with_tests %{?_with_tests:1}%{!?_with_tests:0}
-%define without_tests %{!?_with_tests:1}%{?_with_tests:0}
-%define	section		free
 %define	cvsversion	20041111
-
 Name:           isorelax
+Version:        0.1
+Release:        0
 Summary:        Public interfaces useful for applications to support RELAX Core
 License:        Apache-2.0 and MIT
 Group:          Development/Libraries/Java
 Url:            http://iso-relax.sourceforge.net/
-Version:        0.1
-Release:        0
-BuildArch:      noarch
 Source0:        %{name}.%{cvsversion}.zip
 Source1:        %{name}-build.xml
 Source2:        isorelax-maven-project.xml
 Source3:        isorelax-maven-project.xsd
 Patch0:         isorelax-java5-compatibility.patch
 BuildRequires:  ant
-BuildRequires:  javapackages-tools
-%if %{with_tests}
-BuildRequires:  xercesjarv
-%endif
 BuildRequires:  java-devel
+BuildRequires:  javapackages-tools
 BuildRequires:  unzip
 BuildRequires:  xerces-j2
 BuildRequires:  xml-commons-apis
@@ -47,29 +39,17 @@ Requires:       xerces-j2
 Requires:       xml-commons-apis
 Obsoletes:      isorelax-bootstrap
 Provides:       isorelax-bootstrap
+Obsoletes:      %{name}-javadoc
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+BuildArch:      noarch
 
 %description
 The ISO RELAX project is started to host the public interfaces useful
 for applications to support RELAX Core. But nowadays some of the stuff
 we have is schema language neutral.
 
-
-
-%package javadoc
-Summary:        Public interfaces useful for applications to support RELAX Core
-License:        MIT
-Group:          Productivity/Publishing/XML
-
-%description javadoc
-The ISO RELAX project is started to host the public interfaces useful
-for applications to support RELAX Core. But nowadays some of the stuff
-we have is schema language neutral.
-
-
-
 %prep
-%setup -T -c -n %{name}-%{version}
+%setup -q -T -c
 unzip -q %{SOURCE0}
 mkdir src
 (cd src; unzip -q ../src.zip)
@@ -88,39 +68,18 @@ export CLASSPATH=$(build-classpath \
 xerces-j2 \
 xml-commons-apis \
 )
-%if %{with_tests}
-CLASSPATH=$CLASSPATH:$(build-classpath xercesjarv)
-ln -s $(find-jar xercesjarv) xercesjarv.jar
-%endif
 ant -Dant.build.javac.source=1.5 -Dant.build.javac.target=1.5 \
     -Dbuild.sysclasspath=only release
-%if %{with_tests}
-CLASSPATH=isorelax.jar:$CLASSPATH
-ant -Dant.build.javac.source=1.5 -Dant.build.javac.target=1.5 \
-    -Dbuild.sysclasspath=first ant-task-test
-%endif
 
 %install
 # jars
-install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
-install -m 644 %{name}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
-(cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}*; do ln -sf ${jar} `echo $jar| sed  "s|-%{version}||g"`; done)
-# javadoc
-install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-cp -pr apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}
-
-%clean
-rm -rf $RPM_BUILD_ROOT
+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)
 
 %files
 %defattr(-,root,root)
 %doc COPYING.txt
 %{_javadir}/*
 
-%files javadoc
-%defattr(-,root,root)
-%{_javadocdir}/%{name}-%{version}
-%doc %{_javadocdir}/%{name}
-
 %changelog