From ca507f1c587f06b75356cc40bb77c643ee3b9605 Mon Sep 17 00:00:00 2001
From: Fabio Valentini <decathorpe@gmail.com>
Date: Jul 23 2019 18:23:28 +0000
Subject: disable groovy support by default


---

diff --git a/apache-commons-jci.spec b/apache-commons-jci.spec
index 230331d..fb17e3f 100644
--- a/apache-commons-jci.spec
+++ b/apache-commons-jci.spec
@@ -1,3 +1,5 @@
+%bcond_with     groovy
+
 %global base_name  jci
 %global short_name commons-%{base_name}
 %global namedreltag %{nil}
@@ -5,7 +7,7 @@
 
 Name:          apache-commons-jci
 Version:       1.1
-Release:       8%{?dist}
+Release:       9%{?dist}
 Summary:       Commons Java Compiler Interface
 License:       ASL 2.0
 URL:           http://commons.apache.org/jci/
@@ -13,21 +15,20 @@ Source0:       http://www.apache.org/dist/commons/%{base_name}/source/%{short_na
 Patch0:        %{name}-1.1-janino27.patch
 
 BuildRequires: maven-local
-BuildRequires: maven-antrun-plugin
-BuildRequires: maven-plugin-bundle
-BuildRequires: ecj >= 3.4.2-13
-BuildRequires: mvn(commons-logging:commons-logging)
+BuildRequires: mvn(asm:asm)
 BuildRequires: mvn(commons-io:commons-io)
+BuildRequires: mvn(commons-logging:commons-logging)
+BuildRequires: mvn(junit:junit)
+BuildRequires: mvn(org.apache.commons:commons-lang3)
 BuildRequires: mvn(org.apache.commons:commons-parent:pom:)
+BuildRequires: mvn(org.apache.maven.plugins:maven-antrun-plugin)
+%if %{with groovy}
 BuildRequires: mvn(org.codehaus.groovy:groovy)
+%endif
 BuildRequires: mvn(org.codehaus.janino:janino)
+BuildRequires: mvn(org.eclipse.jdt.core.compiler:ecj)
 BuildRequires: mvn(rhino:js)
 
-# test deps
-BuildRequires: mvn(junit:junit)
-BuildRequires: objectweb-asm3
-BuildRequires: mvn(org.apache.commons:commons-lang3)
-
 Requires:      %{name}-core = %{version}-%{release}
 BuildArch:     noarch
 
@@ -71,11 +72,13 @@ Summary:       Commons Java Compiler Interface - eclipse
 %description eclipse
 Commons JCI compiler implementation for the eclipse compiler.
 
+%if %{with groovy}
 %package groovy
 Summary:       Commons Java Compiler Interface - groovy
 
 %description groovy
 Commons JCI compiler implementation for the groovy compiler.
+%endif
 
 %package janino
 Summary:       Commons Java Compiler Interface - janino
@@ -96,6 +99,11 @@ find . -name "*.jar" -delete
 
 %patch0 -p1
 
+%if %{without groovy}
+# disable groovy support
+%pom_disable_module compilers/groovy
+%endif
+
 # require old version of jdependency
 %pom_disable_module examples
 
@@ -108,16 +116,20 @@ find . -name "*.jar" -delete
 %pom_remove_plugin :maven-assembly-plugin
 %pom_remove_plugin :maven-site-plugin
 
+%if %{with groovy}
 %pom_xpath_set "pom:dependencyManagement/pom:dependencies/pom:dependency[pom:groupId = 'org.codehaus.groovy']/pom:artifactId" groovy
 %pom_xpath_set "pom:dependencyManagement/pom:dependencies/pom:dependency[pom:groupId = 'org.codehaus.groovy']/pom:version" 1.8.9
 %pom_xpath_set "pom:dependencies/pom:dependency[pom:groupId = 'org.codehaus.groovy']/pom:artifactId" groovy compilers/groovy
 %pom_xpath_inject "pom:dependencies/pom:dependency[pom:groupId = 'org.codehaus.groovy']" "<version>1.8.9</version>" compilers/groovy
+%endif
 
 # Fix installation directory      
 %mvn_file :%{short_name}-core    %{short_name}/%{short_name}-core
 %mvn_file :%{short_name}-fam     %{short_name}/%{short_name}-fam
 %mvn_file :%{short_name}-eclipse %{short_name}/%{short_name}-eclipse
+%if %{with groovy}
 %mvn_file :%{short_name}-groovy  %{short_name}/%{short_name}-groovy
+%endif
 %mvn_file :%{short_name}-janino  %{short_name}/%{short_name}-janino
 %mvn_file :%{short_name}-rhino   %{short_name}/%{short_name}-rhino
 
@@ -143,13 +155,19 @@ find . -name "*.jar" -delete
 
 %files eclipse -f .mfiles-%{short_name}-eclipse
 
+%if %{with groovy}
 %files groovy -f .mfiles-%{short_name}-groovy
+%endif
 
 %files janino -f .mfiles-%{short_name}-janino
 
 %files rhino -f .mfiles-%{short_name}-rhino
 
 %changelog
+* Tue Jul 23 2019 Fabio Valentini <decathorpe@gmail.com> - 1.1-9
+- Disable groovy support by default.
+- Regenerate BuildRequires.
+
 * Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.1-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild