Sync from SUSE:SLFO:1.1 apache-commons-jexl revision cb5ea80caa5d6d3feb3140bc7c9f9e77

apache-commons-jexl.changes

@@ -1,8 +1,3 @@
--------------------------------------------------------------------
-Wed Oct  2 15:31:38 UTC 2024 - Fridrich Strba <fstrba@suse.com>
-
-- Spec file cleanup
-
 -------------------------------------------------------------------
 Tue Feb 20 10:42:41 UTC 2024 - Dominique Leuenberger <dimstar@opensuse.org>
 

apache-commons-jexl.spec

@@ -1,7 +1,7 @@
 #
-# spec file for package apache-commons-jexl
+# spec file
 #
-# Copyright (c) 2024 SUSE LLC
+# 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
@@ -39,7 +39,8 @@ BuildRequires:  apache-commons-logging
 BuildRequires:  fdupes
 BuildRequires:  java-devel >= 1.8
 BuildRequires:  javacc
-BuildRequires:  javapackages-local >= 6
+BuildRequires:  javapackages-local
+Requires:       mvn(commons-logging:commons-logging)
 Provides:       %{short_name} = %{version}-%{release}
 BuildArch:      noarch
 %if %{with tests}
@@ -92,7 +93,7 @@ mkdir -p lib
 build-jar-repository -s lib commons-logging
 
 # commons-jexl
-ant \
+%{ant} \
 %if %{without tests}
   -Dtest.skip=true \
 %endif
@@ -116,9 +117,9 @@ install -pm 0644 jexl2-compat/target/%{short_name}-compat-%{compatver}.jar %{bui
 ln -sf %{name}/%{short_name}-compat.jar %{buildroot}%{_javadir}/%{short_name}-compat.jar
 # poms
 install -dm 0755 %{buildroot}%{_mavenpomdir}/%{name}
-%{mvn_install_pom} pom.xml %{buildroot}%{_mavenpomdir}/%{name}/%{short_name}.pom
+install -pm 0644 pom.xml %{buildroot}%{_mavenpomdir}/%{name}/%{short_name}.pom
 %add_maven_depmap %{name}/%{short_name}.pom %{name}/%{short_name}.jar
-%{mvn_install_pom} jexl2-compat/pom.xml  %{buildroot}%{_mavenpomdir}/%{name}/%{short_name}-compat.pom
+install -pm 0644 jexl2-compat/pom.xml  %{buildroot}%{_mavenpomdir}/%{name}/%{short_name}-compat.pom
 %add_maven_depmap %{name}/%{short_name}-compat.pom %{name}/%{short_name}-compat.jar
 # javadoc
 install -dm 0755 %{buildroot}%{_javadocdir}/%{name}/jexl2-compat