Move xmvn-subst and xmvn-install to javapacakges-local

This commit is contained in:
Michal Srb 2014-05-23 09:20:42 +02:00
parent cc0e440305
commit 49b72acd53

View File

@ -43,17 +43,8 @@ Requires: %{name} = %{version}-%{release}
Requires: javapackages-local = %{version}-%{release}
Requires: maven
Requires: xmvn >= 2
Requires: xmvn-subst >= 2
Requires: xmvn-resolve >= 2
Requires: xmvn-mojo >= 2
Requires: xmvn-connector-aether >= 2
# We want to use OpenJDK 8 for building packages as it is default
# implementation used in Fedora. Due to YUM bugs and limitations,
# sometimes Java 7 may be installed alone. To workaround this
# maven-local explicitly requires version 8 of OpenJDK. (If needed
# Maven can still work with Java 7, but this needs to be enabled
# explicitly in the spec file.)
Requires: java-1.8.0-openjdk-devel >= 1:1.8
# POM files needed by maven itself
Requires: apache-commons-parent
Requires: apache-parent
@ -94,9 +85,6 @@ Requires: %{name} = %{version}-%{release}
Requires: javapackages-local = %{version}-%{release}
Requires: apache-ivy >= 2.3.0-8
Requires: xmvn-connector-ivy >= 2
Requires: xmvn-subst >= 2
Requires: xmvn-install >= 2
Requires: xmvn-resolve >= 2
%description -n ivy-local
This package implements local mode fow Apache Ivy, which allows
@ -129,6 +117,15 @@ User guide for Java packaging and using utilities from javapackages-tools
Summary: Non-essential macros and scripts for Java packaging support
Requires: %{name} = %{version}-%{release}
Requires: xmvn-install >= 2
Requires: xmvn-subst >= 2
Requires: xmvn-resolve >= 2
# We want to use OpenJDK 8 for building packages as it is default
# implementation used in Fedora. Due to YUM bugs and limitations,
# sometimes Java 7 may be installed alone. To workaround this
# maven-local explicitly requires version 8 of OpenJDK. (If needed
# Maven can still work with Java 7, but this needs to be enabled
# explicitly in the spec file.)
Requires: java-1.8.0-openjdk-devel >= 1:1.8
%description -n javapackages-local
This package provides non-essential macros and scripts to support Java packaging.