mizdebsk pushed to maven2 (master). "Cleanup spec file"

[notifications at fedoraproject.org]

>From 8f0346236d28e29d3c245de1101306fb4efe678d Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk at redhat.com>
Date: Tue, 14 Apr 2015 06:14:31 +0200
Subject: Cleanup spec file


diff --git a/maven2.spec b/maven2.spec
index b754ade..4381bf6 100644
--- a/maven2.spec
+++ b/maven2.spec
@@ -1,52 +1,36 @@
-%global main_pkg maven
-
-Name:	    maven2
-Version:	2.2.1
-Release:	51%{?dist}
-Summary:	Java project management and project comprehension tool
-License:	ASL 2.0 and MIT and BSD
-URL:		http://maven.apache.org
+Name:           maven2
+Version:        2.2.1
+Release:        51%{?dist}
+Summary:        Java project management and project comprehension tool
+License:        ASL 2.0 and MIT and BSD
+URL:            http://maven.apache.org
+BuildArch:      noarch
 
 # export https://svn.apache.org/repos/asf/maven/maven-2/tags/maven-%{version}/ apache-maven-%{version}
 # tar czvf %{name}-%{version}.tar.gz apache-maven-%{version}
-Source0:	%{name}-%{version}.tar.gz
-
-Patch2:     %{name}-%{version}-update-tests.patch
-Patch4:     %{name}-%{version}-unshade.patch
-Patch5:     %{name}-%{version}-default-resolver-pool-size.patch
-Patch6:     %{name}-%{version}-strip-jackrabbit-dep.patch
-Patch8:     %{name}-%{version}-migrate-to-plexus-containers-container-default.patch
-
-BuildRequires: java-devel >= 1.6.0
-
-BuildRequires: apache-resource-bundles
-BuildRequires: objectweb-asm
-BuildRequires: buildnumber-maven-plugin
-BuildRequires: bsh
-BuildRequires: jsch
-BuildRequires: apache-commons-codec
-BuildRequires: jakarta-commons-httpclient
-BuildRequires: apache-commons-io
-BuildRequires: apache-commons-lang
-BuildRequires: apache-commons-logging
-BuildRequires: apache-commons-cli
-BuildRequires: apache-commons-collections
-BuildRequires: apache-commons-parent
-BuildRequires: maven-local
-BuildRequires: maven-enforcer-plugin
-BuildRequires: maven-shade-plugin
-BuildRequires: maven-install-plugin
-BuildRequires: modello
-BuildRequires: plexus-containers
-BuildRequires: plexus-containers-container-default
-
-
-BuildArch: noarch
+Source0:        %{name}-%{version}.tar.gz
+
+Patch2:         %{name}-%{version}-update-tests.patch
+Patch4:         %{name}-%{version}-unshade.patch
+Patch5:         %{name}-%{version}-default-resolver-pool-size.patch
+Patch6:         %{name}-%{version}-strip-jackrabbit-dep.patch
+Patch8:         %{name}-%{version}-migrate-to-plexus-containers-container-default.patch
+
+BuildRequires:  maven-local
+BuildRequires:  mvn(org.apache.maven.plugins:maven-enforcer-plugin)
+BuildRequires:  mvn(org.apache.maven.plugins:maven-pmd-plugin)
+BuildRequires:  mvn(org.apache.maven.plugins:maven-shade-plugin)
+BuildRequires:  mvn(org.apache.maven.wagon:wagon-provider-api)
+BuildRequires:  mvn(org.codehaus.modello:modello-maven-plugin)
+BuildRequires:  mvn(org.codehaus.plexus:plexus-container-default)
+BuildRequires:  mvn(org.codehaus.plexus:plexus-interpolation)
+BuildRequires:  mvn(org.codehaus.plexus:plexus-utils)
 
 %description
-Apache Maven is a software project management and comprehension tool. Based on
-the concept of a project object model (POM), Maven can manage a project's
-build, reporting and documentation from a central piece of information.
+Apache Maven is a software project management and comprehension tool.
+Based on the concept of a project object model (POM), Maven can manage
+a project's build, reporting and documentation from a central piece of
+information.
 
 %package -n maven-artifact
 Summary:        Compatibility Maven artifact artifact
@@ -106,7 +90,7 @@ Maven toolchain artifact
 Summary:        Maven Plugin Description Model
 
 %description -n maven-plugin-descriptor
-Maven toolchain artifact
+Maven plugin descriptor artifact
 
 %package javadoc
 Summary:        Javadoc for %{name}
@@ -142,7 +126,7 @@ done
 %mvn_package :maven __noinstall
 
 # Install all artifacts in Maven 3 directory.
-%mvn_file ":{*}" %{main_pkg}/@1
+%mvn_file ":{*}" maven/@1
 
 # these parts are compatibility versions which are available in
 # maven-3.x as well. We default to maven-3, but if someone asks for
@@ -203,6 +187,7 @@ done
 %changelog
 * Tue Apr 14 2015 Mikolaj Izdebski <mizdebsk at redhat.com> - 2.2.1-51
 - Remove maven-error-diagnostics subpackage
+- Cleanup spec file
 
 * Fri Oct 31 2014 Mikolaj Izdebski <mizdebsk at redhat.com> - 2.2.1-50
 - Remove direct dependency on classworlds
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/maven2.git/commit/?h=master&id=8f0346236d28e29d3c245de1101306fb4efe678d