Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package jakarta-poi for openSUSE:Factory checked in at 2022-03-20 20:56:17 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/jakarta-poi (Old) and /work/SRC/openSUSE:Factory/.jakarta-poi.new.25692 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "jakarta-poi" Sun Mar 20 20:56:17 2022 rev:21 rq:963301 version:2.5.1 Changes: -------- --- /work/SRC/openSUSE:Factory/jakarta-poi/jakarta-poi.changes 2022-02-23 19:06:56.495288900 +0100 +++ /work/SRC/openSUSE:Factory/.jakarta-poi.new.25692/jakarta-poi.changes 2022-03-20 20:56:52.202640542 +0100 @@ -1,0 +2,8 @@ +Sun Mar 20 17:14:49 UTC 2022 - Fridrich Strba <fst...@suse.com> + +- Build with java source and target levels 8 +- Added patch: + * ambigous-Record.patch + + fix typename clash with the new java.lang.Record + +------------------------------------------------------------------- New: ---- ambigous-Record.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ jakarta-poi.spec ++++++ --- /var/tmp/diff_new_pack.ZBmaoE/_old 2022-03-20 20:56:52.802641405 +0100 +++ /var/tmp/diff_new_pack.ZBmaoE/_new 2022-03-20 20:56:52.810641417 +0100 @@ -17,13 +17,14 @@ %define base_name poi +%bcond_without tests Name: jakarta-poi Version: 2.5.1 Release: 0 Summary: Java API To Access Microsoft Format Files License: Apache-2.0 Group: Development/Languages/Java -URL: http://jakarta.apache.org/poi/ +URL: https://jakarta.apache.org/poi/ Source0: poi-src-2.5.1-final-20040804.tar.bz2 #cvs -d :pserver:anon...@cvs.apache.org:/home/cvspublic login #cvs -z3 -d :pserver:anon...@cvs.apache.org:/home/cvspublic export -r HEAD jakarta-poi/src/scratchpad @@ -31,6 +32,7 @@ Patch0: poi-build_xml.patch Patch1: poi-encoding.patch Patch2: %{name}-%{version}-junittest.patch +Patch3: ambigous-Record.patch BuildRequires: ant >= 1.6 BuildRequires: ant-jdepend >= 1.6 BuildRequires: ant-junit >= 1.6 @@ -39,7 +41,7 @@ BuildRequires: jakarta-commons-collections >= 2.1 BuildRequires: jakarta-commons-lang >= 2.0 BuildRequires: jakarta-commons-logging >= 1.0.3 -BuildRequires: java-devel +BuildRequires: java-devel >= 1.8 BuildRequires: javapackages-tools BuildRequires: jaxp_transform_impl BuildRequires: jdepend >= 2.6 @@ -111,6 +113,7 @@ %patch0 -b .sav %patch1 -b .sav1 %patch2 -b .sav2 +%patch3 -p1 # wrong end of line necoding sed -i -e 's/.$//' \ docs/jdepend/jdepend.xml \ @@ -137,40 +140,39 @@ xml-commons-apis \ ) export ANT_OPTS="-Xmx256m -Djava.awt.headless=true -Dbuild.sysclasspath=first -Ddisconnected=true" -ant -Dant.build.javac.target=1.6 -Dant.build.javac.source=1.6 jar test +ant -Dant.build.javac.target=1.8 -Dant.build.javac.source=1.8 jar \ +%if %{with tests} + test +%endif %install install -dm 755 %{buildroot}%{_javadir} cp -p build/dist/%{base_name}-%{version}-final-*.jar \ - %{buildroot}%{_javadir}/%{name}-%{version}.jar + %{buildroot}%{_javadir}/%{name}.jar cp -p build/dist/%{base_name}-contrib-%{version}-final-*.jar \ - %{buildroot}%{_javadir}/%{name}-contrib-%{version}.jar + %{buildroot}%{_javadir}/%{name}-contrib.jar cp -p build/dist/%{base_name}-scratchpad-%{version}-final-*.jar \ - %{buildroot}%{_javadir}/%{name}-scratchpad-%{version}.jar -(cd %{buildroot}%{_javadir} && for jar in %{name}*-%{version}.jar; do ln -sf ${jar} `echo $jar| sed "s|jakarta-||g"`; done) -(cd %{buildroot}%{_javadir} && for jar in *-%{version}.jar; do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done) + %{buildroot}%{_javadir}/%{name}-scratchpad.jar +(cd %{buildroot}%{_javadir} && for jar in %{name}*.jar; do ln -sf ${jar} `echo $jar| sed "s|jakarta-||g"`; done) + #javadoc -install -dm 755 %{buildroot}%{_javadocdir}/%{name}-%{version} -cp -pr docs/apidocs/* %{buildroot}%{_javadocdir}/%{name}-%{version} -ln -s %{name}-%{version} %{buildroot}%{_javadocdir}/%{name} # ghost symlink +install -dm 755 %{buildroot}%{_javadocdir}/%{name} +cp -pr docs/apidocs/* %{buildroot}%{_javadocdir}/%{name} rm -rf docs/apidocs + #manual -install -dm 755 %{buildroot}%{_docdir}/%{name}-%{version} -cp -pr docs/* %{buildroot}%{_docdir}/%{name}-%{version} -cp -p LICENSE %{buildroot}%{_docdir}/%{name}-%{version} -ln -s %{_javadocdir}/%{name}-%{version} %{buildroot}%{_docdir}/%{name}-%{version}/apidocs # ghost symlink +install -dm 755 %{buildroot}%{_docdir}/%{name} +cp -pr docs/* %{buildroot}%{_docdir}/%{name} %fdupes -s %{buildroot} %files -%doc %{_docdir}/%{name}-%{version}/LICENSE +%license LICENSE %{_javadir}/*.jar %files javadoc -%doc %{_javadocdir}/%{name}-%{version} -%ghost %doc %{_javadocdir}/%{name} +%{_javadocdir}/%{name} %files manual -%doc %{_docdir}/%{name}-%{version} -%exclude %{_docdir}/%{name}-%{version}/LICENSE +%doc %{_docdir}/%{name} %changelog ++++++ ambigous-Record.patch ++++++ --- poi/src/java/org/apache/poi/hssf/dev/BiffViewer.java 2022-03-20 17:52:02.256845307 +0100 +++ poi/src/java/org/apache/poi/hssf/dev/BiffViewer.java 2022-03-20 18:02:01.660566286 +0100 @@ -21,6 +21,7 @@ */ package org.apache.poi.hssf.dev; +import org.apache.poi.hssf.record.Record; import org.apache.poi.hssf.record.*; import org.apache.poi.poifs.filesystem.POIFSFileSystem; import org.apache.poi.util.HexDump; --- poi/src/java/org/apache/poi/hssf/dev/EFHSSF.java 2022-03-20 17:52:02.256845307 +0100 +++ poi/src/java/org/apache/poi/hssf/dev/EFHSSF.java 2022-03-20 18:02:56.344905755 +0100 @@ -23,6 +23,7 @@ import java.io.IOException; import org.apache.poi.poifs.filesystem.POIFSFileSystem; +import org.apache.poi.hssf.record.Record; import org.apache.poi.hssf.record.*; import org.apache.poi.hssf.eventmodel.*; import org.apache.poi.hssf.eventusermodel.*; --- poi/src/java/org/apache/poi/hssf/dev/FormulaViewer.java 2022-03-20 17:52:02.256845307 +0100 +++ poi/src/java/org/apache/poi/hssf/dev/FormulaViewer.java 2022-03-20 18:07:46.182707479 +0100 @@ -35,6 +35,7 @@ import org.apache.poi.poifs.filesystem.POIFSFileSystem; import org.apache.poi.util.LittleEndian; import org.apache.poi.util.HexDump; +import org.apache.poi.hssf.record.Record; import org.apache.poi.hssf.record.*; import org.apache.poi.hssf.record.formula.*; import org.apache.poi.hssf.model.*; --- poi/src/java/org/apache/poi/hssf/dev/HSSF.java 2022-03-20 17:52:02.256845307 +0100 +++ poi/src/java/org/apache/poi/hssf/dev/HSSF.java 2022-03-20 18:08:49.751103009 +0100 @@ -23,6 +23,7 @@ import java.io.FileOutputStream; import org.apache.poi.poifs.filesystem.POIFSFileSystem; +import org.apache.poi.hssf.record.Record; import org.apache.poi.hssf.record.*; import org.apache.poi.hssf.usermodel.*; import org.apache.poi.hssf.util.*; --- poi/src/java/org/apache/poi/hssf/model/Sheet.java 2022-03-20 17:52:02.256845307 +0100 +++ poi/src/java/org/apache/poi/hssf/model/Sheet.java 2022-03-20 18:00:46.556100056 +0100 @@ -18,6 +18,7 @@ package org.apache.poi.hssf.model; +import org.apache.poi.hssf.record.Record; import org.apache.poi.hssf.record.*; import org.apache.poi.hssf.record.aggregates.FormulaRecordAggregate; import org.apache.poi.hssf.record.aggregates.RowRecordsAggregate; --- poi/src/java/org/apache/poi/hssf/model/Workbook.java 2022-03-20 17:52:02.256845307 +0100 +++ poi/src/java/org/apache/poi/hssf/model/Workbook.java 2022-03-20 17:58:25.175222395 +0100 @@ -17,6 +17,7 @@ package org.apache.poi.hssf.model; +import org.apache.poi.hssf.record.Record; import org.apache.poi.hssf.record.*; import org.apache.poi.hssf.util.HSSFColor; import org.apache.poi.hssf.util.SheetReferences; --- poi/src/java/org/apache/poi/hssf/record/aggregates/FormulaRecordAggregate.java 2022-03-20 17:52:02.260845332 +0100 +++ poi/src/java/org/apache/poi/hssf/record/aggregates/FormulaRecordAggregate.java 2022-03-20 18:05:39.121916889 +0100 @@ -17,6 +17,7 @@ package org.apache.poi.hssf.record.aggregates; +import org.apache.poi.hssf.record.Record; import org.apache.poi.hssf.record.*; /** --- poi/src/java/org/apache/poi/hssf/record/aggregates/ValueRecordsAggregate.java 2022-03-20 17:52:02.260845332 +0100 +++ poi/src/java/org/apache/poi/hssf/record/aggregates/ValueRecordsAggregate.java 2022-03-20 18:03:46.929219772 +0100 @@ -18,6 +18,7 @@ package org.apache.poi.hssf.record.aggregates; +import org.apache.poi.hssf.record.Record; import org.apache.poi.hssf.record.*; import java.util.Iterator; --- poi/src/java/org/apache/poi/hssf/usermodel/HSSFSheet.java 2022-03-20 17:52:02.264845357 +0100 +++ poi/src/java/org/apache/poi/hssf/usermodel/HSSFSheet.java 2022-03-20 18:06:38.454286062 +0100 @@ -24,6 +24,7 @@ import org.apache.poi.ddf.EscherRecord; import org.apache.poi.hssf.model.Sheet; import org.apache.poi.hssf.model.Workbook; +import org.apache.poi.hssf.record.Record; import org.apache.poi.hssf.record.*; import org.apache.poi.hssf.util.Region; import org.apache.poi.util.POILogFactory; --- poi/src/testcases/org/apache/poi/hssf/record/aggregates/TestValueRecordsAggregate.java 2022-03-20 17:52:02.280845456 +0100 +++ poi/src/testcases/org/apache/poi/hssf/record/aggregates/TestValueRecordsAggregate.java 2022-03-20 18:11:26.180076295 +0100 @@ -20,6 +20,7 @@ import java.util.Iterator; import java.util.List; +import org.apache.poi.hssf.record.Record; import org.apache.poi.hssf.record.*; import org.apache.poi.util.HexDump; import junit.framework.TestCase;
