Hello community,
here is the log from the commit of package apache-commons-lang for
openSUSE:Factory checked in at 2014-07-16 16:49:25
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/apache-commons-lang (Old)
and /work/SRC/openSUSE:Factory/.apache-commons-lang.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "apache-commons-lang"
Changes:
--------
--- /work/SRC/openSUSE:Factory/apache-commons-lang/apache-commons-lang.changes
2013-09-11 13:39:49.000000000 +0200
+++
/work/SRC/openSUSE:Factory/.apache-commons-lang.new/apache-commons-lang.changes
2014-07-16 16:49:35.000000000 +0200
@@ -1,0 +2,5 @@
+Mon Jul 7 14:56:55 UTC 2014 - tchva...@suse.com
+
+- Depend on junit not junit4
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ apache-commons-lang.spec ++++++
--- /var/tmp/diff_new_pack.Pptl1q/_old 2014-07-16 16:49:36.000000000 +0200
+++ /var/tmp/diff_new_pack.Pptl1q/_new 2014-07-16 16:49:36.000000000 +0200
@@ -1,9 +1,8 @@
#
-# spec file for package jakarta-commons-lang (Version 2.4)
+# spec file for package apache-commons-lang
#
-# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2000-2009, JPackage Project
-# All rights reserved.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -20,29 +19,25 @@
%define base_name lang
%define short_name commons-%{base_name}
-
Name: apache-commons-lang
Version: 2.6
-Release: 1
+Release: 0
Summary: Apache Commons Lang Package
License: Apache-2.0
Group: Development/Libraries/Java
Url: http://commons.apache.org/%{base_name}
Source0:
http://archive.apache.org/dist/commons/%{base_name}/source/%{short_name}-%{version}-src.tar.gz
Patch1: 0002-Fix-FastDateFormat-for-Java-7-behaviour.patch
-
BuildRequires: ant
BuildRequires: ant-junit
-BuildRequires: junit4
BuildRequires: java-devel >= 1.6.0
BuildRequires: javapackages-tools
-
-BuildArch: noarch
-
+BuildRequires: junit
Provides: %{short_name} = %{version}-%{release}
Provides: jakarta-%{short_name} = %{version}-%{release}
Obsoletes: jakarta-%{short_name} <= 2.4
BuildRoot: %{_tmppath}/%{name}-%{version}-build
+BuildArch: noarch
%description
The standard Java libraries fail to provide enough methods for
@@ -58,7 +53,6 @@
as hashCode, toString and equals.
%package javadoc
-License: Apache-2.0
Summary: Javadoc for %{name}
Group: Documentation/HTML
@@ -71,11 +65,10 @@
sed -i 's/\r//' *.txt *.html
%build
-export OPT_JAR_LIST=`%{__cat} %{_sysconfdir}/ant.d/junit`
+export OPT_JAR_LIST=`cat %{_sysconfdir}/ant.d/junit`
export CLASSPATH=
-%{ant} \
- -Dcompile.source=1.4 \
- -Dcompile.target=1.4 \
+ant \
+ -Dcompile.source=1.4 -Dcompile.target=1.4 \
-Djunit.jar=$(build-classpath junit4) \
-Dfinal.name=%{short_name} \
-Djdk.javadoc=%{_javadocdir}/java \
@@ -83,17 +76,17 @@
%install
# jars
-%{__mkdir_p} %{buildroot}%{_javadir}
-%{__cp} -p target/%{short_name}.jar %{buildroot}%{_javadir}/%{name}.jar
+mkdir -p %{buildroot}%{_javadir}
+cp -p target/%{short_name}.jar %{buildroot}%{_javadir}/%{name}.jar
(cd %{buildroot}%{_javadir} && for jar in apache-*; do ln -sf ${jar} `echo
$jar| sed "s|apache-||g"`; done)
# pom
-%{__mkdir_p} %{buildroot}%{_mavenpomdir}
-%{__cp} -p pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
+mkdir -p %{buildroot}%{_mavenpomdir}
+cp -p pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
%add_maven_depmap
# javadoc
-%{__mkdir_p} %{buildroot}%{_javadocdir}/%{name}
-%{__cp} -pr target/apidocs/* %{buildroot}%{_javadocdir}/%{name}/
+mkdir -p %{buildroot}%{_javadocdir}/%{name}
+cp -pr target/apidocs/* %{buildroot}%{_javadocdir}/%{name}/
%files
%defattr(0644,root,root,0755)
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
