From bd5a0e1d10a78aca77869577e55a4e67a500e2a8 Mon Sep 17 00:00:00 2001 From: eabdullin Date: Fri, 7 Jun 2024 11:33:10 +0000 Subject: [PATCH] Import from AlmaLinux stable repository --- SPECS/glassfish-jaxb.spec | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/SPECS/glassfish-jaxb.spec b/SPECS/glassfish-jaxb.spec index 5b2d957..e18322b 100644 --- a/SPECS/glassfish-jaxb.spec +++ b/SPECS/glassfish-jaxb.spec @@ -1,6 +1,6 @@ Name: glassfish-jaxb Version: 2.2.11 -Release: 11%{?dist} +Release: 12%{?dist} Summary: JAXB Reference Implementation License: CDDL-1.1 and GPLv2 with exceptions @@ -9,10 +9,10 @@ URL: http://jaxb.java.net Source0: https://jaxb.java.net/%{version}/jaxb-ri-%{version}.src.zip BuildRequires: maven-local -BuildRequires: mvn(com.sun.istack:istack-commons-runtime) -BuildRequires: mvn(com.sun.istack:istack-commons-tools) +BuildRequires: mvn(com.sun.istack:istack-commons-runtime) < 3.0 +BuildRequires: mvn(com.sun.istack:istack-commons-tools) < 3.0 BuildRequires: mvn(com.sun:tools) -BuildRequires: mvn(com.sun.xml.fastinfoset:FastInfoset) +BuildRequires: mvn(com.sun.xml.fastinfoset:FastInfoset) < 2.0 BuildRequires: mvn(javax.xml.bind:jaxb-api) BuildRequires: mvn(net.java:jvnet-parent:pom:) BuildRequires: mvn(org.apache.ant:ant) @@ -20,7 +20,7 @@ BuildRequires: mvn(org.apache.maven.plugins:maven-dependency-plugin) BuildRequires: mvn(org.apache.maven.plugins:maven-enforcer-plugin) BuildRequires: mvn(org.apache.maven.plugins:maven-source-plugin) BuildRequires: mvn(org.codehaus.mojo:build-helper-maven-plugin) -BuildRequires: mvn(org.jvnet.staxex:stax-ex) +BuildRequires: mvn(org.jvnet.staxex:stax-ex) < 2.0 BuildRequires: mvn(relaxngDatatype:relaxngDatatype) Requires: %{name}-bom = %{version}-%{release} @@ -213,6 +213,9 @@ This package contains the API documentation for %{name}. %changelog +* Mon Dec 04 2023 Marco Fargetta - 2.2.11-12 +- Update requiremnts to avoid conflicts with jaxb module packages + * Tue Aug 07 2018 Fraser Tweedale - 2.2.11-11 - Avoid dependencies on msv and glassfish-dtd-parser