From 2fbc343eb1b7a63be01e55a27664cbe01397197f Mon Sep 17 00:00:00 2001 From: "Endi S. Dewata" Date: Mon, 11 Dec 2023 14:18:09 +0700 Subject: [PATCH] Enable servlet-initializer subpackage Resolves: https://issues.redhat.com/browse/RHEL-12303 side-tag: c9s-build-side-2633-stack-gate --- resteasy.spec | 28 +++++++++++++++++++++++----- 1 file changed, 23 insertions(+), 5 deletions(-) diff --git a/resteasy.spec b/resteasy.spec index 46bc04a..851292a 100644 --- a/resteasy.spec +++ b/resteasy.spec @@ -3,7 +3,7 @@ Name: resteasy Version: 3.0.26 -Release: 15%{?dist} +Release: 16%{?dist} Summary: Framework for RESTful Web services and Java applications License: ASL 2.0 URL: http://resteasy.jboss.org/ @@ -50,9 +50,10 @@ Obsoletes: %{name} < %{version}-%{release} Conflicts: %{name} < %{version}-%{release} Provides: %{name} = %{version}-%{release} -Requires: pki-%{name}-client = %{version}-%{release} -Requires: pki-%{name}-core = %{version}-%{release} -Requires: pki-%{name}-jackson2-provider = %{version}-%{release} +Requires: pki-%{name}-client = %{version}-%{release} +Requires: pki-%{name}-core = %{version}-%{release} +Requires: pki-%{name}-jackson2-provider = %{version}-%{release} +Requires: pki-%{name}-servlet-initializer = %{version}-%{release} # subpackages removed in fedora 32 Obsoletes: %{name}-fastinfoset-provider < 3.0.26-1 @@ -97,6 +98,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 @@ -113,7 +123,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 @@ -169,12 +178,14 @@ find -name '*.jar' -print -delete %pom_remove_dep junit:junit providers/resteasy-atom %pom_remove_dep junit:junit providers/jaxb %pom_remove_dep junit:junit resteasy-jaxrs +%pom_remove_dep junit:junit resteasy-servlet-initializer # remove log4j dependency %pom_remove_dep log4j:log4j resteasy-jaxrs # 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 @@ -190,6 +201,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 . ' @@ -216,7 +228,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 Dec 11 2023 Red Hat PKI Team - 3.0.26-16 +- Enable servlet-initializer subpackage + * Fri Sep 24 2021 Red Hat PKI Team - 3.0.26-15 - Drop pki-resteasy-jaxb-provider