packages: java-commons-net/java-commons-net.spec - disable tests in sane way

[glen]

Author: glen                         Date: Mon Sep 21 11:25:05 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- disable tests in sane way

---- Files affected:
packages/java-commons-net:
   java-commons-net.spec (1.27 -> 1.28) 

---- Diffs:

================================================================
Index: packages/java-commons-net/java-commons-net.spec
diff -u packages/java-commons-net/java-commons-net.spec:1.27 packages/java-commons-net/java-commons-net.spec:1.28
--- packages/java-commons-net/java-commons-net.spec:1.27	Sun Sep 20 18:24:50 2009
+++ packages/java-commons-net/java-commons-net.spec	Mon Sep 21 13:24:59 2009
@@ -2,10 +2,8 @@
 # NOTE:
 # - ftp timezone test is broken. It depends on file timestamps on some remote
 #   ftp machine. But these files have changed since this test was written!!!
-#   If you want to perform tests and you now what are you doing, uncomment the
-#   following line:
-#%%bcond_without	tests		# These tests are broken!
 
+%bcond_with		tests		# tests are broken. see note above.
 %bcond_without	javadoc		# don't build javadoc
 
 %if "%{pld_release}" == "ti"
@@ -14,9 +12,8 @@
 %bcond_with    java_sun        # build with java-sun
 %endif
 
-%include        /usr/lib/rpm/macros.java
-
-%define		srcname		commons-net
+%include	/usr/lib/rpm/macros.java
+%define		srcname	commons-net
 Summary:	Commons Net - utility functions and components
 Summary(pl.UTF-8):	Commons Net - funkcje i komponenty narzędziowe
 Name:		java-commons-net
@@ -26,13 +23,13 @@
 Group:		Libraries/Java
 Source0:	http://www.apache.org/dist/commons/net/source/commons-net-%{version}-src.tar.gz
 # Source0-md5:	583630202369df3cf996cbdba4d8634b
-Source1:	java-commons-net-build.xml
+Source1:	%{name}-build.xml
 URL:		http://commons.apache.org/net/
 BuildRequires:	ant
 %{?with_tests:BuildRequires:	ant-junit}
-BuildRequires:	jakarta-oro >= 2.0.8
 %{!?with_java_sun:BuildRequires:	java-gcj-compat-devel}
 %{!?with_java_sun:BuildRequires:	java-gnu-classpath}
+BuildRequires:	java-oro >= 2.0.8
 %{?with_java_sun:BuildRequires:	java-sun}
 BuildRequires:	jpackage-utils
 %{?with_tests:BuildRequires:	junit}
@@ -144,6 +141,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.28  2009/09/21 11:24:59  glen
+- disable tests in sane way
+
 Revision 1.27  2009/09/20 16:24:50  pawelz
 - disable tests. They use network AND thay are broken.
   See "NOTE" in spec file for more details.
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/java-commons-net/java-commons-net.spec?r1=1.27&r2=1.28&f=u