Hello community,
here is the log from the commit of package apache-commons-lang for
openSUSE:Factory checked in at 2013-09-11 13:39:48
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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:
--------
New Changes file:
--- /dev/null 2013-07-23 23:44:04.804033756 +0200
+++
/work/SRC/openSUSE:Factory/.apache-commons-lang.new/apache-commons-lang.changes
2013-09-11 13:39:49.000000000 +0200
@@ -0,0 +1,67 @@
+-------------------------------------------------------------------
+Fri Sep 6 08:42:51 UTC 2013 - [email protected]
+
+- update to 2.6 (bugfix release)
+ * see
http://commons.apache.org/proper/commons-lang/release-notes/RELEASE-NOTES-2.6.txt
+ * see
http://commons.apache.org/proper/commons-lang/release-notes/RELEASE-NOTES-2.5.txt
+- use new add_maven_depmap macro
+- drop jakarta-commons-lang-build.patch
+
+-------------------------------------------------------------------
+Wed Jan 27 08:39:19 UTC 2010 - [email protected]
+
+- merged with jakarta-commons-lang-2.1-7.jpp5.src.rpm
+
+-------------------------------------------------------------------
+Tue Jul 29 09:09:19 CEST 2008 - [email protected]
+
+- made the symlink jakarta-commons-lang -> jakarta-commons-lang-2.3
+ part of the javadoc package
+
+-------------------------------------------------------------------
+Mon Jul 21 15:33:36 CEST 2008 - [email protected]
+
+- update to 2.3
+ - merged with japackage 1.7 spec file
+ - add a maven build support and a maven pom files and post/un scripts for
+ depmap files
+- removed a source=1.1 - fixed build under openjdk6
+- removed a crosslink patch
+
+-------------------------------------------------------------------
+Fri Sep 15 14:53:46 CEST 2006 - [email protected]
+
+- use source=1.1 for java
+
+-------------------------------------------------------------------
+Wed Jan 25 21:46:38 CET 2006 - [email protected]
+
+- converted neededforbuild to BuildRequires
+
+-------------------------------------------------------------------
+Mon Aug 29 11:23:02 CEST 2005 - [email protected]
+
+- Removed the "test" to be built so that it builds now on all
+ architectures (see bug 102629).
+ The "test" failed on ppc, s390x, and ppc64 (see bug 113779).
+
+-------------------------------------------------------------------
+Wed Jul 27 16:51:06 CEST 2005 - [email protected]
+
+- Adjustments in the spec file.
+
+-------------------------------------------------------------------
+Mon Jul 18 16:19:11 CEST 2005 - [email protected]
+
+- Current version 2.0 from JPackage.org
+
+-------------------------------------------------------------------
+Thu Sep 16 14:49:51 CEST 2004 - [email protected]
+
+- Fix prerequires of javadoc subpackage
+
+-------------------------------------------------------------------
+Thu Sep 2 18:28:43 CEST 2004 - [email protected]
+
+- Initial package created with version 2.0 (JPackage 1.5)
+
New:
----
0002-Fix-FastDateFormat-for-Java-7-behaviour.patch
apache-commons-lang.changes
apache-commons-lang.spec
commons-lang-2.6-src.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ apache-commons-lang.spec ++++++
#
# spec file for package jakarta-commons-lang (Version 2.4)
#
# Copyright (c) 2010 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
# upon. The license for this file, and modifications and additions to the
# file, is the same license as for the pristine package itself (unless the
# license for the pristine package is not an Open Source License, in which
# case the license is the MIT License). An "Open Source License" is a
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
%define base_name lang
%define short_name commons-%{base_name}
Name: apache-commons-lang
Version: 2.6
Release: 1
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
Provides: %{short_name} = %{version}-%{release}
Provides: jakarta-%{short_name} = %{version}-%{release}
Obsoletes: jakarta-%{short_name} <= 2.4
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
The standard Java libraries fail to provide enough methods for
manipulation of its core classes. The Commons Lang Component provides
these extra methods.
The Commons Lang Component provides a host of helper utilities for the
java.lang API, notably String manipulation methods, basic numerical
methods, object reflection, creation and serialization, and System
properties. Additionally it contains an inheritable enum type, an
exception structure that supports multiple types of nested-Exceptions
and a series of utilities dedicated to help with building methods, such
as hashCode, toString and equals.
%package javadoc
License: Apache-2.0
Summary: Javadoc for %{name}
Group: Documentation/HTML
%description javadoc
Javadoc for %{name}.
%prep
%setup -q -n %{short_name}-%{version}-src
%patch1 -p1
sed -i 's/\r//' *.txt *.html
%build
export OPT_JAR_LIST=`%{__cat} %{_sysconfdir}/ant.d/junit`
export CLASSPATH=
%{ant} \
-Dcompile.source=1.4 \
-Dcompile.target=1.4 \
-Djunit.jar=$(build-classpath junit4) \
-Dfinal.name=%{short_name} \
-Djdk.javadoc=%{_javadocdir}/java \
test dist
%install
# jars
%{__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
%add_maven_depmap
# javadoc
%{__mkdir_p} %{buildroot}%{_javadocdir}/%{name}
%{__cp} -pr target/apidocs/* %{buildroot}%{_javadocdir}/%{name}/
%files
%defattr(0644,root,root,0755)
%doc PROPOSAL.html LICENSE.txt NOTICE.txt RELEASE-NOTES.txt
%{_javadir}/%{name}.jar
%{_javadir}/%{short_name}.jar
%{_mavenpomdir}/*
%{_mavendepmapfragdir}/%{name}
%files javadoc
%defattr(0644,root,root,0755)
%{_javadocdir}/%{name}
%changelog
++++++ 0002-Fix-FastDateFormat-for-Java-7-behaviour.patch ++++++
>From 6af11cb2cfdf83ce013a531005077259984c55e7 Mon Sep 17 00:00:00 2001
From: Stanislav Ochotnicky <[email protected]>
Date: Wed, 22 Feb 2012 11:21:06 +0100
Subject: [PATCH 2/2] Fix FastDateFormat for Java 7 behaviour
Backported from 1146138
See https://issues.apache.org/jira/browse/LANG-719 for more information
---
.../apache/commons/lang/time/FastDateFormat.java | 14 ++++++++++----
.../commons/lang/time/FastDateFormatTest.java | 5 +++--
2 files changed, 13 insertions(+), 6 deletions(-)
diff --git a/src/main/java/org/apache/commons/lang/time/FastDateFormat.java
b/src/main/java/org/apache/commons/lang/time/FastDateFormat.java
index 2ca7e5c..b7e19ec 100644
--- a/src/main/java/org/apache/commons/lang/time/FastDateFormat.java
+++ b/src/main/java/org/apache/commons/lang/time/FastDateFormat.java
@@ -49,7 +49,7 @@ import org.apache.commons.lang.text.StrBuilder;
* </p>
*
* <p>Only formatting is supported, but all patterns are compatible with
- * SimpleDateFormat (except time zones - see below).</p>
+ * SimpleDateFormat (except time zones and some year patterns - see below).</p>
*
* <p>Java 1.4 introduced a new pattern letter, <code>'Z'</code>, to represent
* time zones in RFC822 format (eg. <code>+0800</code> or <code>-1100</code>).
@@ -60,6 +60,12 @@ import org.apache.commons.lang.text.StrBuilder;
* This introduces a minor incompatibility with Java 1.4, but at a gain of
* useful functionality.</p>
*
+ * <p>Javadoc cites for the year pattern: <i>For formatting, if the number of
+ * pattern letters is 2, the year is truncated to 2 digits; otherwise it is
+ * interpreted as a number.</i> Starting with Java 1.7 a pattern of 'Y' or
+ * 'YYY' will be formatted as '2003', while it was '03' in former Java
+ * versions. FastDateFormat implements the behavior of Java 7.</p>
+ *
* @author Apache Software Foundation
* @author TeaTrove project
* @author Brian S O'Neill
@@ -606,10 +612,10 @@ public class FastDateFormat extends Format {
rule = new TextField(Calendar.ERA, ERAs);
break;
case 'y': // year (number)
- if (tokenLen >= 4) {
- rule = selectNumberRule(Calendar.YEAR, tokenLen);
- } else {
+ if (tokenLen == 2) {
rule = TwoDigitYearField.INSTANCE;
+ } else {
+ rule = selectNumberRule(Calendar.YEAR, tokenLen < 4 ? 4 :
tokenLen);
}
break;
case 'M': // month in year (text and number)
diff --git a/src/test/java/org/apache/commons/lang/time/FastDateFormatTest.java
b/src/test/java/org/apache/commons/lang/time/FastDateFormatTest.java
index 8232747..bd4d664 100644
--- a/src/test/java/org/apache/commons/lang/time/FastDateFormatTest.java
+++ b/src/test/java/org/apache/commons/lang/time/FastDateFormatTest.java
@@ -230,8 +230,9 @@ public class FastDateFormatTest extends TestCase {
" dddd ddd dd d DDDD DDD DD D EEEE EEE EE E aaaa aaa aa a zzzz
zzz zz z";
fdf = FastDateFormat.getInstance(pattern);
sdf = new SimpleDateFormat(pattern);
- assertEquals(sdf.format(date1), fdf.format(date1));
- assertEquals(sdf.format(date2), fdf.format(date2));
+ // SDF bug fix starting with Java 7
+ assertEquals(sdf.format(date1).replaceAll("2003 03 03 03", "2003
2003 03 2003"), fdf.format(date1));
+ assertEquals(sdf.format(date2).replaceAll("2003 03 03 03", "2003
2003 03 2003"), fdf.format(date2));
} finally {
Locale.setDefault(realDefaultLocale);
--
1.7.7.6
--
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
