From 4e2b44e100826046cb403f856ad71e8b9c971921 Mon Sep 17 00:00:00 2001 From: "Endi S. Dewata" Date: Wed, 28 Apr 2021 12:56:50 -0500 Subject: [PATCH] Add Obsoletes and Conflicts Resolves: #1952530 --- jackson-modules-base.spec | 37 ++++++++++++++++++++++++++++--------- 1 file changed, 28 insertions(+), 9 deletions(-) diff --git a/jackson-modules-base.spec b/jackson-modules-base.spec index 5b1a7d0..acbbae3 100644 --- a/jackson-modules-base.spec +++ b/jackson-modules-base.spec @@ -2,7 +2,7 @@ Name: jackson-modules-base Version: 2.11.4 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Jackson modules: Base License: ASL 2.0 @@ -37,7 +37,9 @@ and are not data-type, data format, or JAX-RS provider modules. %package -n pki-%{name} Summary: Jackson modules: Base -Provides: %{name} +Obsoletes: %{name} < %{version}-%{release} +Conflicts: %{name} < %{version}-%{release} +Provides: %{name} = %{version}-%{release} %description -n pki-%{name} Jackson "base" modules: modules that build directly on databind, @@ -45,7 +47,9 @@ and are not data-type, data format, or JAX-RS provider modules. %package -n pki-jackson-module-afterburner Summary: Jackson module that uses byte-code generation to further speed up data binding -Provides: jackson-module-afterburner +Obsoletes: jackson-module-afterburner < %{version}-%{release} +Conflicts: jackson-module-afterburner < %{version}-%{release} +Provides: jackson-module-afterburner = %{version}-%{release} %description -n pki-jackson-module-afterburner Module that will add dynamic bytecode generation for standard Jackson POJO @@ -54,7 +58,9 @@ overhead. %package -n pki-jackson-module-guice Summary: Jackson module to make integration with Guice a bit easier -Provides: jackson-module-guice +Obsoletes: jackson-module-guice < %{version}-%{release} +Conflicts: jackson-module-guice < %{version}-%{release} +Provides: jackson-module-guice = %{version}-%{release} %description -n pki-jackson-module-guice This extension allows Jackson to delegate ObjectMapper creation and value @@ -62,7 +68,9 @@ injection to Guice when handling data bindings. %package -n pki-jackson-module-jaxb-annotations Summary: Support for using JAXB annotations as an alternative to "native" Jackson annotations -Provides: jackson-module-jaxb-annotations +Obsoletes: jackson-module-jaxb-annotations < %{version}-%{release} +Conflicts: jackson-module-jaxb-annotations < %{version}-%{release} +Provides: jackson-module-jaxb-annotations = %{version}-%{release} %description -n pki-jackson-module-jaxb-annotations This Jackson extension module provides support for using JAXB (javax.xml.bind) @@ -73,7 +81,9 @@ framework to read and write XML. %if %{without jp_minimal} %package -n pki-jackson-module-mrbean Summary: Functionality for implementing interfaces and abstract types dynamically -Provides: jackson-module-mrbean +Obsoletes: jackson-module-mrbean < %{version}-%{release} +Conflicts: jackson-module-mrbean < %{version}-%{release} +Provides: jackson-module-mrbean = %{version}-%{release} %description -n pki-jackson-module-mrbean Mr Bean is an extension that implements support for "POJO type materialization" @@ -83,7 +93,9 @@ and abstract classes, as part of deserialization. %package -n pki-jackson-module-osgi Summary: Jackson module to inject OSGI services in deserialized beans -Provides: jackson-module-osgi +Obsoletes: jackson-module-osgi < %{version}-%{release} +Conflicts: jackson-module-osgi < %{version}-%{release} +Provides: jackson-module-osgi = %{version}-%{release} %description -n pki-jackson-module-osgi This module provides a way to inject OSGI services into deserialized objects. @@ -94,7 +106,9 @@ while deserializing. %if %{without jp_minimal} %package -n pki-jackson-module-paranamer Summary: Jackson module that uses Paranamer to introspect names of constructor params -Provides: jackson-module-paranamer +Obsoletes: jackson-module-paranamer < %{version}-%{release} +Conflicts: jackson-module-paranamer < %{version}-%{release} +Provides: jackson-module-paranamer = %{version}-%{release} %description -n pki-jackson-module-paranamer Module that uses Paranamer library to auto-detect names of Creator @@ -103,7 +117,9 @@ Module that uses Paranamer library to auto-detect names of Creator %package -n pki-%{name}-javadoc Summary: Javadoc for %{name} -Provides: %{name}-javadoc +Obsoletes: %{name}-javadoc < %{version}-%{release} +Conflicts: %{name}-javadoc < %{version}-%{release} +Provides: %{name}-javadoc = %{version}-%{release} # Obsoletes standalone jackson-module-jaxb-annotations since F28 Obsoletes: jackson-module-jaxb-annotations-javadoc < %{version}-%{release} Provides: jackson-module-jaxb-annotations-javadoc = %{version}-%{release} @@ -194,6 +210,9 @@ rm osgi/src/test/java/com/fasterxml/jackson/module/osgi/InjectOsgiServiceTest.ja %license LICENSE NOTICE %changelog +* Wed Apr 28 2021 Red Hat PKI Team - 2.11.4-5 +- Add Obsoletes and Conflicts + * Fri Apr 23 2021 Red Hat PKI Team - 2.11.4-4 - Rename subpackages to pki-jackson