[plexus-ant-factory] migrated to plexus-containers-container-default (#878580)

[Stanislav Ochotnicky]

commit e913e15ee8a0b583c0cbc70c29e5c66d194510ca
Author: Michal Srb <msrb at redhat.com>
Date:   Mon Dec 10 15:09:28 2012 +0100

    migrated to plexus-containers-container-default (#878580)
    
    - using global is preferred over define when defining macros
    - removed not used custom depmap file and its occurrence in spec file
    - removed unused Ant buildfile
    - fixed release number
    
    Signed-off-by: Stanislav Ochotnicky <sochotnicky at redhat.com>

 plexus-ant-factory-build.xml      |   76 ----------------------------------
 plexus-ant-factory-jpp-depmap.xml |   81 -------------------------------------
 plexus-ant-factory.spec           |   22 ++++++----
 3 files changed, 14 insertions(+), 165 deletions(-)
---
diff --git a/plexus-ant-factory.spec b/plexus-ant-factory.spec
index 3ac0d49..0384480 100644
--- a/plexus-ant-factory.spec
+++ b/plexus-ant-factory.spec
@@ -28,12 +28,12 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
 
-%define parent plexus
-%define subname ant-factory
+%global parent plexus
+%global subname ant-factory
 
 Name:           %{parent}-%{subname}
 Version:        1.0
-Release:        0.8.a2.1.4%{?dist}
+Release:        0.9.a2.1%{?dist}
 Epoch:          0
 Summary:        Plexus Ant component factory
 # Email from copyright holder confirms license.
@@ -44,8 +44,7 @@ URL:            http://plexus.codehaus.org/
 Source0:        %{name}-src.tar.bz2
 # svn export http://svn.codehaus.org/plexus/tags/plexus-ant-factory-1.0-alpha-2.1/ plexus-ant-factory/
 # tar cjf plexus-ant-factory-src.tar.bz2 plexus-ant-factory/
-Source1:        %{name}-jpp-depmap.xml
-Source2:        http://www.apache.org/licenses/LICENSE-2.0.txt
+Source1:        http://www.apache.org/licenses/LICENSE-2.0.txt
 
 BuildArch:      noarch
 
@@ -63,12 +62,12 @@ BuildRequires:  maven2-common-poms >= 1.0-2
 
 BuildRequires:  ant
 BuildRequires:  classworlds
-BuildRequires:  plexus-container-default
+BuildRequires:  plexus-containers-container-default
 BuildRequires:  plexus-utils
 
 Requires:    ant
 Requires:    classworlds
-Requires:    plexus-container-default
+Requires:    plexus-containers-container-default
 Requires:    plexus-utils
 
 %description
@@ -84,7 +83,7 @@ Javadoc for %{name}.
 
 %prep
 %setup -q -n %{name}
-cp %{SOURCE2} LICENSE
+cp %{SOURCE1} LICENSE
 
 
 %build
@@ -125,6 +124,13 @@ rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || :
 
 
 %changelog
+* Mon Dec 10 2012 Michal Srb <msrb at redhat.com> - 0:1.0-0.9.a2.1.4
+- migrated to plexus-containers-container-default (#878580)
+- using global is preferred over define when defining macros
+- removed not used custom depmap file and its occurrence in spec file
+- removed unused Ant buildfile
+- fixed release number
+
 * Mon Nov 12 2012 Mikolaj Izdebski <mizdebsk at redhat.com> - 0:1.0-0.8.a2.1.4
 - Add LICENSE-2.0.txt to sources