SPECS/batik.spec

@@ -5,7 +5,7 @@
 
 Name:           batik
 Version:        1.11
-Release:        6%{?dist}
+Release:        1%{?dist}
 Summary:        Scalable Vector Graphics for Java
 License:        ASL 2.0 and W3C
 URL:            https://xmlgraphics.apache.org/batik/
@@ -31,6 +31,7 @@ BuildRequires:  mvn(xml-apis:xml-apis)
 BuildRequires:  mvn(xml-apis:xml-apis-ext)
 
 # full support for tiff
+Recommends:     jai-imageio-core
 
 %description
 Batik is a Java(tm) technology based toolkit for applications that want
@@ -175,11 +176,8 @@ rm batik-bridge/src/main/java/org/apache/batik/bridge/WindowWrapper.java
 
 %mvn_file :batik-all batik-all
 
-#no jacl rpm and it breaks javadoc
-rm -fr batik-script/src/main/java/org/apache/batik/script/jacl/JaclInterpreter.java
-
 %build
-%mvn_build --xmvn-javadoc
+%mvn_build
 
 %install
 %mvn_install
@@ -200,7 +198,6 @@ cp -pr samples $RPM_BUILD_ROOT%{_datadir}/%{name}/
 %doc CHANGES MAINTAIN README
 
 %files css -f .mfiles-css
-
 %files util -f .mfiles-util
 
 %files squiggle -f .mfiles-squiggle
@@ -226,18 +223,6 @@ cp -pr samples $RPM_BUILD_ROOT%{_datadir}/%{name}/
 
 
 %changelog
-* Fri Jul 10 2020 Jiri Vanek <jvanek@redhat.com> - 1.11-6
-- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11
-
-* Mon Jun 15 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.11-4
-- build with --xmvn-javadoc
-
-* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.11-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
-* Wed Jul 24 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.11-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
 * Wed May 15 2019 Mat Booth <mat.booth@redhat.com> - 1.11-1
 - Update to latest upstream release
 - Drop ancient obsoletes
@@ -280,7 +265,6 @@ cp -pr samples $RPM_BUILD_ROOT%{_datadir}/%{name}/
 
 * Thu Apr 20 2017 Michael Simacek <msimacek@redhat.com> - 1.9-1
 - Update to upstream version 1.9
-- Fixes CVE-2017-5662
 
 * Wed Apr 19 2017 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.8-8
 - Add missing requires on xmlgraphics-commons
@@ -347,7 +331,6 @@ cp -pr samples $RPM_BUILD_ROOT%{_datadir}/%{name}/
 
 * Fri Jun 28 2013 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.8-0.8.svn1230816
 - Rebuild to regenerate API documentation
-- CVE-2013-1571
 
 * Wed Feb 13 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.8-0.7.svn1230816
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild