Accepting request 196100 from Java:packages

- disable javadoc subpackage
  * drop dom2-core-tests-explicit-javadoc.patch

OBS-URL: https://build.opensuse.org/request/show/196100
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/dom2-core-tests?expand=0&rev=13
This commit is contained in:
Tomáš Chvátal 2013-08-25 11:32:29 +00:00 committed by Git OBS Bridge
commit 47112fbfc4
4 changed files with 34 additions and 81 deletions

View File

@ -1,5 +1,7 @@
--- build.xml.orig 2001-05-21 09:34:00.000000000 +0200
+++ build.xml 2006-01-23 23:33:13.000000000 +0100
Index: build.xml
===================================================================
--- build.xml.orig
+++ build.xml
@@ -1,24 +1,13 @@
<!-- JUnit build script using ant 1.3 -->
-<project name="junit" default="dist" basedir=".">
@ -29,7 +31,7 @@
<javac
srcdir="."
destdir="."
@@ -32,75 +21,23 @@
@@ -32,75 +21,13 @@
<jar
jarfile="${dist}/src.jar"
basedir="."
@ -38,8 +40,7 @@
/>
<jar
- jarfile="${dist}/junit.jar"
+ jarfile="${dist}/dom2-core-tests.jar"
basedir="."
- basedir="."
- excludes="${dist}/junit.jar, junit/tests/**, junit/samples/**, **/*.java, doc/**, README.html, jar-manifest.txt"
- />
- <copy todir="${dist}/junit/samples">
@ -53,20 +54,17 @@
- jarfile="${dist}/junit/tests/test.jar"
- basedir="."
- includes="junit/tests/LoadedFromJar.class"
+ includes="**/*.class"
/>
<mkdir dir="${dist}/javadoc" />
<javadoc
sourcepath="."
- />
- <mkdir dir="${dist}/javadoc" />
- <javadoc
- sourcepath="."
- packagenames="junit.framework.*, junit.extensions.*"
+ packagenames="org.w3c.domts.*"
destdir="${dist}/javadoc"
author="false"
version="false"
use="false"
- destdir="${dist}/javadoc"
- author="false"
- version="false"
- use="false"
- windowtitle="JUnit API"
+ windowtitle="DOM 2 Core Test Suite"
/>
- />
- <copy todir="${dist}/doc">
- <fileset dir="doc"/>
- </copy>
@ -79,17 +77,19 @@
- <pathelement location="${dist}/junit.jar" />
- </classpath>
- </java>
</target>
- </target>
-
- <target name="zip">
- <!-- !!! hard code names, variable substitution doesn't work !!! -->
- <zip
- zipfile="junit3.6.zip"
- basedir="."
+ jarfile="${dist}/dom2-core-tests.jar"
basedir="."
- includes="junit3.6/**"
- />
- </target>
-
+ includes="**/*.class"
/>
</target>
- <target name="awtui" depends="dist">
- <java classname="junit.awtui.TestRunner" fork="yes">
- <arg value="junit.samples.AllTests" />

View File

@ -1,24 +0,0 @@
--- build.xml
+++ build.xml
@@ -28,16 +28,18 @@
basedir="."
includes="**/*.class"
/>
- <mkdir dir="${dist}/javadoc" />
+ </target>
+ <target name="javadoc">
+ <mkdir dir="dom2-core-tests-0.0.1/javadoc" />
<javadoc
sourcepath="."
packagenames="org.w3c.domts.*"
- destdir="${dist}/javadoc"
+ destdir="dom2-core-tests-0.0.1/javadoc"
author="false"
version="false"
use="false"
windowtitle="DOM 2 Core Test Suite"
/>
- </target>
+ </target>
</project>

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Fri Aug 23 07:50:29 UTC 2013 - mvyskocil@suse.com
- disable javadoc subpackage
* drop dom2-core-tests-explicit-javadoc.patch
-------------------------------------------------------------------
Fri Mar 23 08:42:49 UTC 2012 - cfarrell@suse.com

View File

@ -1,7 +1,7 @@
#
# spec file for package dom2-core-tests
#
# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -20,22 +20,21 @@
Name: dom2-core-tests
Summary: DOM Conformance Test Suite
Version: 0.0.1
Release: 4
Group: Development/Libraries/Java
License: W3C
Group: Development/Libraries/Java
Version: 0.0.1
Release: 0
Url: http://www.w3.org/DOM/Test/
BuildArch: noarch
Source0: http://www.w3.org/2004/04/dom2-core-tests-20040405.jar
Source1: LICENSE.html
Patch0: dom2-core-tests-build_xml.patch
Patch1: dom2-core-tests-explicit-javadoc.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: ant
BuildRequires: java-1_5_0-gcj-compat-devel
BuildRequires: jpackage-utils >= 1.5
BuildRequires: unzip
BuildRequires: junit
BuildRequires: unzip
%description
The DOM Test Suites (DOM TS) will consist of a number of tests for each
@ -47,35 +46,16 @@ be automatically generated from the DOM specifications themselves, to
ensure stability and correctness.
%package javadoc
License: W3C
Group: Development/Libraries/Java
Summary: DOM Conformance Test Suite
%description javadoc
The DOM Test Suites (DOM TS) will consist of a number of tests for each
level of the DOM specification. The tests will be represented in an XML
grammar which ensures that tests can easily be ported from the
description format to a number of specific language bindings. This
grammar will be specified in XML Schema and DTD form. The grammar will
be automatically generated from the DOM specifications themselves, to
ensure stability and correctness.
%prep
%setup -q -c -n %{name}-%{version}
rm -rf junit
find . -name "*.class" -exec rm {} \;
%patch0 -b .orig
%patch1 -b .explicit-javadoc
cp %{SOURCE1} .
%build
export CLASSPATH=$(build-classpath junit)
ant -Dant.build.javac.source=1.5 -Dant.build.javac.target=1.5 dist
ant javadoc
%install
# jars
@ -85,19 +65,10 @@ install -m 644 %{name}-%{version}/%{name}.jar $RPM_BUILD_ROOT%{_javadir}/$vjar
pushd $RPM_BUILD_ROOT%{_javadir}
ln -fs $vjar %{name}.jar
popd
# javadoc
install -d -m 0755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
cp -pr %{name}-%{version}/javadoc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/
ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}
%files
%defattr(0644,root,root,0755)
%doc LICENSE.html
%{_javadir}/*
%files javadoc
%defattr(0644,root,root,0755)
%{_javadocdir}/%{name}-%{version}
%{_javadocdir}/%{name}
%changelog