From 501a49788e22a6a346513577f19a741ed0e3b75d Mon Sep 17 00:00:00 2001 From: jmatsuok Date: Mon, 5 Dec 2022 18:50:46 +0000 Subject: [PATCH] Fix the package provides exclusions to fix CI and installation errors Related: rhbz#2122401 --- jmc.spec | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/jmc.spec b/jmc.spec index 2d7a8d5..a35034f 100644 --- a/jmc.spec +++ b/jmc.spec @@ -17,7 +17,6 @@ # Install jmc in /usr/lib/jmc (arch-specific and multilib exempt) %global _jmcdir %{_prefix}/lib/%{name} %global jmc_dir_name jmc-%{major}.%{minor}.%{patchlevel}-ga -# %global _eclipsepluginsdir %{_prefix}/lib/eclipse/plugins %global debug_package %{nil} @@ -43,7 +42,7 @@ %global __provides_exclude_from ^%{_jmcdir}/plugins/org.eclipse.*$ %global __requires_exclude_from ^%{_jmcdir}/plugins/org.eclipse.*$ -%global __requires_exclude ^osgi\\((javax|org\\.apache|org\\.eclipse|org\\.sat4j).*$ +%global __requires_exclude ^osgi\\((javax|org\\.apache|org\\.eclipse|org\\.sat4j|org\\.w3c).*$ %global __provides_exclude ^osgi\\((com|javax|org\\.apache|org\\.glassfish|org\\.kxml2|org\\.sat4j|org\\.tukaani|org\\.w3c|org\\.xmlpull).*$ Name: jmc @@ -364,8 +363,6 @@ Provides: bundled(osgi(org.eclipse.help.ui.nl_ja)) = 4.21.0 Provides: bundled(osgi(org.eclipse.help.ui.nl_zh)) = 4.21.0 Provides: bundled(osgi(org.eclipse.help.webapp.nl_ja)) = 4.21.0 Provides: bundled(osgi(org.eclipse.help.webapp.nl_zh)) = 4.21.0 -Provides: bundled(osgi(org.eclipse.jetty.alpn.client)) = 10.0.7 -Provides: bundled(osgi(org.eclipse.jetty.client)) = 10.0.7 Provides: bundled(osgi(org.eclipse.jetty.http)) = 10.0.6 Provides: bundled(osgi(org.eclipse.jetty.http)) = 10.0.7 Provides: bundled(osgi(org.eclipse.jetty.io)) = 10.0.6 @@ -381,14 +378,9 @@ Provides: bundled(osgi(org.eclipse.jetty.util)) = 10.0.7 Provides: bundled(osgi(org.eclipse.jetty.util.ajax)) = 10.0.6 Provides: bundled(osgi(org.eclipse.jetty.webapp)) = 10.0.7 Provides: bundled(osgi(org.eclipse.jetty.websocket.api)) = 10.0.7 -Provides: bundled(osgi(org.eclipse.jetty.websocket-api)) = 1.1.2 Provides: bundled(osgi(org.eclipse.jetty.websocket.common)) = 10.0.7 -Provides: bundled(osgi(org.eclipse.jetty.websocket.core.client)) = 10.0.7 Provides: bundled(osgi(org.eclipse.jetty.websocket.core.common)) = 10.0.7 Provides: bundled(osgi(org.eclipse.jetty.websocket.core.server)) = 10.0.7 -Provides: bundled(osgi(org.eclipse.jetty.websocket.javax.client)) = 10.0.7 -Provides: bundled(osgi(org.eclipse.jetty.websocket.javax.common)) = 10.0.7 -Provides: bundled(osgi(org.eclipse.jetty.websocket.javax.server)) = 10.0.7 Provides: bundled(osgi(org.eclipse.jetty.websocket.server)) = 10.0.7 Provides: bundled(osgi(org.eclipse.jetty.websocket.servlet)) = 10.0.7 Provides: bundled(osgi(org.eclipse.jetty.xml)) = 10.0.7 @@ -558,6 +550,7 @@ applications running locally or deployed in production environments. %patch2 -p1 # Build & install jmc core libraries +# Skip the JDP Multicast Tests that don't work offline/under a VPN mvn -Dmaven.repo.local=repository-%{version}-%{revdate} -o clean install -f core/pom.xml -DskipJDPMulticastTests=true %pom_remove_plugin org.codehaus.mojo:flatten-maven-plugin @@ -631,6 +624,9 @@ sed -i "/.SH FILES/a .I %{_sysconfdir}/%{name}.ini" %{buildroot}%{_mandir}/man1/ %{_datadir}/applications/%{name}.desktop %changelog +* Mon Dec 5 2022 Joshua Matsuoka - 8.2.0-3 +- Fix provides and requires exclusions. Related: rhbz#2122401 + * Fri Dec 2 2022 Joshua Matsuoka - 8.2.0-3 - Bumping Package NVR. Related: rhbz#2122401