Merge subpackages into the main package

maven-resolver.spec

@@ -31,59 +31,16 @@ repositories and dependency resolution. Maven Artifact Resolver deals with the
 specification of local repository, remote repository, developer workspaces,
 artifact transports and artifact resolution.
 
-%package api
-Summary:   Maven Artifact Resolver API
-
-%description api
-The application programming interface for the repository system.
-
-%package spi
-Summary:   Maven Artifact Resolver SPI
-
-%description spi
-The service provider interface for repository system implementations and
-repository connectors.
-
-%package util
-Summary:   Maven Artifact Resolver Utilities
-
-%description util
-A collection of utility classes to ease usage of the repository system.
-
-%package impl
-Summary:   Maven Artifact Resolver Implementation
-
-%description impl
-An implementation of the repository system.
-
-%package connector-basic
-Summary:   Maven Artifact Resolver Connector Basic
-
-%description connector-basic
-A repository connector implementation for repositories using URI-based layouts.
-
-%package transport-wagon
-Summary:   Maven Artifact Resolver Transport Wagon
-
-%description transport-wagon
-A transport implementation based on Maven Wagon.
-
 %package        javadoc
 Summary:        API documentation for %{name}
 
 %description    javadoc
 This package provides %{summary}.
 
-
 %prep
 %setup -q
 
-# tests require jetty 7
-%pom_remove_dep :::test maven-resolver-transport-http
-rm -r maven-resolver-transport-http/src/test
-
 %pom_disable_module maven-resolver-demos
-#%pom_disable_module maven-resolver-test-util
 %pom_disable_module maven-resolver-transport-classpath
 %pom_disable_module maven-resolver-transport-file
 %pom_disable_module maven-resolver-transport-http
@@ -114,28 +71,18 @@ done
   </archive>
 </configuration>"
 
-%mvn_package :maven-resolver
 %mvn_alias 'org.apache.maven.resolver:maven-resolver{*}' 'org.eclipse.aether:aether@1'
 %mvn_file ':maven-resolver{*}' %{name}/maven-resolver@1 aether/aether@1
 
 %build
-%mvn_build -s
+%mvn_build
 
 %install
 %mvn_install
 
-
 %files -f .mfiles
 %license LICENSE NOTICE
 
-%files api -f .mfiles-%{name}-api
-%license LICENSE NOTICE
-%files spi -f .mfiles-%{name}-spi
-%files util -f .mfiles-%{name}-util
-%files impl -f .mfiles-%{name}-impl
-%files connector-basic -f .mfiles-%{name}-connector-basic
-%files transport-wagon -f .mfiles-%{name}-transport-wagon
-
 %files javadoc -f .mfiles-javadoc
 %license LICENSE NOTICE