Cleanup spec file

apache-commons-io.spec

@@ -1,13 +1,14 @@
 Name:           apache-commons-io
-Version:        2.6
-Release:        1%{?dist}
 Epoch:          1
+Version:        2.6
+Release:        2%{?dist}
 Summary:        Utilities to assist with developing IO functionality
 License:        ASL 2.0
 URL:            http://commons.apache.org/io
-Source0:        http://archive.apache.org/dist/commons/io/source/commons-io-%{version}-src.tar.gz
 BuildArch:      noarch
 
+Source0:        http://archive.apache.org/dist/commons/io/source/commons-io-%{version}-src.tar.gz
+
 BuildRequires:  maven-local
 BuildRequires:  mvn(junit:junit)
 BuildRequires:  mvn(org.apache.commons:commons-parent:pom:)
@@ -18,11 +19,7 @@ Commons-IO contains utility classes, stream implementations,
 file filters, and endian classes. It is a library of utilities
 to assist with developing IO functionality.
 
-%package javadoc
-Summary:        API documentation for %{name}
-
-%description javadoc
-This package provides %{summary}.
+%{?javadoc_package}
 
 %prep
 %setup -q -n commons-io-%{version}-src
@@ -32,20 +29,21 @@ sed -i 's/\r//' *.txt
 %mvn_file  : commons-io %{name}
 %mvn_alias : org.apache.commons:
 
-# FIXME: tests skipped because commons-io is on surefire's classpath and causes
+# NOTE: tests *may* fail because commons-io is on surefire's classpath and causes
 # tests to be run against the system version and not the one we just built
-%mvn_build -f
+%mvn_build
 
 %install
 %mvn_install
 
 %files -f .mfiles
-%doc LICENSE.txt NOTICE.txt RELEASE-NOTES.txt
-
-%files javadoc -f .mfiles-javadoc
-%doc LICENSE.txt NOTICE.txt
+%license LICENSE.txt NOTICE.txt
+%doc RELEASE-NOTES.txt
 
 %changelog
+* Mon Jan 29 2018 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:2.6-2
+- Cleanup spec file
+
 * Sun Oct 22 2017 Michael Simacek <msimacek@redhat.com> - 1:2.6-1
 - Update to upstream version 2.6