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

2008-09-13 02:22:23 +00:00 · 2008-09-13 02:22:23 +00:00 · 6a311b28ae
commit 6a311b28ae
parent 637bab8975
6 changed files with 175 additions and 45 deletions
--- a/junit-java14compat.patch
+++ b/junit-java14compat.patch
@ -1,12 +0,0 @@
-diff -Naur ../cleanroom.orig/build.xml ./build.xml
--- ../cleanroom.orig/build.xml	2006-09-26 15:13:51.000000000 +0200
-+++ ./build.xml	2006-09-26 15:14:12.000000000 +0200
-@@ -25,6 +25,8 @@
- 			srcdir="."
- 			destdir="."
- 			debug="on"
-+			source="1.4"
-+			target="1.4"
-   		/>	
- 	</target>
- 
--- a/junit.changes
+++ b/junit.changes
@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Thu Sep 11 16:14:37 CEST 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 01:45:59 CEST 2007 - ro@suse.de

--- a/junit.spec
+++ b/junit.spec
@ -1,31 +1,42 @@
 #
-# spec file for package junit (Version 3.8.1)
+# spec file for package junit (Version 3.8.2)
 #
-# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
-# This file and all modifications and additions to the pristine
-# package are under the same license as the package itself.
+# Copyright (c) 2008 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
+# upon. The license for this file, and modifications and additions to the
+# file, is the same license as for the pristine package itself (unless the
+# license for the pristine package is not an Open Source License, in which
+# case the license is the MIT License). An "Open Source License" is a
+# license that conforms to the Open Source Definition (Version 1.9)
+# published by the Open Source Initiative.
+
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #

 # norootforbuild
 # icecream 0

+
 Name:           junit
-BuildRequires:  ant java2-devel-packages unzip xml-commons-apis
+BuildRequires:  ant
+BuildRequires:  java-1_5_0-gcj-compat-devel
+BuildRequires:  unzip
+BuildRequires:  xml-commons-apis
 %define	name		junit
-%define	version		3.8.1
+%define	version		3.8.2
 %define	release		4jpp
 %define	section		free
-Version:        3.8.1
-Release:        58
+Version:        3.8.2
+Release:        1
 Summary:        Java Regression Test Package
 License:        IBM Public License
-URL:            http://www.junit.org/
+Url:            http://www.junit.org/
 Group:          Development/Libraries/Java
-Source:         http://osdn.dl.sourceforge.net/junit/junit3.8.1.zip
-Patch:          %{name}-java14compat.patch
-Buildarch:	noarch
+Source:         http://osdn.dl.sourceforge.net/junit/junit%{version}.zip
+Source1:        %{name}%{version}-build.xml
+BuildArch:      noarch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build

 %description
@ -37,6 +48,7 @@ and hosted on SourceForge.


 %package manual
+License:        IBM Public License
 Group:          Development/Libraries/Java
 Summary:        Manual for junit

@ -51,6 +63,7 @@ This package contains the manual for JUnit.


 %package javadoc
+License:        IBM Public License
 PreReq:         coreutils
 Group:          Development/Libraries/Java
 Summary:        Javadoc for junit
@ -66,6 +79,7 @@ This package contains the javadoc documentation for JUnit.


 %package demo
+License:        IBM Public License
 Group:          Development/Libraries/Java
 Summary:        Demonstration and sample files for junit
 Requires:       %{name} = %{version}-%{release}
@ -81,10 +95,11 @@ This package contains demonstration and sample files for JUnit.


 %prep
-%setup -n %{name}%{version}
+%setup -q -n %{name}%{version}
 # extract sources
 jar xvf src.jar
-%patch
+# % patch
+cp %{SOURCE1} build.xml

 %build
 ant dist
@ -97,6 +112,7 @@ install -m 644 %{name}%{version}/%{name}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-
 # 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}
