From 4069b50f6cba74476f247de9890dd5b598ef156a Mon Sep 17 00:00:00 2001
From: Alexander Kurtakov <akurtako@redhat.com>
Date: Tue, 9 Mar 2021 00:19:32 +0200
Subject: [PATCH] Remove jython dependency

Jython is orphaned in fedora so what was the minimal build is the default one now.
No options to do full build are preserved for the sake of simplicity.
---
 batik.spec | 24 +++++-------------------
 1 file changed, 5 insertions(+), 19 deletions(-)

diff --git a/batik.spec b/batik.spec
index 7f6802b..864ec35 100644
--- a/batik.spec
+++ b/batik.spec
@@ -1,11 +1,8 @@
-# Allow conditionally building without optional deps on scripting libs rhino and jython
-%bcond_with jp_minimal
-
 %global classpath batik:xml-commons-apis:xml-commons-apis-ext:xmlgraphics-commons
 
 Name:           batik
 Version:        1.14
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Scalable Vector Graphics for Java
 License:        ASL 2.0 and W3C
 URL:            https://xmlgraphics.apache.org/batik/
@@ -22,10 +19,6 @@ BuildRequires:  mvn(org.apache.felix:maven-bundle-plugin)
 BuildRequires:  mvn(org.apache.maven.plugins:maven-assembly-plugin)
 BuildRequires:  mvn(org.apache.maven.plugins:maven-dependency-plugin)
 BuildRequires:  mvn(org.apache.xmlgraphics:xmlgraphics-commons)
-%if %{without jp_minimal}
-BuildRequires:  mvn(org.mozilla:rhino)
-BuildRequires:  mvn(org.python:jython)
-%endif
 BuildRequires:  mvn(xalan:xalan)
 BuildRequires:  mvn(xml-apis:xml-apis)
 BuildRequires:  mvn(xml-apis:xml-apis-ext)
@@ -54,10 +47,6 @@ Summary:        Batik SVG browser
 Requires:       javapackages-tools
 # Requires AWT, so can't rely on java-headless alone
 Requires:       java
-%if %{without jp_minimal}
-# Soft requirement on optional scripting libs
-Recommends: mvn(org.mozilla:rhino)
-%endif
 
 %description    squiggle
 The Squiggle SVG Browser lets you view SVG file, zoom, pan and rotate
@@ -91,10 +80,6 @@ Summary:        Batik SVG rasterizer
 # Explicit requires for javapackages-tools since rasterizer-script
 # uses /usr/share/java-utils/java-functions
 Requires:       javapackages-tools
-%if %{without jp_minimal}
-# Soft requirement on optional scripting libs
-Recommends: mvn(org.mozilla:rhino)
-%endif
 
 %description    rasterizer
 The SVG Rasterizer is a utility that can convert SVG files to a raster
@@ -158,8 +143,7 @@ done
 # The "old-test" module cannot be built due to missing deps in Fedora
 %pom_disable_module batik-test-old
 
-%if %{with jp_minimal}
-# Remove optional deps on rhino and jython for minimal build
+# Remove optional deps on rhino and jython
 %pom_remove_dep :rhino batik-{bridge,script}
 %pom_remove_dep :jython batik-script
 rm -rf batik-script/src/main/java/org/apache/batik/script/{jpython,rhino}
@@ -170,7 +154,6 @@ rm batik-bridge/src/main/java/org/apache/batik/bridge/RhinoInterpreterFactory.ja
 rm batik-bridge/src/main/java/org/apache/batik/bridge/EventTargetWrapper.java
 rm batik-bridge/src/main/java/org/apache/batik/bridge/GlobalWrapper.java
 rm batik-bridge/src/main/java/org/apache/batik/bridge/WindowWrapper.java
-%endif
 
 %mvn_package :batik-squiggle squiggle
 %mvn_package :batik-squiggle-ext squiggle
@@ -238,6 +221,9 @@ cp -pr samples $RPM_BUILD_ROOT%{_datadir}/%{name}/
 
 
 %changelog
+* Tue Mar 09 2021 Aleksandar Kurtakov <akurtako@redhat.com> - 1.14-2
+- Enforce minimal build as jython is orphaned
+
 * Mon Mar 01 2021 Jie Kang <jkang@redhat.com> - 1.14-1
 - Update to latest upstream release