Hello community,
here is the log from the commit of package apache-commons-collections for
openSUSE:Factory checked in at 2014-07-16 16:49:24
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/apache-commons-collections (Old)
and /work/SRC/openSUSE:Factory/.apache-commons-collections.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "apache-commons-collections"
Changes:
--------
---
/work/SRC/openSUSE:Factory/apache-commons-collections/apache-commons-collections.changes
2014-05-16 18:02:49.000000000 +0200
+++
/work/SRC/openSUSE:Factory/.apache-commons-collections.new/apache-commons-collections.changes
2014-07-16 16:49:32.000000000 +0200
@@ -1,0 +2,5 @@
+Mon Jul 7 14:48:57 UTC 2014 - [email protected]
+
+- Do not depend on junit4 but use junit
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ apache-commons-collections.spec ++++++
--- /var/tmp/diff_new_pack.tjW4tu/_old 2014-07-16 16:49:33.000000000 +0200
+++ /var/tmp/diff_new_pack.tjW4tu/_new 2014-07-16 16:49:33.000000000 +0200
@@ -14,12 +14,10 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
-# icecream 0
%define base_name collections
%define short_name commons-%{base_name}
-
Name: apache-commons-collections
Version: 3.2.1
Release: 0
@@ -31,24 +29,18 @@
Source1: commons-collections-testframework.pom
Patch0: jakarta-commons-collections-javadoc-nonet.patch
Patch1: commons-collections-3.2-build_xml.patch
-
BuildRequires: ant
BuildRequires: ant-junit
BuildRequires: apache-commons-parent
-BuildRequires: javapackages-tools
-#BuildRequires: xml-commons-jaxp-1.3-apis
BuildRequires: java-devel
-BuildArch: noarch
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
-
+BuildRequires: javapackages-tools
+BuildRequires: junit
Provides: %{short_name} = %{version}-%{release}
Obsoletes: %{short_name} = 3.2
Provides: jakarta-%{short_name} = %{version}-%{release}
Obsoletes: jakarta-%{short_name} = 3.2
-
-Requires(pre): coreutils
-Requires(post): javapackages-tools
-Requires(postun): javapackages-tools
+BuildRoot: %{_tmppath}/%{name}-%{version}-build
+BuildArch: noarch
%description
The introduction of the Collections API by Sun in JDK 1.2
@@ -98,14 +90,14 @@
find . -name "*.class" -exec rm -f {} \;
%patch0 -p1
-%patch1 -p0
+%patch1
# 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
+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
@@ -118,14 +110,12 @@
#FIXME: the test fails on ppc with openjdk b11
# See bnc#441085
#ant -Djava.io.tmpdir=. dist tf.javadoc
-export CLASSPATH=$(build-classpath junit4)
-ant -Djava.io.tmpdir=. jar javadoc tf.validate tf.jar dist.bin dist.src
tf.javadoc
+export CLASSPATH=$(build-classpath junit)
+ant \
+ -Dant.build.javac.source=1.5 -Dant.build.javac.target=1.5 \
+ -Djava.io.tmpdir=. jar javadoc tf.validate tf.jar dist.bin dist.src
tf.javadoc
%install
-%if 0%{?suse_version} == 1110
-export NO_BRP_CHECK_BYTECODE_VERSION=true
-%endif
-
# jars
install -d -m 755 %{buildroot}%{_javadir}
install -m 644 build/%{short_name}-%{version}.jar
%{buildroot}%{_javadir}/%{name}.jar
--
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
