Accepting request 196077 from Java:packages

- disable javadoc build

OBS-URL: https://build.opensuse.org/request/show/196077
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/junit?expand=0&rev=13

junit.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Fri Aug 23 09:35:53 UTC 2013 - mvyskocil@suse.com
+
+- disable javadoc build 
+
 -------------------------------------------------------------------
 Thu Sep 11 16:14:37 CEST 2008 - mvyskocil@suse.cz
 

junit.spec

@@ -1,7 +1,7 @@
 #
-# spec file for package junit (Version 3.8.2)
+# spec file for package junit
 #
-# Copyright (c) 2008 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
@@ -14,26 +14,25 @@
 
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
-
-# norootforbuild
 # icecream 0
 
 
+%define	name		junit
+%define	version		3.8.2
+%define	release		4jpp
+%define	section		free
+
 Name:           junit
 BuildRequires:  ant
 BuildRequires:  java-1_5_0-gcj-compat-devel
 BuildRequires:  unzip
 BuildRequires:  xml-commons-apis
-%define	name		junit
-%define	version		3.8.2
-%define	release		4jpp
-%define	section		free
 Version:        3.8.2
-Release:        1
+Release:        0
 Summary:        Java Regression Test Package
 License:        IPL-1.0
-Url:            http://www.junit.org/
 Group:          Development/Libraries/Java
+Url:            http://www.junit.org/
 Source:         http://osdn.dl.sourceforge.net/junit/junit%{version}.zip
 Source1:        %{name}%{version}-build.xml
 BuildArch:      noarch
@@ -48,9 +47,8 @@ and hosted on SourceForge.
 
 
 %package manual
-License:        IPL-1.0
-Group:          Development/Libraries/Java
 Summary:        Manual for junit
+Group:          Development/Libraries/Java
 
 %description manual
 JUnit is a regression testing framework written by Erich Gamma and Kent
@@ -60,28 +58,9 @@ and hosted on SourceForge.
 
 This package contains the manual for JUnit.
 
-
-
-%package javadoc
-License:        IPL-1.0
-PreReq:         coreutils
-Group:          Development/Libraries/Java
-Summary:        Javadoc for junit
-
-%description javadoc
-JUnit is a regression testing framework written by Erich Gamma and Kent
-Beck. It is used by the developer who implements unit tests in Java.
-JUnit is Open Source Software, released under the IBM Public License
-and hosted on SourceForge.
-
-This package contains the javadoc documentation for JUnit.
-
-
-
 %package demo
-License:        IPL-1.0
-Group:          Development/Libraries/Java
 Summary:        Demonstration and sample files for junit
+Group:          Development/Libraries/Java
 Requires:       %{name} = %{version}-%{release}
 
 %description demo
@@ -109,10 +88,6 @@ ant dist
 install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
 install -m 644 %{name}%{version}/%{name}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
 (cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}*; do ln -sf ${jar} ${jar/-%{version}/}; done)
-# javadoc
-install -d -m 755 $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}
 # demo
 install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/%{name}
 cp -pr %{name}%{version}/%{name}/* $RPM_BUILD_ROOT%{_datadir}/%{name}
@@ -131,34 +106,8 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(0644,root,root,0755)
 %doc %{name}%{version}/doc/*
 
-%files javadoc
-%defattr(0644,root,root,0755)
-%{_javadocdir}/%{name}-%{version}
-%{_javadocdir}/%{name}
-
 %files demo
 %defattr(0644,root,root,0755)
 %{_datadir}/%{name}/*
 
 %changelog
-* Thu Sep 11 2008 mvyskocil@suse.cz
-- Use gcc-java for build
-- Update 3.8.2 (a new build.xml)
-- Removed a java14compat
-- Removed javadoc postin/postun
-- Add a cpl-v10.html
-* Fri Mar 30 2007 ro@suse.de
-- added unzip to buildreq
-* Tue Sep 26 2006 skh@suse.de
-- don't use icecream
-- use source="1.4" and target="1.4" for build with java 1.5
-* Wed Jan 25 2006 mls@suse.de
-- converted neededforbuild to BuildRequires
-* Thu Jul 28 2005 jsmeix@suse.de
-- Adjustments in the spec file.
-* Mon Jul 18 2005 jsmeix@suse.de
-- Current version 3.8.1 from JPackage.org
-* Thu Sep 16 2004 skh@suse.de
-- Fix prerequires of javadoc subpackage
-* Thu Sep 02 2004 skh@suse.de
-- Initial package created with version 3.8.1 (JPackage 1.5)

junit3.8.2-build.xml

@@ -55,16 +55,6 @@
 		     includes="junit/tests/runner/LoadedFromJar.class"
 		 /> 
 
-		<mkdir dir="${dist}/javadoc" />
-		<javadoc 
-			sourcepath="."
-			packagenames="junit.framework.*, junit.extensions.*"
-			destdir="${dist}/javadoc"
-			author="false"
-			version="false"
-			use="false"
-			windowtitle="JUnit API"
-		/>
 		<copy todir="${dist}/doc">
 			<fileset dir="doc"/>
 		</copy>