Accepting request 502560 from Java:packages

- Obsolete javadoc to bootstrap using gcj
- Add patch no-javadoc.patch

OBS-URL: https://build.opensuse.org/request/show/502560
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/relaxngDatatype?expand=0&rev=15

no-javadoc.patch

@@ -0,0 +1,22 @@
+Index: relaxngDatatype-1.0/build.xml
+===================================================================
+--- relaxngDatatype-1.0.orig/build.xml
++++ relaxngDatatype-1.0/build.xml
+@@ -32,7 +32,7 @@ Implementation-Vendor: relaxng.sourcefor
+ 		</jar>
+ 		
+ 		<!-- generate javadoc documentation -->
+-		<mkdir dir="doc"/>
++		<!--		<mkdir dir="doc"/>
+ 		<javadoc	locale="en_US"
+ 					packagenames="org.relaxng.datatype.*"
+ 					sourcepath="src"
+@@ -41,7 +41,7 @@ Implementation-Vendor: relaxng.sourcefor
+ 					public="yes"
+ 					author="yes"
+ 					>
+-		</javadoc>
++		</javadoc>-->
+ 		
+ 		<!-- creates distribution package -->
+ 		<zip	zipfile="relaxngDatatype-${version}.zip">

relaxngDatatype.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Jun  9 10:36:56 UTC 2017 - tchvatal@suse.com
+
+- Obsolete javadoc to bootstrap using gcj
+- Add patch no-javadoc.patch
+
 -------------------------------------------------------------------
 Fri Jul 11 14:48:26 UTC 2014 - tchvatal@suse.com
 

relaxngDatatype.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package relaxngDatatype
 #
-# Copyright (c) 2014 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
@@ -24,9 +24,11 @@ License:        BSD-3-Clause
 Group:          Development/Languages/Java
 Url:            https://sourceforge.net/projects/relaxng
 Source0:        relaxngDatatype-1.0.tar.bz2
+Patch0:         no-javadoc.patch
 BuildRequires:  ant
 BuildRequires:  java-devel
 BuildRequires:  javapackages-tools
+Obsoletes:      %{name}-javadoc
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildArch:      noarch
 
@@ -35,38 +37,25 @@ RELAX NG is a public space for test cases and other ancillary software
 related to the construction of the RELAX NG language and its
 implementations.
 
-%package        javadoc
-Summary:        RELAX NG Datatype API
-Group:          Development/Languages/Java
-
-%description    javadoc
-RELAX NG is a public space for test cases and other ancillary software
-related to the construction of the RELAX NG language and its
-implementations.
-
 %prep
 %setup -q
 # wrong end of line necoding
 sed -i -e 's/.$//' copying.txt
+%patch0 -p1
 
 %build
-ant -Dbuild.sysclasspath=only -Dant.build.javac.source=1.4 -Dant.build.javac.target=1.5
+ant \
+    -Dbuild.sysclasspath=only \
+    -Dant.build.javac.source=1.5 -Dant.build.javac.target=1.5
 
 %install
 install -Dpm 644 %{name}.jar \
   %{buildroot}%{_javadir}/%{name}-%{version}.jar
 ln -s %{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar
-#
-install -dm 755 %{buildroot}%{_javadocdir}/%{name}
-cp -pr doc/* %{buildroot}%{_javadocdir}/%{name}
 
 %files
 %defattr(-,root,root,-)
 %doc copying.txt
 %{_javadir}/*.jar
 
-%files javadoc
-%defattr(-,root,root,-)
-%doc %{_javadocdir}/%{name}
-
 %changelog