[plexus-bsh-factory] Simplify build dependencies

[Mikolaj Izdebski]

commit 2b3c2a0aac3d4113ce392ed5498e5af819421823
Author: Mikolaj Izdebski <mizdebsk at redhat.com>
Date:   Mon Apr 29 13:32:25 2013 +0200

    Simplify build dependencies
    
    - Update to current packaging guidelines

 plexus-bsh-factory.spec |   62 ++++++++--------------------------------------
 1 files changed, 11 insertions(+), 51 deletions(-)
---
diff --git a/plexus-bsh-factory.spec b/plexus-bsh-factory.spec
index f1662c9..da550c0 100644
--- a/plexus-bsh-factory.spec
+++ b/plexus-bsh-factory.spec
@@ -1,44 +1,14 @@
-# Copyright (c) 2000-2005, JPackage Project
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-#
-# 1. Redistributions of source code must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-#    notice, this list of conditions and the following disclaimer in the
-#    documentation and/or other materials provided with the
-#    distribution.
-# 3. Neither the name of the JPackage Project nor the names of its
-#    contributors may be used to endorse or promote products derived
-#    from this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#
-
 %define parent plexus
 %define subname bsh-factory
 
 Name:           %{parent}-%{subname}
 Version:        1.0
-Release:        0.11.a7%{?dist}
+Release:        0.12.a7%{?dist}
 Epoch:          0
 Summary:        Plexus Bsh component factory
 License:        MIT
-Group:          Development/Java
 URL:            http://plexus.codehaus.org/
+BuildArch:      noarch
 # svn export svn://svn.plexus.codehaus.org/plexus/tags/plexus-bsh-factory-1.0-alpha-7-SNAPSHOT plexus-bsh-factory/
 # tar czf plexus-bsh-factory-src.tar.gz plexus-bsh-factory/
 Source0:        %{name}-src.tar.gz
@@ -47,28 +17,17 @@ Source3:	plexus-bsh-factory-license.txt
 Patch1:         %{name}-encodingfix.patch
 Patch2:         0001-Migrate-to-plexus-containers-container-default.patch
 
-BuildArch:      noarch
-
-BuildRequires:     jpackage-utils
-BuildRequires:     maven-local
-BuildRequires:     maven-compiler-plugin
-BuildRequires:     maven-install-plugin
-BuildRequires:     maven-jar-plugin
-BuildRequires:     maven-javadoc-plugin
-BuildRequires:     maven-resources-plugin
-BuildRequires:     maven-surefire-plugin
-BuildRequires:     bsh
-BuildRequires:     classworlds
-BuildRequires:     plexus-container-default
-BuildRequires:     plexus-utils
-
+BuildRequires:  maven-local
+BuildRequires:  mvn(bsh:bsh)
+BuildRequires:  mvn(classworlds:classworlds)
+BuildRequires:  mvn(org.codehaus.plexus:plexus-container-default)
+BuildRequires:  mvn(org.codehaus.plexus:plexus-utils)
 
 %description
 Bsh component class creator for Plexus.
 
 %package javadoc
 Summary:        Javadoc for %{name}
-Group:          Documentation
 
 %description javadoc
 Javadoc for %{name}.
@@ -79,10 +38,8 @@ Javadoc for %{name}.
 %patch1 -b .sav
 %patch2 -p1
 cp release-pom.xml pom.xml
-
 cp -p %{SOURCE3} .
 
-
 %build
 %mvn_file  : %{parent}/%{subname}
 %mvn_build -f
@@ -90,7 +47,6 @@ cp -p %{SOURCE3} .
 %install
 %mvn_install
 
-
 %files -f .mfiles
 %doc plexus-bsh-factory-license.txt
 
@@ -98,6 +54,10 @@ cp -p %{SOURCE3} .
 %doc plexus-bsh-factory-license.txt
 
 %changelog
+* Mon Apr 29 2013 Mikolaj Izdebski <mizdebsk at redhat.com> - 0:1.0-0.12.a7
+- Simplify build dependencies
+- Update to current packaging guidelines
+
 * Wed Apr 10 2013 Michal Srb <msrb at redhat.com> - 0:1.0-0.11.a7
 - Port to plexus-containers-container-default