diff --git a/.files b/.files index bfd3ff6..a5998db 100644 Binary files a/.files and b/.files differ diff --git a/.rev b/.rev index 1763408..24e2e31 100644 --- a/.rev +++ b/.rev @@ -175,4 +175,12 @@ Automatic submission by obs-autosubmit 620739 + + 0e543eb638bbd714cbfae4816e34f0b1 + 7.0 + + dimstar_suse + Fix build with jdk 17 + 963049 + diff --git a/aelfred-javadoc.patch b/aelfred-javadoc.patch new file mode 100644 index 0000000..205be61 --- /dev/null +++ b/aelfred-javadoc.patch @@ -0,0 +1,43 @@ +--- aelfred-7.0/net/sf/saxon/aelfred/SAXDriver.java 2022-03-19 13:47:57.460297985 +0100 ++++ aelfred-7.0/net/sf/saxon/aelfred/SAXDriver.java 2022-03-19 13:58:48.212214516 +0100 +@@ -60,13 +60,14 @@ + * no longer public. See the package level documentation for more + * information. + * +- * +- * +- * +- * ++ *
NameNotes
++ * ++ * ++ * ++ * + * +- * ++ * + * + * + * +@@ -82,8 +83,8 @@ + * + * + * +- * ++ * + * + * + *
NameNotes
Features ... URL prefix is +- * http://xml.org/sax/features/
Features ... URL prefix is ++ * http://xml.org/sax/features/
(URL)/external-general-entitiesValue is fixed at true
(URL)/validationValue is fixed at false
Handler Properties ... URL prefix is +- * http://xml.org/sax/properties/
Handler Properties ... URL prefix is ++ * http://xml.org/sax/properties/
(URL)/declaration-handlerA declaration handler may be provided. Declaration of general +@@ -186,7 +187,7 @@ + + /** + * SAX1, SAX2: Set the entity resolver for this parser. +- * @param handler The object to receive entity events. ++ * @param resolver The object to receive entity events. + */ + public void setEntityResolver (EntityResolver resolver) + { diff --git a/aelfred.changes b/aelfred.changes index c22ca11..1c01fc1 100644 --- a/aelfred.changes +++ b/aelfred.changes @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Sat Mar 19 13:00:20 UTC 2022 - Fridrich Strba + +- Added patch: + * aelfred-javadoc.patch + + fix build with javadoc 17 + +------------------------------------------------------------------- Tue May 15 05:00:18 UTC 2018 - fstrba@suse.com - Build with source and target 8 to prepare for a possible removal diff --git a/aelfred.spec b/aelfred.spec index ae5acd4..acb2a7a 100644 --- a/aelfred.spec +++ b/aelfred.spec @@ -1,7 +1,7 @@ # # spec file for package aelfred # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2022 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,7 +12,7 @@ # 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/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # @@ -25,6 +25,7 @@ Group: Development/Libraries/Java URL: http://saxon.sourceforge.net/aelfred.html Source0: http://downloads.sourceforge.net/project/saxon/aelfred/7.0/aelfred7_0.zip Patch0: aelfred-icedtea-build.patch +Patch1: aelfred-javadoc.patch BuildRequires: ant BuildRequires: java-devel >= 1.8 BuildRequires: javapackages-tools @@ -55,6 +56,7 @@ Demonstrations and samples for aelfred. %setup -q -c unzip %{name}-source.zip %patch0 +%patch1 -p1 %build export JAVA_HOME=%{java_home}