diff --git a/apache-commons-collections.spec b/apache-commons-collections.spec
index 52c02ae..a279daf 100644
--- a/apache-commons-collections.spec
+++ b/apache-commons-collections.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package apache-commons-collections
 #
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -12,7 +12,7 @@
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.
 
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
 #
 
 
@@ -24,7 +24,7 @@ Release:        0
 Summary:        Commons Collections Package
 License:        Apache-2.0
 Group:          Development/Libraries/Java
-Url:            http://commons.apache.org/commons-collections/
+URL:            http://commons.apache.org/commons-collections/
 Source0:        http://www.apache.org/dist/commons/%{base_name}/source/%{short_name}-%{version}-src.tar.gz
 Source1:        commons-collections-testframework.pom
 Patch0:         jakarta-commons-collections-javadoc-nonet.patch
@@ -41,13 +41,11 @@ BuildRequires:  apache-commons-parent
 BuildRequires:  fdupes
 BuildRequires:  java-devel >= 1.8
 BuildRequires:  javapackages-local
-BuildRequires:  javapackages-tools
 BuildRequires:  junit
 Provides:       %{short_name} = %{version}-%{release}
-Obsoletes:      %{short_name} = 3.2
+Obsoletes:      %{short_name} < %{version}-%{release}
 Provides:       jakarta-%{short_name} = %{version}-%{release}
-Obsoletes:      jakarta-%{short_name} = 3.2
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+Obsoletes:      jakarta-%{short_name} < %{version}-%{release}
 BuildArch:      noarch
 
 %description
@@ -80,22 +78,19 @@ Requires:       %{name} = %{version}-%{release}
 %package javadoc
 Summary:        Javadoc for %{name}
 Group:          Development/Libraries/Java
+Provides:       %{name}-testframework-javadoc = %{version}-%{release}
+Obsoletes:      %{name}-testframework-javadoc < %{version}-%{release}
 
 %description javadoc
 %{summary}.
 
-%package testframework-javadoc
-Summary:        Javadoc for %{name} testframework
-Group:          Development/Libraries/Java
-
-%description testframework-javadoc
-%{summary}.
-
 %prep
 %setup -q -n %{short_name}-%{version}-src
 # remove all binary libs
-find . -name "*.jar" -exec rm -f {} \;
-find . -name "*.class" -exec rm -f {} \;
+find . -name "*.jar" -delete
+find . -name "*.class" -delete
+# Fix file eof
+sed -i 's/\r//' LICENSE.txt PROPOSAL.html README.txt NOTICE.txt
 
 %patch0 -p1
 %patch1
@@ -112,7 +107,7 @@ sed -i 's/@VERSION@/%{version}/' pom-testframework.xml
 echo "junit.jar=$(build-classpath junit)" >>build.properties
 ant \
     -Dant.build.javac.source=8 -Dant.build.javac.target=8 \
-    -Dant.build.javadoc.source=8 \
+    -Dant.build.javadoc.source=8 -Dtf.build.docs=build/docs/apidocs/ \
     -Djava.io.tmpdir=. jar javadoc tf.validate tf.jar dist.bin dist.src tf.javadoc
 
 %install
@@ -133,38 +128,16 @@ install -d -m 755 %{buildroot}%{_javadocdir}/%{name}
 cp -pr build/docs/apidocs/* %{buildroot}%{_javadocdir}/%{name}
 %fdupes -s %{buildroot}%{_javadocdir}/%{name}
 
-# testframework-javadoc
-install -d -m 755 %{buildroot}%{_javadocdir}/%{name}-testframework
-cp -pr build/docs/testframework/* %{buildroot}%{_javadocdir}/%{name}-testframework
-%fdupes -s %{buildroot}%{_javadocdir}/%{name}-testframework
-
-%files
-%defattr(0644,root,root,0755)
-%doc PROPOSAL.html README.txt LICENSE.txt RELEASE-NOTES.txt NOTICE.txt
+%files -f .mfiles
+%license LICENSE.txt NOTICE.txt
+%doc PROPOSAL.html README.txt RELEASE-NOTES.txt
 %{_javadir}/%{name}.jar
-%{_javadir}/%{short_name}.jar
-%{_mavenpomdir}/JPP-%{short_name}.pom
-%{_datadir}/maven-metadata/%{name}.xml
 
-%files testframework
-%defattr(0644,root,root,0755)
+%files testframework -f .mfiles-testframework
 %{_javadir}/%{name}-testframework.jar
-%{_javadir}/%{short_name}-testframework.jar
-%{_mavenpomdir}/JPP-%{short_name}-testframework.pom
-%if %{defined _maven_repository}
-%config(noreplace) %{_mavendepmapfragdir}/%{name}-testframework
-%else
-%{_datadir}/maven-metadata/%{name}-testframework.xml
-%endif
 
 %files javadoc
-%defattr(0644,root,root,0755)
-%doc LICENSE.txt NOTICE.txt
+%license LICENSE.txt NOTICE.txt
 %{_javadocdir}/%{name}
 
-%files testframework-javadoc
-%defattr(0644,root,root,0755)
-%doc LICENSE.txt NOTICE.txt
-%{_javadocdir}/%{name}-testframework
-
 %changelog