From 4457f654e07e4891e266c50ef507eff0a66ac424 Mon Sep 17 00:00:00 2001 From: Mat Booth Date: Fri, 5 Feb 2021 15:10:05 +0000 Subject: [PATCH] Add obsoletes/provides and compat aliases for old relaxngDatatype package --- jaxb.spec | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/jaxb.spec b/jaxb.spec index 48a7ac9..ba7a4ff 100644 --- a/jaxb.spec +++ b/jaxb.spec @@ -3,7 +3,7 @@ Name: jaxb Version: 2.3.3 -Release: 5%{?dist} +Release: 6%{?dist} Summary: JAXB Reference Implementation # EDL-1.0 license is BSD-3-clause License: BSD @@ -188,6 +188,11 @@ input. %package relaxng-datatype Summary: RelaxNG Datatype +# RelaxNG was subsumed into jaxb upstream +Provides: relaxngDatatype = 1:%{version}-%{release} +Obsoletes: relaxngDatatype < 2011.1-16 +Provides: relaxngDatatype-javadoc = 1:%{version}-%{release} +Obsoletes: relaxngDatatype-javadoc < 2011.1-16 %description relaxng-datatype RelaxNG Datatype library. @@ -256,6 +261,7 @@ rm xjc/src/test/java/com/sun/tools/xjc/addon/code_injector/PluginImplTest.java %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 +%mvn_alias com.sun.xml.bind.external:relaxng-datatype com.github.relaxng:relaxngDatatype relaxngDatatype:relaxngDatatype # Don't install aggregator and parent poms %mvn_package com.sun.xml.bind.mvn: __noinstall @@ -316,6 +322,9 @@ popd %endif %changelog +* Fri Feb 5 2021 Mat Booth - 2.3.3-6 +- Add obsoletes/provides and compat aliases for old relaxngDatatype package + * Tue Jan 26 2021 Fedora Release Engineering - 2.3.3-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild