diff --git a/resteasy.spec b/resteasy.spec index 19faf0e..46bc04a 100644 --- a/resteasy.spec +++ b/resteasy.spec @@ -3,7 +3,7 @@ Name: resteasy Version: 3.0.26 -Release: 14%{?dist} +Release: 15%{?dist} Summary: Framework for RESTful Web services and Java applications License: ASL 2.0 URL: http://resteasy.jboss.org/ @@ -15,9 +15,7 @@ BuildArch: noarch BuildRequires: maven-local BuildRequires: mvn(commons-io:commons-io) -BuildRequires: mvn(com.sun.xml.bind:jaxb-impl) BuildRequires: mvn(jakarta.activation:jakarta.activation-api) -BuildRequires: mvn(javax.xml.bind:jaxb-api) BuildRequires: mvn(org.apache.httpcomponents:httpclient) BuildRequires: mvn(org.apache.maven.plugins:maven-source-plugin) BuildRequires: mvn(org.apache.tomcat:tomcat-servlet-api) @@ -55,7 +53,6 @@ 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}-jaxb-provider = %{version}-%{release} # subpackages removed in fedora 32 Obsoletes: %{name}-fastinfoset-provider < 3.0.26-1 @@ -91,15 +88,6 @@ Provides: %{name}-jackson2-provider = %{version}-%{release} %description -n pki-%{name}-jackson2-provider %{extdesc} %{summary}. -%package -n pki-%{name}-jaxb-provider -Summary: Module jaxb-provider for %{name} -Obsoletes: %{name}-jaxb-provider < %{version}-%{release} -Conflicts: %{name}-jaxb-provider < %{version}-%{release} -Provides: %{name}-jaxb-provider = %{version}-%{release} - -%description -n pki-%{name}-jaxb-provider -%{extdesc} %{summary}. - %package -n pki-%{name}-client Summary: Client for %{name} Obsoletes: %{name}-client < %{version}-%{release} @@ -144,6 +132,7 @@ pushd providers %pom_disable_module resteasy-html %pom_disable_module resteasy-validator-provider-11 %pom_disable_module yaml +%pom_disable_module jaxb popd find -name '*.jar' -print -delete @@ -200,7 +189,6 @@ find -name '*.jar' -print -delete %mvn_package ":resteasy-jaxrs-all" core %mvn_package ":resteasy-pom" core %mvn_package ":resteasy-jackson2-provider" jackson2-provider -%mvn_package ":resteasy-jaxb-provider" jaxb-provider %mvn_package ":resteasy-client" client # Disable useless artifacts generation, package __noinstall do not work @@ -225,18 +213,18 @@ find -name '*.jar' -print -delete %files -n pki-%{name}-jackson2-provider -f .mfiles-jackson2-provider %license License.html -%files -n pki-%{name}-jaxb-provider -f .mfiles-jaxb-provider -%license License.html - %files -n pki-%{name}-client -f .mfiles-client %license License.html %changelog +* Fri Sep 24 2021 Red Hat PKI Team - 3.0.26-15 +- Drop pki-resteasy-jaxb-provider + * Tue Aug 10 2021 Mohan Boddu - 3.0.26-14 - Rebuilt for IMA sigs, glibc 2.34, aarch64 flags Related: rhbz#1991688 -* Fri Jun 18 2021 Dogtag PKI Team - 3.0.26-13 +* Fri Jun 18 2021 Red Hat PKI Team - 3.0.26-13 - Replace jboss-annotations-1.2-api with jakarta-annotations - Drop log4j dependency - Add jakarta-activation dependency