commit 64f841d5b2b2d566f8858b92bd56d77c3e2919a7 Author: Mikolaj Izdebski <mizdebsk(a)redhat.com&gt; Date: Wed Feb 6 09:51:24 2013 +0100 Don't install mvn-local and mvn-rpmbuild on F18 javapackages-tools.spec | 14 +++++++++++--- 1 files changed, 11 insertions(+), 3 deletions(-) --- diff --git a/javapackages-tools.spec b/javapackages-tools.spec index 505dac6..8812617 100644 --- a/javapackages-tools.spec +++ b/javapackages-tools.spec @@ -1,6 +1,6 @@ Name: javapackages-tools Version: 0.11.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Macros and scripts for Java packaging support License: BSD @@ -22,8 +22,8 @@ This package provides macros and scripts to support Java packaging. %package -n maven-local Summary: Macros and scripts for Maven packaging support Requires: %{name} = %{version}-%{release} -Requires: maven >= 3.0.4-28 -Requires: xmvn >= 0.2.5-1 +Requires: maven +Requires: xmvn # POM files needed by maven itself Requires: apache-commons-parent Requires: apache-parent @@ -67,6 +67,11 @@ install -p -m 644 scripts/maven_depmap.py $RPM_BUILD_ROOT%{_javadir}-utils install -p -m 644 scripts/pom_editor.sh $RPM_BUILD_ROOT%{_javadir}-utils install -p -m 755 scripts/mvn-* $RPM_BUILD_ROOT%{_bindir} +# On Fedora 18 we don't want to install mvn-local and mvn-rpmbuild +# scripts as they are already provided by maven package. +%if 0%{fedora} == 18 +rm -f $RPM_BUILD_ROOT%{_bindir}/mvn-{local,rpmbuild} +%endif # Ugly as hell, but Eclipse relocated various artifacts under # their own groupId. We need to fix this globally. @@ -105,6 +110,9 @@ install -p -m 755 scripts/mvn-* $RPM_BUILD_ROOT%{_bindir} %changelog +* Wed Feb 6 2013 Mikolaj Izdebski <mizdebsk(a)redhat.com&gt; - 0.11.2-2 +- Don't install mvn-local and mvn-rpmbuild on F18 + * Wed Jan 30 2013 Mikolaj Izdebski <mizdebsk(a)redhat.com&gt; - 0.11.2-1 - Update to upstream version 0.11.2