From b16d6478e815f7f83757790df41e94bc26269932 Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk@redhat.com>
Date: Fri, 28 Jun 2019 14:23:04 +0200
Subject: [PATCH] Disable ftp and http-lightweight providers

---
 maven-wagon.spec | 72 ++++++++----------------------------------------
 1 file changed, 12 insertions(+), 60 deletions(-)

diff --git a/maven-wagon.spec b/maven-wagon.spec
index 38ad51f..d6a5fb5 100644
--- a/maven-wagon.spec
+++ b/maven-wagon.spec
@@ -1,6 +1,6 @@
 Name:           maven-wagon
 Version:        3.3.2
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Tools to manage artifacts and deployment
 License:        ASL 2.0
 URL:            http://maven.apache.org/wagon
@@ -10,19 +10,16 @@ Source0:        http://repo1.maven.org/maven2/org/apache/maven/wagon/wagon/%{ver
 
 BuildRequires:  maven-local
 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)
 BuildRequires:  mvn(org.codehaus.plexus:plexus-component-metadata)
-BuildRequires:  mvn(org.codehaus.plexus:plexus-interactivity-api)
 BuildRequires:  mvn(org.codehaus.plexus:plexus-utils)
 BuildRequires:  mvn(org.jsoup:jsoup)
 BuildRequires:  mvn(org.slf4j:jcl-over-slf4j)
 BuildRequires:  mvn(org.slf4j:slf4j-api)
 
-
 %description
 Maven Wagon is a transport abstraction that is used in Maven's
 artifact and repository handling code. Currently wagon has the
@@ -34,48 +31,7 @@ following providers:
 * WebDAV
 * SCM (in progress)
 
-%package provider-api
-Summary:        provider-api module for %{name}
-
-%description provider-api
-provider-api module for %{name}.
-
-%package providers
-Summary:        providers module for %{name}
-
-%description providers
-providers module for %{name}
-
-%package file
-Summary:        file module for %{name}
-
-%description file
-file module for %{name}.
-
-%package ftp
-Summary:        ftp module for %{name}
-
-%description ftp
-ftp module for %{name}.
-
-%package http
-Summary:        http module for %{name}
-
-%description http
-http module for %{name}.
-
-%package http-shared
-Summary:        http-shared module for %{name}
-
-%description http-shared
-http-shared module for %{name}.
-
-%package http-lightweight
-Summary:        http-lightweight module for %{name}
-
-%description http-lightweight
-http-lightweight module for %{name}.
-
+%{?module_package}
 %{?javadoc_package}
 
 %prep
@@ -87,26 +43,26 @@ http-lightweight module for %{name}.
 
 # disable tests, missing dependencies
 %pom_disable_module wagon-tcks
-%pom_disable_module wagon-ssh-common-test wagon-providers/pom.xml
+%pom_disable_module wagon-ssh-common-test wagon-providers
 %pom_disable_module wagon-provider-test
 %pom_remove_dep :wagon-provider-test
 %pom_remove_dep :wagon-provider-test wagon-providers
 
 # missing dependencies
-%pom_disable_module wagon-webdav-jackrabbit wagon-providers
-
+%pom_disable_module wagon-ftp wagon-providers
+%pom_disable_module wagon-http-lightweight wagon-providers
 %pom_disable_module wagon-scm wagon-providers
 %pom_disable_module wagon-ssh wagon-providers
 %pom_disable_module wagon-ssh-common wagon-providers
 %pom_disable_module wagon-ssh-external wagon-providers
+%pom_disable_module wagon-webdav-jackrabbit wagon-providers
 
-%build
 %mvn_file ":wagon-{*}" %{name}/@1
-
 %mvn_package ":wagon"
 
+%build
 # tests are disabled because of missing dependencies
-%mvn_build -f -s
+%mvn_build -f
 
 # Maven requires Wagon HTTP with classifier "shaded"
 %mvn_alias :wagon-http :::shaded:
@@ -114,18 +70,14 @@ http-lightweight module for %{name}.
 %install
 %mvn_install
 
-%files -f .mfiles
+%files -n %{?module_prefix}%{name} -f .mfiles
 %license LICENSE NOTICE
 %doc DEPENDENCIES
-%files provider-api -f .mfiles-wagon-provider-api
-%files providers -f .mfiles-wagon-providers
-%files file -f .mfiles-wagon-file
-%files ftp -f .mfiles-wagon-ftp
-%files http -f .mfiles-wagon-http
-%files http-shared -f .mfiles-wagon-http-shared
-%files http-lightweight -f .mfiles-wagon-http-lightweight
 
 %changelog
+* Fri Jun 28 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.3.2-3
+- Disable ftp and http-lightweight providers
+
 * Fri May 24 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.3.2-2
 - Mass rebuild for javapackages-tools 201901