SPECS: jakarta-commons-cli.spec - tests need junit - compile with ...

glen glen at pld-linux.org
Thu Nov 29 00:53:02 CET 2007


Author: glen                         Date: Wed Nov 28 23:53:02 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- tests need junit
- compile with target 1.5

---- Files affected:
SPECS:
   jakarta-commons-cli.spec (1.11 -> 1.12) 

---- Diffs:

================================================================
Index: SPECS/jakarta-commons-cli.spec
diff -u SPECS/jakarta-commons-cli.spec:1.11 SPECS/jakarta-commons-cli.spec:1.12
--- SPECS/jakarta-commons-cli.spec:1.11	Sun Nov 25 23:41:30 2007
+++ SPECS/jakarta-commons-cli.spec	Thu Nov 29 00:52:56 2007
@@ -1,21 +1,27 @@
 # $Revision$, $Date$
+#
+# Conditional build:
+%bcond_without	tests		# don't run tests
+#
 %include	/usr/lib/rpm/macros.java
 Summary:	Jakarta Commons CLI - API for working with command line
 Summary(pl.UTF-8):	Jakarta Commons CLI - API do pracy z linią poleceń
 Name:		jakarta-commons-cli
 Version:	1.1
-Release:	1
+Release:	2
 License:	Apache v1.1
 Group:		Development/Languages/Java
 Source0:	http://www.apache.org/dist/commons/cli/source/commons-cli-%{version}-src.tar.gz
 # Source0-md5:	ccc1aa194132e2387557bbb7f65391f4
 URL:		http://jakarta.apache.org/commons/cli/
+Patch0:		%{name}-target.patch
 BuildRequires:	ant
 BuildRequires:	jakarta-commons-lang
 BuildRequires:	jakarta-commons-logging
 BuildRequires:	jaxp_parser_impl
 BuildRequires:	jdk >= 1.4
 BuildRequires:	jpackage-utils
+%{?with_tests:BuildRequires:	junit}
 BuildRequires:	rpm-javaprov
 BuildRequires:	rpmbuild(macros) >= 1.300
 Requires:	jre >= 1.4
@@ -45,6 +51,7 @@
 
 %prep
 %setup -q -n commons-cli-%{version}-src
+%patch0 -p1
 
 %build
 required_jars="commons-lang"
@@ -85,6 +92,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.12  2007-11-28 23:52:56  glen
+- tests need junit
+- compile with target 1.5
+
 Revision 1.11  2007-11-25 22:41:30  glen
 - update to 1.1
 
@@ -101,7 +112,7 @@
 - fix build; rel 2
 
 Revision 1.6  2006/07/05 06:43:24  czarny
- - common-lang.jar bulid fix
+- common-lang.jar build fix
 
 Revision 1.5  2006/05/19 11:28:19  jajcus
 - s/jakarta-ant/ant/ in BR
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/jakarta-commons-cli.spec?r1=1.11&r2=1.12&f=u



More information about the pld-cvs-commit mailing list