Accepting request 1205252 from Java:packages

Spec file cleanup

OBS-URL: https://build.opensuse.org/request/show/1205252
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/glassfish-el?expand=0&rev=3

glassfish-el.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed Oct  2 15:40:52 UTC 2024 - Fridrich Strba <fstrba@suse.com>
+
+- Spec file cleanup
+
 -------------------------------------------------------------------
 Thu Sep 21 05:41:51 UTC 2023 - Fridrich Strba <fstrba@suse.com>
 

glassfish-el.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package glassfish-el
 #
-# Copyright (c) 2023 SUSE LLC
+# Copyright (c) 2024 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -40,7 +40,7 @@ Source2:        http://www.apache.org/licenses/LICENSE-2.0.txt
 BuildRequires:  ant
 BuildRequires:  fdupes
 BuildRequires:  javacc
-BuildRequires:  javapackages-local
+BuildRequires:  javapackages-local >= 6
 Requires:       %{name}-api = %{version}
 BuildArch:      noarch
 %if %{with tests}
@@ -74,34 +74,11 @@ This package contains javadoc for %{name}.
 
 cp -p %{SOURCE2} .
 
-%pom_remove_plugin -r :findbugs-maven-plugin
-%pom_remove_plugin -r :findbugs-maven-plugin api
-%pom_remove_plugin -r :glassfish-copyright-maven-plugin
-
-# Useless tasks
-%pom_remove_plugin -r :maven-release-plugin
-%pom_remove_plugin -r :maven-release-plugin api
-%pom_remove_plugin -r :maven-source-plugin
-%pom_remove_plugin -r :maven-source-plugin api
-
-# Fix javadoc task
-%pom_xpath_remove "pom:plugin[pom:artifactId ='maven-javadoc-plugin']/pom:executions/pom:execution/pom:goals"
-%pom_xpath_remove "pom:plugin[pom:artifactId ='maven-javadoc-plugin']/pom:executions/pom:execution/pom:goals" api
-%pom_xpath_remove "pom:plugin[pom:artifactId ='maven-javadoc-plugin']/pom:executions/pom:execution/pom:configuration/pom:sourcepath"
-
 # Fix apis version
 %pom_xpath_set "pom:project/pom:version" %{verbase}-%{reltag} api
 # Add missing build dep
 %pom_add_dep javax.el:javax.el-api:'${project.version}'
 
-%{mvn_file} javax.el:javax.el-api %{name}-api
-%{mvn_alias} javax.el:javax.el-api "javax.el:el-api" "org.glassfish:javax.el-api"
-
-%{mvn_file} org.glassfish:javax.el %{name}
-%{mvn_alias} org.glassfish:javax.el "org.eclipse.jetty.orbit:com.sun.el" "org.glassfish.web:javax.el" "org.glassfish:javax.el-impl"
-
-%pom_remove_parent . api
-
 # Let javacc regenerate this one to avoid some type incompatibilities
 rm impl/src/main/java/com/sun/el/parser/TokenMgrError.java
 
@@ -121,9 +98,9 @@ install -pm 0644 api/target/javax.el-api-%{verbase}-%{reltag}.jar %{buildroot}%{
 install -pm 0644 target/javax.el-%{verbase}-%{reltag}.jar %{buildroot}%{_javadir}/%{name}.jar
 # pom
 install -dm 0755 %{buildroot}%{_mavenpomdir}
-install -pm 0644 api/pom.xml %{buildroot}%{_mavenpomdir}/%{name}-api.pom
+%{mvn_install_pom} api/pom.xml %{buildroot}%{_mavenpomdir}/%{name}-api.pom
 %add_maven_depmap %{name}-api.pom %{name}-api.jar -a "javax.el:el-api,org.glassfish:javax.el-api" -f api
-install -pm 0644 pom.xml %{buildroot}%{_mavenpomdir}/%{name}.pom
+%{mvn_install_pom} pom.xml %{buildroot}%{_mavenpomdir}/%{name}.pom
 %add_maven_depmap %{name}.pom %{name}.jar -a "org.eclipse.jetty.orbit:com.sun.el,org.glassfish.web:javax.el,org.glassfish:javax.el-impl"
 # javadoc
 install -dm 0755 %{buildroot}%{_javadocdir}/%{name}/api