diff --git a/relaxngDatatype.changes b/relaxngDatatype.changes index 12215ad..7c61654 100644 --- a/relaxngDatatype.changes +++ b/relaxngDatatype.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Jun 9 10:36:56 UTC 2017 - tchvatal@suse.com + +- Obsolete javadoc to bootstrap using gcj + ------------------------------------------------------------------- Fri Jul 11 14:48:26 UTC 2014 - tchvatal@suse.com diff --git a/relaxngDatatype.spec b/relaxngDatatype.spec index 4d5ea45..d26de23 100644 --- a/relaxngDatatype.spec +++ b/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 @@ -27,6 +27,7 @@ Source0: relaxngDatatype-1.0.tar.bz2 BuildRequires: ant BuildRequires: java-devel BuildRequires: javapackages-tools +Obsoletes: %{name}-javadoc BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch @@ -35,15 +36,6 @@ 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 @@ -56,17 +48,10 @@ ant -Dbuild.sysclasspath=only -Dant.build.javac.source=1.4 -Dant.build.javac.tar 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