- Version update to 3.2.2:

* Various bugfixes
  * Unix formating in the archive
  * Fixes bnc#954102
- Refresh patches for the dos2unix conversion:
  * commons-collections-3.2-build_xml.patch
  * jakarta-commons-collections-javadoc-nonet.patch
- Add patch to add missing MANIFEST.MF file:
  * commons-collections-missing-MF.patch

OBS-URL: https://build.opensuse.org/package/show/Java:packages/apache-commons-collections?expand=0&rev=15

apache-commons-collections.changes

@@ -1,3 +1,16 @@
+-------------------------------------------------------------------
+Thu Dec 17 18:24:36 UTC 2015 - tchvatal@suse.com
+
+- Version update to 3.2.2:
+  * Various bugfixes
+  * Unix formating in the archive
+  * Fixes bnc#954102
+- Refresh patches for the dos2unix conversion:
+  * commons-collections-3.2-build_xml.patch
+  * jakarta-commons-collections-javadoc-nonet.patch
+- Add patch to add missing MANIFEST.MF file:
+  * commons-collections-missing-MF.patch
+
 -------------------------------------------------------------------
 Wed Jul 29 10:46:22 UTC 2015 - tchvatal@suse.com
 

apache-commons-collections.spec

@@ -19,7 +19,7 @@
 %define base_name       collections
 %define short_name      commons-%{base_name}
 Name:           apache-commons-collections
-Version:        3.2.1
+Version:        3.2.2
 Release:        0
 Summary:        Commons Collections Package
 License:        Apache-2.0
@@ -31,10 +31,11 @@ Patch0:         jakarta-commons-collections-javadoc-nonet.patch
 Patch1:         commons-collections-3.2-build_xml.patch
 # PATCH-FIX-UPSTREAM build with jdk8
 Patch2:         java8-compat.patch
+# PATCH-FIX-UPSTREAM add missing MANIFEST.MF file
+Patch3:         commons-collections-missing-MF.patch
 BuildRequires:  ant
 BuildRequires:  ant-junit
 BuildRequires:  apache-commons-parent
-BuildRequires:  dos2unix
 BuildRequires:  java-devel
 BuildRequires:  javapackages-tools
 BuildRequires:  junit
@@ -94,15 +95,8 @@ find . -name "*.class" -exec rm -f {} \;
 
 %patch0 -p1
 %patch1
-find . -name "*.java" |xargs dos2unix
 %patch2 -p1
-
+%patch3 -p1
-# Fix file eof
-sed -i 's/\r//' LICENSE.txt
-sed -i 's/\r//' PROPOSAL.html
-sed -i 's/\r//' RELEASE-NOTES.html
-sed -i 's/\r//' README.txt
-sed -i 's/\r//' NOTICE.txt
 
 # Substitute version into testframework pom
 cp -p %{SOURCE1} pom-testframework.xml
@@ -143,7 +137,7 @@ cp -pr build/docs/testframework/* %{buildroot}%{_javadocdir}/%{name}-testframewo
 
 %files
 %defattr(0644,root,root,0755)
-%doc PROPOSAL.html README.txt LICENSE.txt RELEASE-NOTES.html NOTICE.txt
+%doc PROPOSAL.html README.txt LICENSE.txt RELEASE-NOTES.txt NOTICE.txt
 %{_javadir}/%{name}.jar
 %{_javadir}/%{short_name}.jar
 %{_mavenpomdir}/JPP-%{short_name}.pom

commons-collections-3.2.1-src.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:9a4a800cb7ecdaf3b6f608cd608682b88b506f1b1c4b727d15471ae3329fc63d
-size 609930

commons-collections-missing-MF.patch

@@ -0,0 +1,18 @@
+Index: commons-collections-3.2.2-src/src/conf/MANIFEST.MF
+===================================================================
+--- /dev/null
++++ commons-collections-3.2.2-src/src/conf/MANIFEST.MF
+@@ -0,0 +1,12 @@
++Manifest-Version: 1.0
++Package: org.apache.commons.collections
++Extension-Name: commons-collections
++Specification-Version: @version@
++Specification-Vendor: Apache Software Foundation
++Specification-Title: Commons Collections
++Implementation-Version: @version@
++Implementation-Vendor: Apache Software Foundation
++Implementation-Title: Commons Collections
++Implementation-Vendor-Id: org.apache
++X-Compile-Source-JDK: 1.2
++X-Compile-Target-JDK: 1.2
+\ No newline at end of file