From c3d61bee3a23ad98d9cecf21493fa543822d406b Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Fri, 12 Jul 2019 11:25:56 +0200 Subject: [PATCH] disable SCM leaf subpackage to fix FTBFS on 32bit architectures --- maven-wagon.spec | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/maven-wagon.spec b/maven-wagon.spec index 76b2c58..c9a0004 100644 --- a/maven-wagon.spec +++ b/maven-wagon.spec @@ -1,10 +1,10 @@ -%bcond_without scm +%bcond_with scm %bcond_without ssh Name: maven-wagon Epoch: 0 Version: 3.3.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Tools to manage artifacts and deployment License: ASL 2.0 URL: http://maven.apache.org/wagon @@ -22,12 +22,12 @@ BuildRequires: mvn(commons-io:commons-io) BuildRequires: mvn(commons-net:commons-net) BuildRequires: mvn(org.apache.httpcomponents:httpclient) BuildRequires: mvn(org.apache.httpcomponents:httpcore) +BuildRequires: mvn(org.apache.maven:maven-parent:pom:) BuildRequires: mvn(org.apache.maven.plugins:maven-shade-plugin) %if %{with scm} BuildRequires: mvn(org.apache.maven.scm:maven-scm-api) BuildRequires: mvn(org.apache.maven.scm:maven-scm-manager-plexus) %endif -BuildRequires: mvn(org.apache.maven:maven-parent:pom:) BuildRequires: mvn(org.codehaus.plexus:plexus-component-metadata) BuildRequires: mvn(org.codehaus.plexus:plexus-interactivity-api) BuildRequires: mvn(org.codehaus.plexus:plexus-utils) @@ -37,6 +37,7 @@ BuildRequires: mvn(org.slf4j:slf4j-api) Obsoletes: %{name}-manual < %{epoch}:%{version}-%{release} Obsoletes: %{name}-provider-test < %{epoch}:%{version}-%{release} +Obsoletes: %{name}-scm < %{epoch}:%{version}-%{release} %description Maven Wagon is a transport abstraction that is used in Maven's @@ -191,6 +192,9 @@ Javadoc for %{name}. %doc LICENSE NOTICE DEPENDENCIES %changelog +* Fri Jul 12 2019 Fabio Valentini - 0:3.3.3-2 +- Disable SCM leaf subpackage to fix FTBFS on 32bit architectures. + * Thu Jun 27 2019 Fabio Valentini - 0:3.3.3-1 - Update to version 3.3.3. @@ -393,3 +397,4 @@ Javadoc for %{name}. * Mon Nov 07 2005 Ralph Apel - 0:1.0-0.a5.1jpp - First JPackage build +