From 6db1c0fad6f58a7023e957282d1ac638be8ddef5 Mon Sep 17 00:00:00 2001
From: Mat Booth <mat.booth@redhat.com>
Date: Mon, 17 Aug 2020 01:24:52 +0100
Subject: [PATCH] Add obsoletes/provides and compat aliases for old xsom
 package

---
 jaxb.spec | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/jaxb.spec b/jaxb.spec
index 5b42df8..7e7fcf1 100644
--- a/jaxb.spec
+++ b/jaxb.spec
@@ -3,7 +3,7 @@
 
 Name:           jaxb
 Version:        2.3.3
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        JAXB Reference Implementation
 # EDL-1.0 license is BSD-3-clause
 License:        BSD
@@ -172,6 +172,11 @@ classes.
 
 %package xsom
 Summary:        XML Schema Object Model
+# Xsom package was merged upstream into jaxb
+Provides:       xsom = %{version}-%{release}
+Obsoletes:      xsom < 20140514-7
+Provides:       xsom-javadoc = %{version}-%{release}
+Obsoletes:      xsom-javadoc < 20140514-7
 
 %description xsom
 XML Schema Object Model (XSOM) is a Java library that allows applications to
@@ -250,6 +255,7 @@ rm xjc/src/test/java/com/sun/tools/xjc/addon/code_injector/PluginImplTest.java
 # Compatibility aliases
 %mvn_alias org.glassfish.jaxb:jaxb-xjc "com.sun.xml.bind:jaxb-xjc"
 %mvn_alias org.glassfish.jaxb:jaxb-runtime org.glassfish.jaxb:jaxb-core
+%mvn_alias org.glassfish.jaxb:xsom com.sun.xsom:xsom
 
 # Don't install aggregator and parent poms
 %mvn_package com.sun.xml.bind.mvn: __noinstall
@@ -310,6 +316,9 @@ popd
 %endif
 
 %changelog
+* Mon Aug 17 2020 Mat Booth <mat.booth@redhat.com> - 2.3.3-3
+- Add obsoletes/provides and compat aliases for old xsom package
+
 * Tue Aug 11 2020 Mat Booth <mat.booth@redhat.com> - 2.3.3-2
 - Fastinfoset and Staxex are optional deps, this should be reflected in the OSGi
   metadata