rpms/javapackages-tools
6
0
Fork 0
Code Issues Pull Requests Releases Activity

Drop bootstrap mode

Browse Source
This commit is contained in:
Mikolaj Izdebski 2022-06-14 08:13:53 +02:00
parent 107a1f1a3a
commit 46a2acdabc
1 changed files with 0 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
javapackages-tools.spec
View File

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