diff --git a/javapackages-tools.spec b/javapackages-tools.spec index 06582b7..109bbe5 100644 --- a/javapackages-tools.spec +++ b/javapackages-tools.spec @@ -4,10 +4,6 @@ %bcond_with ivy %endif -# Don't generate requires on jpackage-utils and java-headless for -# provided pseudo-artifacts: com.sun:tools and sun.jdk:jconsole. -%global __requires_exclude_from %{?__requires_exclude_from:%__requires_exclude_from|}/maven-metadata/javapackages-metadata.xml$ - %global python_prefix python3 %global python_interpreter %{?__python3}%{!?__python3:dummy} @@ -53,10 +49,6 @@ Requires: which Requires: java-17-openjdk-headless Provides: jpackage-utils = %{version}-%{release} -# These could be generated automatically, but then we would need to -# depend on javapackages-local for dependency generator. -Provides: mvn(com.sun:tools) = SYSTEM -Provides: mvn(sun.jdk:jconsole) = SYSTEM %description This package provides macros and scripts to support Java packaging. @@ -157,6 +149,8 @@ OpenJDK 17 toolchain for XMvn %patch0 -p1 %patch1 -p1 +sed -i /javapackages-metadata.xml/d install + %build %configure --pyinterpreter=%{python_interpreter} \ --default_jdk=%{default_jdk} --default_jre=%{default_jre} \