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

- Do not depend on junit4 but use junit

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/Java:packages/apache-commons-collections?expand=0&rev=9
This commit is contained in:
Tomáš Chvátal 2014-07-07 14:49:24 +00:00 committed by Git OBS Bridge
parent f03d314e67
commit e72da7b683
2 changed files with 19 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
apache-commons-collections.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Mon Jul 7 14:48:57 UTC 2014 - tchvatal@suse.com
- Do not depend on junit4 but use junit
-------------------------------------------------------------------
Thu May 15 13:17:17 UTC 2014 - darin@darins.net

38
apache-commons-collections.spec
View File

@ -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 @@ Source0: http://www.apache.org/dist/commons/%{base_name}/source/%{short_n
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 "*.jar" -exec rm -f {} \;
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 @@ sed -i 's/@VERSION@/%{version}/' pom-testframework.xml
#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