From df43d962eb3f94b29c02b8167dcdf915f8ca5970 Mon Sep 17 00:00:00 2001 From: "Endi S. Dewata" Date: Mon, 1 May 2023 10:31:21 -0500 Subject: [PATCH] Enable servlet-initializer subpackage --- resteasy.spec | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/resteasy.spec b/resteasy.spec index cbaa42a..65ae469 100644 --- a/resteasy.spec +++ b/resteasy.spec @@ -101,6 +101,15 @@ Provides: %{name}-client = %{version}-%{release} %description -n pki-%{name}-client %{extdesc} %{summary}. +%package -n pki-%{name}-servlet-initializer +Summary: %{name} Servlet Initializer +Obsoletes: %{name}-servlet-initializer < %{version}-%{release} +Conflicts: %{name}-servlet-initializer < %{version}-%{release} +Provides: %{name}-servlet-initializer = %{version}-%{release} + +%description -n pki-%{name}-servlet-initializer +%{extdesc} %{summary}. + %prep %autosetup -n Resteasy-%{namedversion} -p 1 @@ -117,7 +126,6 @@ Provides: %{name}-client = %{version}-%{release} %pom_disable_module resteasy-jsapi %pom_disable_module resteasy-jsapi-testing %pom_disable_module resteasy-links -%pom_disable_module resteasy-servlet-initializer %pom_disable_module resteasy-spring %pom_disable_module resteasy-wadl %pom_disable_module resteasy-wadl-undertow-connector @@ -179,12 +187,14 @@ find -name '*.jar' -print -delete # depend on servlet-api from pki-servlet-4.0-api %pom_change_dep org.jboss.spec.javax.servlet: org.apache.tomcat:tomcat-servlet-api resteasy-jaxrs +%pom_change_dep org.jboss.spec.javax.servlet: org.apache.tomcat:tomcat-servlet-api resteasy-servlet-initializer %pom_change_dep org.jboss.spec.javax.servlet: org.apache.tomcat:tomcat-servlet-api providers/abdera-atom %pom_change_dep org.jboss.spec.javax.servlet: org.apache.tomcat:tomcat-servlet-api providers/jaxb %pom_change_dep org.jboss.spec.javax.servlet: org.apache.tomcat:tomcat-servlet-api providers/jackson2 # add dependencies for EE APIs that were removed in Java 11 %pom_add_dep jakarta.xml.bind:jakarta.xml.bind-api resteasy-jaxrs +%pom_add_dep jakarta.xml.bind:jakarta.xml.bind-api resteasy-servlet-initializer %pom_remove_plugin :maven-clean-plugin @@ -194,6 +204,7 @@ find -name '*.jar' -print -delete %mvn_package ":resteasy-pom" core %mvn_package ":resteasy-jackson2-provider" jackson2-provider %mvn_package ":resteasy-client" client +%mvn_package ":resteasy-servlet-initializer" servlet-initializer # Disable useless artifacts generation, package __noinstall do not work %pom_add_plugin org.apache.maven.plugins:maven-source-plugin . ' @@ -220,7 +231,13 @@ find -name '*.jar' -print -delete %files -n pki-%{name}-client -f .mfiles-client %license License.html +%files -n pki-%{name}-servlet-initializer -f .mfiles-servlet-initializer +%license License.html + %changelog +* Mon May 01 2023 Dogtag PKI Team - 3.0.26-24 +- Enable servlet-initializer subpackage + * Fri Feb 03 2023 Chris Kelley - 3.0.26-23 - Remove dependency on jaxb-api2 compat package