From bd718e5aa9b04bcc4378d0838cbc528c77082c4c20e503baba761f094181d490 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= <tchvatal@suse.com>
Date: Thu, 17 Dec 2015 18:26:09 +0000
Subject: [PATCH] - 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            | 13 ++++++
 apache-commons-collections.spec               | 16 +++----
 commons-collections-3.2-build_xml.patch       | 32 +++++++-------
 commons-collections-3.2.1-src.tar.gz          |  3 --
 commons-collections-3.2.2-src.tar.gz          |  3 ++
 commons-collections-missing-MF.patch          | 18 ++++++++
 ...ta-commons-collections-javadoc-nonet.patch | 42 +++++++++----------
 7 files changed, 76 insertions(+), 51 deletions(-)
 delete mode 100644 commons-collections-3.2.1-src.tar.gz
 create mode 100644 commons-collections-3.2.2-src.tar.gz
 create mode 100644 commons-collections-missing-MF.patch

diff --git a/apache-commons-collections.changes b/apache-commons-collections.changes
index 7f6983f..d9e1485 100644
--- a/apache-commons-collections.changes
+++ b/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
 
diff --git a/apache-commons-collections.spec b/apache-commons-collections.spec
index f57be6b..66c0c76 100644
--- a/apache-commons-collections.spec
+++ b/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
-
-# 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
+%patch3 -p1
 
 # 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
diff --git a/commons-collections-3.2-build_xml.patch b/commons-collections-3.2-build_xml.patch
index e8b2f64..41357ec 100644
--- a/commons-collections-3.2-build_xml.patch
+++ b/commons-collections-3.2-build_xml.patch
@@ -1,20 +1,20 @@
 --- build.xml.orig	2008-11-29 21:16:01.000000000 +0200
 +++ build.xml	2008-11-29 21:17:28.000000000 +0200
 @@ -286,7 +286,7 @@
-   <!-- Runs all tests -->
-   <target name="-test-all" depends="compile.tests" unless="testcase">
-     <mkdir dir="${build.test.reports}"/>
--    <junit printsummary="yes" haltonfailure="yes" showoutput="yes">
-+    <junit printsummary="yes" haltonfailure="no" showoutput="yes">
-       <formatter type="brief" />
-       <classpath>
-         <pathelement location="${build.classes}"/>
+   <!-- Runs all tests -->
+   <target name="-test-all" depends="compile.tests" unless="testcase">
+     <mkdir dir="${build.test.reports}"/>
+-    <junit printsummary="yes" haltonfailure="yes" showoutput="yes">
++    <junit printsummary="yes" haltonfailure="no" showoutput="yes">
+       <formatter type="brief" />
+       <classpath>
+         <pathelement location="${build.classes}"/>
 @@ -331,7 +331,7 @@
-   <target name="testjar"  depends="compile.tests,jar"
-           description="Run all unit test cases">
-     <echo message="Running collections tests against built jar ..."/>
--    <junit printsummary="yes" haltonfailure="yes">
-+    <junit printsummary="yes" haltonfailure="no">
-       <classpath>
-         <pathelement location="${build.jar.name}"/>
-         <pathelement location="${build.tests}"/>
+   <target name="testjar"  depends="compile.tests,jar"
+           description="Run all unit test cases">
+     <echo message="Running collections tests against built jar ..."/>
+-    <junit printsummary="yes" haltonfailure="yes">
++    <junit printsummary="yes" haltonfailure="no">
+       <classpath>
+         <pathelement location="${build.jar.name}"/>
+         <pathelement location="${build.tests}"/>
diff --git a/commons-collections-3.2.1-src.tar.gz b/commons-collections-3.2.1-src.tar.gz
deleted file mode 100644
index 8291250..0000000
--- a/commons-collections-3.2.1-src.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:9a4a800cb7ecdaf3b6f608cd608682b88b506f1b1c4b727d15471ae3329fc63d
-size 609930
diff --git a/commons-collections-3.2.2-src.tar.gz b/commons-collections-3.2.2-src.tar.gz
new file mode 100644
index 0000000..97e6f83
--- /dev/null
+++ b/commons-collections-3.2.2-src.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:070d94fe77969d8949bd129a618e6a7bee6b83b5b5db3ef3f983395a5428b914
+size 630693
diff --git a/commons-collections-missing-MF.patch b/commons-collections-missing-MF.patch
new file mode 100644
index 0000000..d13310d
--- /dev/null
+++ b/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
diff --git a/jakarta-commons-collections-javadoc-nonet.patch b/jakarta-commons-collections-javadoc-nonet.patch
index 05ab85b..92a8bf4 100644
--- a/jakarta-commons-collections-javadoc-nonet.patch
+++ b/jakarta-commons-collections-javadoc-nonet.patch
@@ -1,26 +1,26 @@
 --- commons-collections-3.1/build.xml~	2004-06-23 00:17:14.000000000 +0100
 +++ commons-collections-3.1/build.xml	2005-05-04 13:58:44.000000000 +0100
 @@ -80,7 +80,6 @@
- 
-   <!-- Javadoc -->
-   <property name="javadoc.access"          value="protected"/>
--  <property name="javadoc.links"           value="http://java.sun.com/j2se/1.3/docs/api/"/>
- 
-   <!-- JUnit -->
-   <property name="test.failonerror"        value="true"/>
+
+   <!-- Javadoc -->
+   <property name="javadoc.access"          value="protected"/>
+-  <property name="javadoc.links"           value="http://java.sun.com/j2se/1.3/docs/api/"/>
+ 
+   <!-- JUnit -->
+   <property name="test.failonerror"        value="true"/>
 @@ -362,7 +361,6 @@
-                  author="true"
-                 version="true"
-                     use="true"
--                   link="${javadoc.links}"
-                overview="${source.java}/org/apache/commons/collections/overview.html"
-                doctitle="${component.title} ${component.version} API;"
-             windowtitle="${component.title} ${component.version} API"
+                  author="true"
+                 version="true"
+                     use="true"
+-                   link="${javadoc.links}"
+                overview="${source.java}/org/apache/commons/collections/overview.html"
+                doctitle="${component.title} ${component.version} API;"
+             windowtitle="${component.title} ${component.version} API"
 @@ -470,7 +468,6 @@
-                  access="protected"
-                  author="false"
-                 version="false"
--                   link="${javadoc.links}"
-                overview="${source.test}/org/apache/commons/collections/overview.html"
-                doctitle="${tf.title} ${tf.version} API;"
-             windowtitle="${tf.title} ${tf.version} API"
+                  access="protected"
+                  author="false"
+                 version="false"
+-                   link="${javadoc.links}"
+                overview="${source.test}/org/apache/commons/collections/overview.html"
+                doctitle="${tf.title} ${tf.version} API;"
+             windowtitle="${tf.title} ${tf.version} API"