Hello community,
here is the log from the commit of package apache-commons-lang for
openSUSE:Leap:15.2 checked in at 2020-03-31 07:22:01
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Leap:15.2/apache-commons-lang (Old)
and /work/SRC/openSUSE:Leap:15.2/.apache-commons-lang.new.3160 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "apache-commons-lang"
Tue Mar 31 07:22:01 2020 rev:23 rq:788621 version:2.6
Changes:
--------
---
/work/SRC/openSUSE:Leap:15.2/apache-commons-lang/apache-commons-lang.changes
2020-02-05 07:23:03.490585988 +0100
+++
/work/SRC/openSUSE:Leap:15.2/.apache-commons-lang.new.3160/apache-commons-lang.changes
2020-03-31 07:22:01.466389029 +0200
@@ -1,0 +2,13 @@
+Mon Mar 23 08:59:14 UTC 2020 - Fridrich Strba <[email protected]>
+
+- Added patch:
+ * commons-lang-bundle-manifest.patch
+ + Add bundle manifest to make usable from eclipse
+
+-------------------------------------------------------------------
+Mon Jan 27 06:21:47 UTC 2020 - Fridrich Strba <[email protected]>
+
+- On supported platforms, avoid building with OpenJ9 in order to
+ prevent a build cycle.
+
+-------------------------------------------------------------------
New:
----
commons-lang-bundle-manifest.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ apache-commons-lang.spec ++++++
--- /var/tmp/diff_new_pack.5dZAY6/_old 2020-03-31 07:22:01.858389199 +0200
+++ /var/tmp/diff_new_pack.5dZAY6/_new 2020-03-31 07:22:01.862389201 +0200
@@ -1,7 +1,7 @@
#
# spec file for package apache-commons-lang
#
-# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2020 SUSE LLC
# Copyright (c) 2000-2009, JPackage Project
#
# All modifications and additions to the file contributed by third parties
@@ -29,13 +29,17 @@
Source0:
http://archive.apache.org/dist/commons/%{base_name}/source/%{short_name}-%{version}-src.tar.gz
Patch0: fix_StopWatchTest_for_slow_systems.patch
Patch1: 0002-Fix-FastDateFormat-for-Java-7-behaviour.patch
+Patch2: commons-lang-bundle-manifest.patch
BuildRequires: ant
-BuildRequires: ant-junit
BuildRequires: java-devel
BuildRequires: javapackages-local
BuildRequires: junit
# Java 8 is the last version that can build with source and target level 1.4
BuildConflicts: java-devel >= 1.9
+BuildConflicts: java-headless >= 1.9
+# Avoid building with OpenJ9 on supported platforms; to prevent build cycle
+BuildConflicts: java-devel-openj9
+BuildConflicts: java-headless-openj9
Provides: %{short_name} = %{version}-%{release}
Provides: jakarta-%{short_name} = %{version}-%{release}
Obsoletes: jakarta-%{short_name} < %{version}-%{release}
@@ -65,6 +69,7 @@
%setup -q -n %{short_name}-%{version}-src
%patch0
%patch1 -p1
+%patch2 -p1
sed -i 's/\r//' *.txt *.html
%pom_remove_parent .
@@ -72,12 +77,12 @@
%build
export OPT_JAR_LIST=`cat %{_sysconfdir}/ant.d/junit`
export CLASSPATH=
-ant \
+%{ant} \
-Dcompile.source=1.4 -Dcompile.target=1.4 \
-Djunit.jar=$(build-classpath junit4) \
-Dfinal.name=%{short_name} \
-Djdk.javadoc=%{_javadocdir}/java \
- test dist
+ jar javadoc
%install
# jars
++++++ commons-lang-bundle-manifest.patch ++++++
--- commons-lang-2.6-src/build.xml 2020-03-23 09:39:15.817571809 +0100
+++ commons-lang-2.6-srcw/build.xml 2020-03-23 09:53:32.986134211 +0100
@@ -170,6 +170,16 @@
<attribute name="Implementation-Vendor-Id" value="org.apache"/>
<attribute name="X-Compile-Source-JDK"
value="${compile.source}"/>
<attribute name="X-Compile-Target-JDK"
value="${compile.target}"/>
+ <attribute name="Bundle-DocURL"
value="http://commons.apache.org/lang/"/>
+ <attribute name="Bundle-License"
value="https://www.apache.org/licenses/LICENSE-2.0.txt"/>
+ <attribute name="Bundle-ManifestVersion" value="2"/>
+ <attribute name="Bundle-Name" value="Commons Lang"/>
+ <attribute name="Bundle-SymbolicName"
value="org.apache.commons.lang"/>
+ <attribute name="Bundle-Vendor" value="The Apache Software
Foundation"/>
+ <attribute name="Bundle-Version"
value="${component.version}.0"/>
+ <attribute name="Export-Package"
value="org.apache.commons.lang;version="${component.version}",org.apache.commons.lang.builder;version="${component.version}",org.apache.commons.lang.enum;version="${component.version}",org.apache.commons.lang.enums;version="${component.version}",org.apache.commons.lang.exception;version="${component.version}",org.apache.commons.lang.math;version="${component.version}",org.apache.commons.lang.mutable;version="${component.version}",org.apache.commons.lang.reflect;version="${component.version}",org.apache.commons.lang.text;version="${component.version}",org.apache.commons.lang.time;version="${component.version}""/>
+ <attribute name="Include-Resource"
value="META-INF/NOTICE.txt=NOTICE.txt,META-INF/LICENSE.txt=LICENSE.txt"/>
+ <attribute name="Require-Capability"
value="osgi.ee;filter:="(&(osgi.ee=JavaSE)(version=1.3))""/>
</manifest>
<fileset dir="${build.home}/classes">
<include name="**/*.class"/>
