[apache-commons-net/f19] Enable tests

Michal Srb msrb at fedoraproject.org
Wed Jun 5 12:27:18 UTC 2013


commit 9b69a7f334bf61a1c36b1cba026d2ec613ee0ddd
Author: Michal Srb <msrb at redhat.com>
Date:   Wed Jun 5 14:16:58 2013 +0200

    Enable tests
    
    - Install README, RELEASE-NOTES.txt files
    - Fix BR

 apache-commons-net.spec |   26 ++++++++++++++------------
 1 files changed, 14 insertions(+), 12 deletions(-)
---
diff --git a/apache-commons-net.spec b/apache-commons-net.spec
index 124acd8..bef9468 100644
--- a/apache-commons-net.spec
+++ b/apache-commons-net.spec
@@ -4,7 +4,7 @@
 
 Name:           apache-%{short_name}
 Version:        3.2
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Internet protocol suite Java library
 License:        ASL 2.0
 Group:          Development/Libraries
@@ -13,13 +13,10 @@ Source0:        http://www.apache.org/dist/commons/%{base_name}/source/%{short_n
 BuildArch:      noarch
 
 BuildRequires:  maven-local
-BuildRequires:  java-devel
-BuildRequires:  jpackage-utils
-BuildRequires:  maven-doxia-sitetools
-BuildRequires:  maven-surefire-provider-junit
-BuildRequires:  maven-surefire-provider-junit4
 BuildRequires:  maven-plugin-build-helper
 BuildRequires:  apache-commons-parent
+# Test dependency
+BuildRequires:  junit
 
 Provides:       jakarta-%{short_name} = 0:%{version}-%{release}
 Obsoletes:      jakarta-%{short_name} < 0:2.0-3
@@ -45,28 +42,33 @@ Obsoletes:  jakarta-%{short_name}-javadoc < 0:2.0-3
 
 %prep
 %setup -q -n %{short_name}-%{version}-src
-sed -i 's/\r//' NOTICE.txt LICENSE.txt
+sed -i 's/\r//' NOTICE.txt LICENSE.txt README RELEASE-NOTES.txt
 
+# This test fails with "Connection timed out"
+rm src/test/java/org/apache/commons/net/time/TimeTCPClientTest.java
 
-%build
 %mvn_file  : %{short_name} %{name}
 %mvn_alias : org.apache.commons:%{short_name}
-# test.failure.ignore added because package would not build on koji
-# with TimeTCPClientTest failing
-%mvn_build -f
 
+%build
+%mvn_build
 
 %install
 %mvn_install
 
 
 %files -f .mfiles
-%doc LICENSE.txt NOTICE.txt
+%doc LICENSE.txt NOTICE.txt README RELEASE-NOTES.txt
 
 %files javadoc -f .mfiles-javadoc
 %doc LICENSE.txt NOTICE.txt
 
 %changelog
+* Wed Jun 05 2013 Michal Srb <msrb at redhat.com> - 3.2-5
+- Enable tests
+- Install README, RELEASE-NOTES.txt files
+- Fix BR
+
 * Wed Feb 13 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.2-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
 


More information about the scm-commits mailing list