@ -104,18 +120,10 @@ cp -pr %{name}%{version}/%{name}/* $RPM_BUILD_ROOT%{_datadir}/%{name}
 %clean
 rm -rf $RPM_BUILD_ROOT

-%post javadoc
-rm -f %{_javadocdir}/%{name}
-ln -s %{name}-%{version} %{_javadocdir}/%{name}
-
-%postun javadoc
-if [ "$1" = "0" ]; then
-    rm -f %{_javadocdir}/%{name}
-fi
-
 %files
 %defattr(0644,root,root,0755)
 %doc README.html
+%doc cpl-v10.html
 %{_javadir}/*
 %dir %{_datadir}/%{name}

@ -126,24 +134,31 @@ fi
 %files javadoc
 %defattr(0644,root,root,0755)
 %{_javadocdir}/%{name}-%{version}
+%{_javadocdir}/%{name}

 %files demo
 %defattr(0644,root,root,0755)
 %{_datadir}/%{name}/*

 %changelog
-* Fri Mar 30 2007 - ro@suse.de
+* 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
+* 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
+* Wed Jan 25 2006 mls@suse.de
 - converted neededforbuild to BuildRequires
-* Thu Jul 28 2005 - jsmeix@suse.de
+* Thu Jul 28 2005 jsmeix@suse.de
 - Adjustments in the spec file.
-* Mon Jul 18 2005 - jsmeix@suse.de
+* Mon Jul 18 2005 jsmeix@suse.de
 - Current version 3.8.1 from JPackage.org
-* Thu Sep 16 2004 - skh@suse.de
+* Thu Sep 16 2004 skh@suse.de
 - Fix prerequires of javadoc subpackage
-* Thu Sep 02 2004 - skh@suse.de
+* Thu Sep 02 2004 skh@suse.de
 - Initial package created with version 3.8.1 (JPackage 1.5)
--- a/junit3.8.1.zip
+++ b/junit3.8.1.zip
@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:884953028bc3d2d554f99b5f627a84d7f92a42754560c63829b0ab732ff9bab8
-size 441665
--- a/junit3.8.2-build.xml
+++ b/junit3.8.2-build.xml
@ -0,0 +1,118 @@
+<!-- JUnit build script using ant 1.4 -->
+<project name="junit" default="dist" basedir=".">
+	<property file="${user.home}/.junit.properties" />
+	<property name="build.compiler" value="classic" />
+	<property name="version" value="3.8.2" />
+	<property name="dist"  value="junit${version}" />
+	<property name="versionfile"  value="junit/runner/Version.java" />
+	<property name="zipfile"  value="${dist}.zip" />
+	<target name="init">
+		<tstamp/>
+	</target>
+
+	<target name="versiontag" depends="init">
+		<filter token="version" value="${version}" />
+		<copy 
+			file="${versionfile}" 
+			tofile="${versionfile}tmp" 
+			filtering="on"
+		/>
+		<move file="${versionfile}tmp" tofile="${versionfile}" />
+	</target>
+
+	<target name="build" depends="versiontag">
+		<javac 
+			srcdir="."
+			destdir="."
+			debug="on"
+  		/>	
+	</target>
+
+	<target name="dist" depends="build">
+		<delete dir="${dist}" />
+		<mkdir dir="${dist}" />
+		<jar 
+			jarfile="${dist}/src.jar"
+			basedir="."
+			excludes="**/*.jar, junit/tests/**, junit/samples/**, **/*.class, doc/**, README.html, .classpath, .project, cpl-v10.html"
+		/>
+		<jar 
+			jarfile="${dist}/junit.jar"
+			basedir="."
+			excludes="**/*.jar, junit/tests/**, junit/samples/**, **/*.java, doc/**, README.html,  build.xml, jar-manifest.txt, .classpath, .project, cpl-v10.html"
+		/>
+		<copy todir="${dist}/junit/samples">
+			<fileset dir="junit/samples" />
+		</copy>
+		<copy todir="${dist}/junit/tests">
+			<fileset dir="junit/tests" />
+		</copy>
+
+
+		<delete file="${dist}/junit/tests/runner/test.jar"/> 
+		<jar jarfile="${dist}/junit/tests/runner/test.jar" 
+	 	     basedir="." 
+		     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>		
+		<copy file="README.html" tofile="${dist}/README.html" />
+		<copy file="cpl-v10.html" tofile="${dist}/cpl-v10.html" />
+		
+		<java classname="junit.textui.TestRunner" fork="yes">
+			<arg value="junit.samples.AllTests" />
+			<classpath>
+				<pathelement location="${dist}" />
+				<pathelement location="${dist}/junit.jar" />
+			</classpath>
+		</java>
+	</target>
+	
+	<target name="zip" depends="dist">
+		<zip 
+			zipfile="${zipfile}"
+			basedir="."
+			includes="${dist}/**"
+		/>
+	</target>
+	
+	<target name="awtui" depends="dist">
+		<java classname="junit.awtui.TestRunner" fork="yes">
+			<arg value="junit.samples.AllTests" />
+			<classpath>
+				<pathelement location="${dist}" />
+				<pathelement location="${dist}/junit.jar" />
+			</classpath>
+		</java>
+	</target>
+	
+	<target name="swingui" depends="dist">
+		<java classname="junit.swingui.TestRunner" fork="yes">
+			<arg value="junit.samples.AllTests" />
+			<classpath>
+				<pathelement location="${dist}" />
+				<pathelement location="${dist}/junit.jar" />
+			</classpath>
+		</java>
+	</target>
+
+	<target name="clean">
+		<delete dir="${dist}" quiet="true"/>			
+		<delete file="${zipfile}" quiet="true"/> 
+		<delete>
+			<fileset dir="${basedir}" includes="**/*.class" /> 
+		</delete>
+	</target>
+</project>
--- a/junit3.8.2.zip
+++ b/junit3.8.2.zip
@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:aae23d20e6f4dc45b4bf0b10fedcbd209c100342a0cafce1aa07d2da6da1f24a
+size 461426