Drop pki-resteasy-javadoc and pki-resteasy-atom-provider

Resolves: #1952530
This commit is contained in:
Endi S. Dewata 2021-05-21 13:51:15 -05:00
parent b5811c294e
commit 4be3d5c2ad
1 changed files with 7 additions and 28 deletions

View File

@ -3,7 +3,7 @@
Name: resteasy Name: resteasy
Version: 3.0.26 Version: 3.0.26
Release: 11%{?dist} Release: 12%{?dist}
Summary: Framework for RESTful Web services and Java applications Summary: Framework for RESTful Web services and Java applications
License: ASL 2.0 License: ASL 2.0
URL: http://resteasy.jboss.org/ URL: http://resteasy.jboss.org/
@ -51,7 +51,6 @@ Obsoletes: %{name} < %{version}-%{release}
Conflicts: %{name} < %{version}-%{release} Conflicts: %{name} < %{version}-%{release}
Provides: %{name} = %{version}-%{release} Provides: %{name} = %{version}-%{release}
Requires: pki-%{name}-atom-provider = %{version}-%{release}
Requires: pki-%{name}-client = %{version}-%{release} Requires: pki-%{name}-client = %{version}-%{release}
Requires: pki-%{name}-core = %{version}-%{release} Requires: pki-%{name}-core = %{version}-%{release}
Requires: pki-%{name}-jackson2-provider = %{version}-%{release} Requires: pki-%{name}-jackson2-provider = %{version}-%{release}
@ -72,15 +71,6 @@ Obsoletes: %{name}-yaml-provider < 3.0.26-1
%description -n pki-%{name} %description -n pki-%{name}
%{desc} %{desc}
%package -n pki-%{name}-javadoc
Summary: Javadoc for %{name}
Obsoletes: %{name}-javadoc < %{version}-%{release}
Conflicts: %{name}-javadoc < %{version}-%{release}
Provides: %{name}-javadoc = %{version}-%{release}
%description -n pki-%{name}-javadoc
This package contains the API documentation for %{name}.
%package -n pki-%{name}-core %package -n pki-%{name}-core
Summary: Core modules for %{name} Summary: Core modules for %{name}
Obsoletes: resteasy-jaxrs-api < 3.0.7 Obsoletes: resteasy-jaxrs-api < 3.0.7
@ -91,15 +81,6 @@ Provides: %{name}-core = %{version}-%{release}
%description -n pki-%{name}-core %description -n pki-%{name}-core
%{extdesc} %{summary}. %{extdesc} %{summary}.
%package -n pki-%{name}-atom-provider
Summary: Module atom-provider for %{name}
Obsoletes: %{name}-atom-provider < %{version}-%{release}
Conflicts: %{name}-atom-provider < %{version}-%{release}
Provides: %{name}-atom-provider = %{version}-%{release}
%description -n pki-%{name}-atom-provider
%{extdesc} %{summary}.
%package -n pki-%{name}-jackson2-provider %package -n pki-%{name}-jackson2-provider
Summary: Module jackson2-provider for %{name} Summary: Module jackson2-provider for %{name}
Obsoletes: %{name}-jackson2-provider < %{version}-%{release} Obsoletes: %{name}-jackson2-provider < %{version}-%{release}
@ -159,6 +140,7 @@ pushd providers
%pom_disable_module jettison %pom_disable_module jettison
%pom_disable_module json-p-ee7 %pom_disable_module json-p-ee7
%pom_disable_module multipart %pom_disable_module multipart
%pom_disable_module resteasy-atom
%pom_disable_module resteasy-html %pom_disable_module resteasy-html
%pom_disable_module resteasy-validator-provider-11 %pom_disable_module resteasy-validator-provider-11
%pom_disable_module yaml %pom_disable_module yaml
@ -167,6 +149,7 @@ popd
find -name '*.jar' -print -delete find -name '*.jar' -print -delete
%pom_remove_plugin :maven-clover2-plugin %pom_remove_plugin :maven-clover2-plugin
%pom_remove_plugin :maven-javadoc-plugin
# remove activation.jar dependencies # remove activation.jar dependencies
%pom_remove_dep -r javax.activation:activation resteasy-jaxrs resteasy-spring %pom_remove_dep -r javax.activation:activation resteasy-jaxrs resteasy-spring
@ -198,7 +181,6 @@ find -name '*.jar' -print -delete
%mvn_package ":providers-pom" core %mvn_package ":providers-pom" core
%mvn_package ":resteasy-jaxrs-all" core %mvn_package ":resteasy-jaxrs-all" core
%mvn_package ":resteasy-pom" core %mvn_package ":resteasy-pom" core
%mvn_package ":resteasy-atom-provider" atom-provider
%mvn_package ":resteasy-jackson2-provider" jackson2-provider %mvn_package ":resteasy-jackson2-provider" jackson2-provider
%mvn_package ":resteasy-jaxb-provider" jaxb-provider %mvn_package ":resteasy-jaxb-provider" jaxb-provider
%mvn_package ":resteasy-client" client %mvn_package ":resteasy-client" client
@ -210,7 +192,7 @@ find -name '*.jar' -print -delete
</configuration>' </configuration>'
%build %build
%mvn_build -f %mvn_build -f -j
%install %install
%mvn_install %mvn_install
@ -222,9 +204,6 @@ find -name '*.jar' -print -delete
%files -n pki-%{name}-core -f .mfiles-core %files -n pki-%{name}-core -f .mfiles-core
%license License.html %license License.html
%files -n pki-%{name}-atom-provider -f .mfiles-atom-provider
%license License.html
%files -n pki-%{name}-jackson2-provider -f .mfiles-jackson2-provider %files -n pki-%{name}-jackson2-provider -f .mfiles-jackson2-provider
%license License.html %license License.html
@ -234,10 +213,10 @@ find -name '*.jar' -print -delete
%files -n pki-%{name}-client -f .mfiles-client %files -n pki-%{name}-client -f .mfiles-client
%license License.html %license License.html
%files -n pki-%{name}-javadoc -f .mfiles-javadoc
%license License.html
%changelog %changelog
* Fri May 21 2021 Red Hat PKI Team <rhcs-maint@redhat.com> - 3.0.26-12
- Drop pki-resteasy-javadoc and pki-resteasy-atom-provider
* Wed Apr 28 2021 Red Hat PKI Team <rhcs-maint@redhat.com> - 3.0.26-11 * Wed Apr 28 2021 Red Hat PKI Team <rhcs-maint@redhat.com> - 3.0.26-11
- Fix license - Fix license