diff --git a/javapackages-tools.spec b/javapackages-tools.spec index 4754693..c8b3e0c 100644 --- a/javapackages-tools.spec +++ b/javapackages-tools.spec @@ -1,5 +1,3 @@ -%bcond_with bootstrap - %if 0%{?fedora} %bcond_without ivy %else @@ -16,11 +14,7 @@ %global default_jdk %{_prefix}/lib/jvm/java-17-openjdk %global default_jre %{_prefix}/lib/jvm/jre-17-openjdk -%if %{without bootstrap} %global maven_home %{_datadir}/xmvn -%else -%global maven_home %{_datadir}/javapackages-bootstrap -%endif Name: javapackages-tools Version: 6.0.0 @@ -79,7 +73,6 @@ install their content. Summary: Macros and scripts for Maven packaging support Requires: %{name} = %{version}-%{release} Requires: javapackages-local = %{version}-%{release} -%if %{without bootstrap} Requires: %{_bindir}/xmvn Requires: mvn(org.fedoraproject.xmvn:xmvn-mojo) # Common Maven plugins required by almost every build. It wouldn't make @@ -88,7 +81,6 @@ Requires: mvn(org.apache.maven.plugins:maven-compiler-plugin) Requires: mvn(org.apache.maven.plugins:maven-jar-plugin) Requires: mvn(org.apache.maven.plugins:maven-resources-plugin) Requires: mvn(org.apache.maven.plugins:maven-surefire-plugin) -%endif %description -n maven-local This package provides macros and scripts to support packaging Maven artifacts. @@ -119,13 +111,9 @@ Summary: Non-essential macros and scripts for Java packaging support Requires: javapackages-generators = %{version}-%{release} # Java build systems don't have hard requirement on java-devel, so it should be there Requires: java-17-openjdk-devel -%if %{with bootstrap} -Requires: javapackages-bootstrap -%else Requires: %{_bindir}/xmvn-install Requires: %{_bindir}/xmvn-subst Requires: %{_bindir}/xmvn-resolve -%endif %description -n javapackages-local This package provides non-essential macros and scripts to support Java packaging.