From 0a4e8db84fe35f9c64ffcb2559afacf5c7751a3e Mon Sep 17 00:00:00 2001
From: "Endi S. Dewata" <edewata@redhat.com>
Date: Wed, 28 Apr 2021 14:33:21 -0500
Subject: [PATCH] Add Obsoletes and Conflicts

Resolves: #1952530
---
 resteasy.spec | 33 +++++++++++++++++++++++++--------
 1 file changed, 25 insertions(+), 8 deletions(-)

diff --git a/resteasy.spec b/resteasy.spec
index 6081b1e..fec98ca 100644
--- a/resteasy.spec
+++ b/resteasy.spec
@@ -3,7 +3,7 @@
 
 Name:           resteasy
 Version:        3.0.26
-Release:        9%{?dist}
+Release:        10%{?dist}
 Summary:        Framework for RESTful Web services and Java applications
 License:        ASL 2.0 and CDDL
 URL:            http://resteasy.jboss.org/
@@ -47,7 +47,9 @@ This package contains
 
 %package -n     pki-%{name}
 Summary:        Framework for RESTful Web services and Java applications
-Provides:       %{name}
+Obsoletes:      %{name} < %{version}-%{release}
+Conflicts:      %{name} < %{version}-%{release}
+Provides:       %{name} = %{version}-%{release}
 
 Requires:       pki-%{name}-atom-provider     = %{version}-%{release}
 Requires:       pki-%{name}-client            = %{version}-%{release}
@@ -72,7 +74,9 @@ Obsoletes:      %{name}-yaml-provider < 3.0.26-1
 
 %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}
 
 %description -n pki-%{name}-javadoc
 This package contains the API documentation for %{name}.
@@ -80,35 +84,45 @@ This package contains the API documentation for %{name}.
 %package -n     pki-%{name}-core
 Summary:        Core modules for %{name}
 Obsoletes:      resteasy-jaxrs-api < 3.0.7
-Provides:       %{name}-core
+Obsoletes:      %{name}-core < %{version}-%{release}
+Conflicts:      %{name}-core < %{version}-%{release}
+Provides:       %{name}-core = %{version}-%{release}
 
 %description -n pki-%{name}-core
 %{extdesc} %{summary}.
 
 %package -n     pki-%{name}-atom-provider
 Summary:        Module atom-provider for %{name}
-Provides:       %{name}-atom-provider
+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
 Summary:        Module jackson2-provider for %{name}
-Provides:       %{name}-jackson2-provider
+Obsoletes:      %{name}-jackson2-provider < %{version}-%{release}
+Conflicts:      %{name}-jackson2-provider < %{version}-%{release}
+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}
-Provides:       %{name}-jaxb-provider
+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}
-Provides:       %{name}-client
+Obsoletes:      %{name}-client < %{version}-%{release}
+Conflicts:      %{name}-client < %{version}-%{release}
+Provides:       %{name}-client = %{version}-%{release}
 
 %description -n pki-%{name}-client
 %{extdesc} %{summary}.
@@ -224,6 +238,9 @@ find -name '*.jar' -print -delete
 %license License.html
 
 %changelog
+* Wed Apr 28 2021 Red Hat PKI Team <rhcs-maint@redhat.com> - 3.0.26-10
+- Add Obsoletes and Conflicts
+
 * Thu Apr 22 2021 Red Hat PKI Team <rhcs-maint@redhat.com> - 3.0.26-9
 - Rename subpackages to pki-resteasy