packages: java-jargs/java-jargs.spec - fix deps, add tests bcond

[glen]

Author: glen                         Date: Fri Jul  8 15:56:05 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- fix deps, add tests bcond

---- Files affected:
packages/java-jargs:
   java-jargs.spec (1.4 -> 1.5) 

---- Diffs:

================================================================
Index: packages/java-jargs/java-jargs.spec
diff -u packages/java-jargs/java-jargs.spec:1.4 packages/java-jargs/java-jargs.spec:1.5
--- packages/java-jargs/java-jargs.spec:1.4	Tue May  4 00:04:04 2010
+++ packages/java-jargs/java-jargs.spec	Fri Jul  8 17:56:00 2011
@@ -1,12 +1,14 @@
 # $Revision$, $Date$
+# TODO
+# - make without tests not to depend on junit (compile target is stupid)
 #
 # Conditional build:
 %bcond_without	javadoc		# don't build javadoc
 %bcond_without	source		# don't build source jar
-
-%include	/usr/lib/rpm/macros.java
+%bcond_without	tests		# don't build and run tests
 
 %define		srcname		jargs
+%include	/usr/lib/rpm/macros.java
 Summary:	Java command line option parsing suite
 Summary(pl.UTF-8):	Biblioteka do analizy argumentów wiersza poleceń dla Javy
 Name:		java-jargs
@@ -20,6 +22,7 @@
 BuildRequires:	ant
 BuildRequires:	jpackage-utils
 BuildRequires:	rpm-javaprov
+BuildRequires:	java-junit
 BuildRequires:	rpmbuild(macros) >= 1.555
 BuildRequires:	sed >= 4.0
 Requires:	jpackage-utils
@@ -65,7 +68,7 @@
 rm -rf docs/api
 
 %build
-%ant
+%ant runtimejar %{?with_javadoc:javadoc} %{?with_tests:test}
 
 %if %{with source}
 %jar cf %{srcname}.src.jar -C src .
@@ -87,8 +90,10 @@
 %endif
 
 # source
+%if %{with source}
 install -d $RPM_BUILD_ROOT%{_javasrcdir}
 cp -a %{srcname}.src.jar $RPM_BUILD_ROOT%{_javasrcdir}/%{srcname}.src.jar
+%endif
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -120,6 +125,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.5  2011/07/08 15:56:00  glen
+- fix deps, add tests bcond
+
 Revision 1.4  2010/05/03 22:04:04  pawelz
 - rel 1
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/java-jargs/java-jargs.spec?r1=1.4&r2=1.5&f=u