pool/apache-commons-collections
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 349426 from Java:packages

Browse Source 
- 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/request/show/349426
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/apache-commons-collections?expand=0&rev=9
This commit is contained in:
Dominique Leuenberger 2015-12-21 11:04:51 +00:00 committed by Git OBS Bridge
commit 5f2cea0240
7 changed files with 76 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
apache-commons-collections.changes
View File

@ -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

16
apache-commons-collections.spec
View File

@ -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

32
commons-collections-3.2-build_xml.patch
View File

@ -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}"/>

3
commons-collections-3.2.1-src.tar.gz
View File

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

BIN
commons-collections-3.2.2-src.tar.gz (Stored with Git LFS) Normal file
View File

Binary file not shown.

18
commons-collections-missing-MF.patch Normal file
View File

@ -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

42
jakarta-commons-collections-javadoc-nonet.patch
View File

@ -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"