From b9ef6c3efa24d378c07a4f93b730fbcda97b186f Mon Sep 17 00:00:00 2001 From: Chris Kelley Date: Mon, 13 Sep 2021 12:11:13 +0100 Subject: [PATCH] Drop BuildRequires and Requires on glassfish-jaxb-api and jaxb-impl This commit introduces a temporarily bundled JAR, required to drop the runtime dependencies. This will be removed before RHEL 9 GA. Resolves: #2002594 --- pki-core.spec | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/pki-core.spec b/pki-core.spec index d0841a3..a83d971 100644 --- a/pki-core.spec +++ b/pki-core.spec @@ -942,8 +942,14 @@ ln -sf /usr/share/java/jakarta-annotations/jakarta.annotation-api.jar %{buildroo %endif # TEMP provide links to the temporarily bundled JAXB JAR (#2002594) -ln -sf /usr/share/java/jaxb-api.jar /usr/share/java/glassfish-jaxb-api/jakarta.xml.bind-api.jar -ln -sf /usr/share/java/glassfish-jaxb-api/jakarta.xml.bind-api.jar %{buildroot}/jakarta.xml.bind-api.jar +if test -f "/usr/share/java/glassfish-jaxb-api/jakarta.xml.bind-api.jar"; +then + echo "jakarta.xml.bind-api.jar already installed" +else + echo "Providing links to jakarta.xml.bind-api.jar" + sudo cp %{_topdir}/BUILD/pki-11.0.0-beta1/jakarta.xml.bind-api.jar /usr/share/java/glassfish-jaxb-api/jakarta.xml.bind-api.jar + sudo ln -sf /usr/share/java/glassfish-jaxb-api/jakarta.xml.bind-api.jar /usr/share/java/jaxb-api.jar +fi %if %{with server}