Hello community,
here is the log from the commit of package jakarta-commons-digester for
openSUSE:Factory checked in at 2017-09-20 17:08:54
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/jakarta-commons-digester (Old)
and /work/SRC/openSUSE:Factory/.jakarta-commons-digester.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "jakarta-commons-digester"
Wed Sep 20 17:08:54 2017 rev:16 rq:527000 version:1.7
Changes:
--------
---
/work/SRC/openSUSE:Factory/jakarta-commons-digester/jakarta-commons-digester.changes
2014-07-16 16:49:56.000000000 +0200
+++
/work/SRC/openSUSE:Factory/.jakarta-commons-digester.new/jakarta-commons-digester.changes
2017-09-20 17:08:54.953440082 +0200
@@ -1,0 +2,12 @@
+Mon Sep 18 11:07:35 UTC 2017 - [email protected]
+
+- Removed patch:
+ * jakarta-commons-digester-java14compat.patch
+- Added patch:
+ * jakarta-commons-digester-java16compat.patch
+ - Build with java source and target 1.6
+ - Fixes build with jdk9
+- Align the spec file to the way the ant build gets its
+ dependencies and fix the javadoc build
+
+-------------------------------------------------------------------
Old:
----
jakarta-commons-digester-java14compat.patch
New:
----
jakarta-commons-digester-java16compat.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ jakarta-commons-digester.spec ++++++
--- /var/tmp/diff_new_pack.AWgnp9/_old 2017-09-20 17:08:55.509361825 +0200
+++ /var/tmp/diff_new_pack.AWgnp9/_new 2017-09-20 17:08:55.513361262 +0200
@@ -1,7 +1,7 @@
#
# spec file for package jakarta-commons-digester
#
-# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -26,7 +26,7 @@
Group: Development/Libraries/Java
Url: http://jakarta.apache.org/commons/digester/
Source0:
http://www.apache.org/dist/jakarta/commons/digester/source/commons-digester-%{version}-src.tar.gz
-Patch0: %{name}-java14compat.patch
+Patch0: %{name}-java16compat.patch
BuildRequires: ant
BuildRequires: apache-commons-collections
BuildRequires: jakarta-commons-beanutils
@@ -36,7 +36,6 @@
Requires: jakarta-commons-logging >= 1.0
Provides: %{short_name} = %{version}
Obsoletes: %{short_name} < %{version}
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildArch: noarch
%description
@@ -61,13 +60,23 @@
%patch0
%build
-cp LICENSE.txt ../LICENSE
-export CLASSPATH=%(build-classpath commons-collections commons-logging
commons-beanutils junit)
-ant dist
+#cp LICENSE.txt ../LICENSE
+ant \
+ -Djunit.jar=$(build-classpath junit) \
+ -Dcommons-beanutils.jar=$(build-classpath commons-beanutils) \
+ -Dcommons-collections.jar=$(build-classpath commons-collections) \
+ -Dcommons-logging.jar=$(build-classpath commons-logging) \
+ dist
# Build rss -- needed by struts
export CLASSPATH=$CLASSPATH:`pwd`/dist/%{short_name}.jar
-(cd src/examples/rss; ant dist)
-rm ../LICENSE
+(cd src/examples/rss; ant \
+ -Djunit.jar=$(build-classpath junit) \
+ -Dcommons-beanutils.jar=$(build-classpath commons-beanutils) \
+ -Dcommons-collections.jar=$(build-classpath commons-collections) \
+ -Dcommons-logging.jar=$(build-classpath commons-logging) \
+ dist \
+)
+#rm ../LICENSE
%install
# jars
@@ -81,12 +90,10 @@
cp -pr dist/docs/api/* %{buildroot}%{_javadocdir}/%{name}-%{version}
%files
-%defattr(0644,root,root,0755)
%doc LICENSE.txt NOTICE.txt RELEASE-NOTES.txt
%{_javadir}/*
%files javadoc
-%defattr(0644,root,root,0755)
%{_javadocdir}/%{name}-%{version}
%changelog
++++++ jakarta-commons-digester-java14compat.patch ->
jakarta-commons-digester-java16compat.patch ++++++
---
/work/SRC/openSUSE:Factory/jakarta-commons-digester/jakarta-commons-digester-java14compat.patch
2011-09-23 02:03:56.000000000 +0200
+++
/work/SRC/openSUSE:Factory/.jakarta-commons-digester.new/jakarta-commons-digester-java16compat.patch
2017-09-20 17:08:54.941441771 +0200
@@ -7,8 +7,8 @@
deprecation="${compile.deprecation}"
- optimize="${compile.optimize}">
+ optimize="${compile.optimize}"
-+ source="1.4"
-+ target="1.4">
++ source="1.6"
++ target="1.6">
<classpath refid="compile.classpath"/>
</javac>
<copy todir="${build.home}/classes" filtering="on">
@@ -18,8 +18,8 @@
deprecation="${compile.deprecation}"
- optimize="${compile.optimize}">
+ optimize="${compile.optimize}"
-+ source="1.4"
-+ target="1.4">
++ source="1.6"
++ target="1.6">
<classpath refid="test.classpath"/>
</javac>
<copy todir="${build.home}/tests" filtering="on">
@@ -32,8 +32,8 @@
deprecation="${compile.deprecation}"
- optimize="${compile.optimize}">
+ optimize="${compile.optimize}"
-+ source="1.4"
-+ target="1.4">
++ source="1.6"
++ target="1.6">
<classpath refid="compile.classpath"/>
</javac>
</target>
@@ -46,8 +46,8 @@
deprecation="${compile.deprecation}"
- optimize="${compile.optimize}">
+ optimize="${compile.optimize}"
-+ source="1.4"
-+ target="1.4">
++ source="1.6"
++ target="1.6">
<classpath refid="compile.classpath"/>
</javac>
</target>
@@ -60,8 +60,8 @@
deprecation="${compile.deprecation}"
- optimize="${compile.optimize}">
+ optimize="${compile.optimize}"
-+ source="1.4"
-+ target="1.4">
++ source="1.6"
++ target="1.6">
<classpath refid="compile.classpath"/>
</javac>
</target>
@@ -74,8 +74,8 @@
deprecation="${compile.deprecation}"
- optimize="${compile.optimize}">
+ optimize="${compile.optimize}"
-+ source="1.4"
-+ target="1.4">
++ source="1.6"
++ target="1.6">
<classpath refid="compile.classpath"/>
</javac>
</target>
@@ -88,8 +88,8 @@
deprecation="${compile.deprecation}"
- optimize="${compile.optimize}">
+ optimize="${compile.optimize}"
-+ source="1.4"
-+ target="1.4">
++ source="1.6"
++ target="1.6">
<classpath refid="compile.classpath"/>
</javac>
</target>
@@ -102,8 +102,8 @@
deprecation="${compile.deprecation}"
- optimize="${compile.optimize}">
+ optimize="${compile.optimize}"
-+ source="1.4"
-+ target="1.4">
++ source="1.6"
++ target="1.6">
<classpath refid="compile.classpath"/>
</javac>
<copy todir="${build.home}/classes" filtering="on">
@@ -116,8 +116,8 @@
deprecation="${compile.deprecation}"
- optimize="${compile.optimize}">
+ optimize="${compile.optimize}"
-+ source="1.4"
-+ target="1.4">
++ source="1.6"
++ target="1.6">
<classpath refid="compile.classpath"/>
</javac>
</target>
