SPECS: junit.spec - update to 4.3.1 - using source package now (-d...

[glen]

Author: glen                         Date: Tue Apr 10 18:51:21 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- update to 4.3.1
- using source package now (-doc dropped)
- minimum java version is 1.5 to compile those sources
- java macros

---- Files affected:
SPECS:
   junit.spec (1.21 -> 1.22) 

---- Diffs:

================================================================
Index: SPECS/junit.spec
diff -u SPECS/junit.spec:1.21 SPECS/junit.spec:1.22
--- SPECS/junit.spec:1.21	Tue Feb 13 09:06:36 2007
+++ SPECS/junit.spec	Tue Apr 10 20:51:16 2007
@@ -1,16 +1,17 @@
 # $Revision$, $Date$
+%include	/usr/lib/rpm/macros.java
 Summary:	JUnit - regression testing framework
 Summary(pl.UTF-8):	JUnit - środowisko do testów regresji
 Name:		junit
-Version:	4.1
-Release:	2
+Version:	4.3.1
+Release:	1
 License:	IBM Common Public License v1.0
 Group:		Development/Languages/Java
-Source0:	http://dl.sourceforge.net/junit/%{name}%{version}.zip
-# Source0-md5:	e66d3e77c70b3297f2c6a12990fc3120
+Source0:	http://dl.sourceforge.net/junit/%{name}-%{version}-src.jar
+# Source0-md5:	170f9645a41398388e8553b32ff5f630
 URL:		http://www.junit.org/
 BuildRequires:	unzip
-Requires:	jdk >= 1.1
+Requires:	jdk >= 1.5
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -20,22 +21,12 @@
 %description -l pl.UTF-8
 JUnit - środowisko do testów regresji.
 
-%package doc
-Summary:	JUnit documentation
-Summary(pl.UTF-8):	Dokumentacja do pakietu JUnit
-Group:		Development/Languages/Java
-
-%description doc
-JUnit documentation.
-
-%description doc -l pl.UTF-8
-Dokumentacja do pakietu JUnit.
-
 %package javadoc
 Summary:	Javadoc documentation for JUnit
 Summary(pl.UTF-8):	Dokumentacja javadoc dla pakietu JUnit
 Group:		Development/Languages/Java
 Requires:	jpackage-utils
+Obsoletes:	junit-doc
 
 %description javadoc
 JUnit API documentation.
@@ -44,7 +35,14 @@
 Dokumentacja javadoc dla pakietu JUnit.
 
 %prep
-%setup -q -n %{name}%{version}
+%setup -qc
+install -d javadoc
+rm -f junit/runner/Version.java.template
+
+%build
+%javac $(find -name '*.java')
+%jar -cvf %{name}-%{version}.jar $(find -type f '!' -name '*.java')
+%javadoc -d javadoc $(find -name '*.java')
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -61,13 +59,8 @@
 
 %files
 %defattr(644,root,root,755)
-%doc README.html cpl-v10.html
 %{_javadir}/*.jar
 
-%files doc
-%defattr(644,root,root,755)
-%doc doc/* junit/*
-
 %files javadoc
 %defattr(644,root,root,755)
 %{_javadocdir}/%{name}-%{version}
@@ -78,6 +71,12 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.22  2007/04/10 18:51:16  glen
+- update to 4.3.1
+- using source package now (-doc dropped)
+- minimum java version is 1.5 to compile those sources
+- java macros
+
 Revision 1.21  2007/02/13 08:06:36  glen
 - tabs in preamble
 
@@ -96,7 +95,7 @@
 - separate javadoc documentation and put it in the %{_javadocdir}
 
 Revision 1.16  2006/03/11 17:13:02  pluto
-= updated to 3.8.2.
+- updated to 3.8.2.
 
 Revision 1.15  2004/12/14 15:45:02  baggins
 - DON'T hardoce paths!
@@ -127,7 +126,7 @@
 - R: jdk >= 1.1
 
 Revision 1.6  2002/04/25 16:40:08  arturs
-fixed a small typo
+- fixed a small typo
 
 Revision 1.5  2002/02/23 02:59:09  kloczek
 - adapterized.
@@ -137,10 +136,10 @@
   Group field using gettext).
 
 Revision 1.3  2002/01/18 02:13:27  kloczek
-perl -pi -e "s/pld-list\@pld.org.pl/feedback\@pld.org.pl/"
+- perl -pi -e "s/pld-list\@pld.org.pl/feedback\@pld.org.pl/"
 
 Revision 1.2  2001/11/30 11:38:57  qboosh
-- pl translations, cosmetics, removed %%_javalibdir from package
+- pl translations, cosmetics, removed %_javalibdir from package
 - don't gzip html doc
 
 Revision 1.1  2001/10/02 08:01:38  pascalek
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/junit.spec?r1=1.21&r2=1.22&f=u