[apache-mina] Update to upstream 2.0.7

[Juan Hernandez]

commit 964f5099bcd74054a4c24576da10ea58a0b8bb92
Author: Juan Hernandez <juan.hernandez at redhat.com>
Date:   Mon Sep 30 12:32:53 2013 +0200

    Update to upstream 2.0.7

 .gitignore                        |    1 +
 apache-mina-build-core-only.patch |   18 -------
 apache-mina.spec                  |   99 +++++++++++++++++-------------------
 sources                           |    2 +-
 4 files changed, 49 insertions(+), 71 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index f89b2f9..acc5a55 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /apache-mina-2.0.4-src.tar.gz
+/apache-mina-2.0.7-src.tar.gz
diff --git a/apache-mina.spec b/apache-mina.spec
index aff6d7a..62848a2 100644
--- a/apache-mina.spec
+++ b/apache-mina.spec
@@ -1,37 +1,24 @@
 Name: apache-mina
-Version: 2.0.4
-Release: 8%{?dist}
+Version: 2.0.7
+Release: 1%{?dist}
 Summary: Apache MINA
-
 Group: Development/Libraries
 License: ASL 2.0
 URL: http://mina.apache.org
-
 Source0: http://mina.apache.org/dyn/closer.cgi/mina/%{version}/%{name}-%{version}-src.tar.gz
-
-# Build only the core:
-Patch0: %{name}-build-core-only.patch
-
 BuildArch: noarch
 
-Requires: java
-Requires: jpackage-utils
-
-BuildRequires: jpackage-utils
-BuildRequires: java-devel
 BuildRequires: maven-local
-BuildRequires: pmd
 
+BuildRequires: apache-commons-lang
+BuildRequires: easymock
 BuildRequires: maven-compiler-plugin
-BuildRequires: maven-install-plugin
 BuildRequires: maven-jar-plugin
 BuildRequires: maven-javadoc-plugin
-BuildRequires: maven-release-plugin
 BuildRequires: maven-resources-plugin
+BuildRequires: maven-shared
+BuildRequires: maven-site-plugin
 BuildRequires: maven-surefire-plugin
-BuildRequires: maven-shade-plugin
-BuildRequires: mvn(org.easymock:easymockclassextension)
-Requires:      mvn(org.easymock:easymockclassextension)
 
 
 %description
@@ -42,52 +29,57 @@ and UDP/IP via Java NIO.
 
 
 %package javadoc
-Summary: Javadocs for %{name}
+Summary: API documentation for %{name}
 Group: Documentation
-Requires: jpackage-utils
 
 
 %description javadoc
-This package contains javadoc for %{name}.
+This package provides %{name}.
 
 
 %prep
-%setup -q
-%patch0 -p1
 
-
-%build
+# Extract the source:
+%setup -q
 
 # In the tarball distributed by Apache the source code is inside the src
-# directory:
-cd src
-
-# Skip the tests for now:
-mvn-rpmbuild \
-  -Dmaven.test.skip=true \
-  -Dproject.build.sourceEncoding=UTF-8 \
-  install \
-  javadoc:aggregate 
+# directory, but our build tools expect the POM files in the current directory,
+# so in order to simplify things we move everything to the top level before
+# starting the build:
+mv src/* .
+
+# The modules use "bundle" packaging which doesn't work correctly with xmvn
+# automatic dependency generation, in order to avoid that we change that to
+# "jar":
+sed -i \
+    -e 's|<packaging>bundle</packaging>|<packaging>jar</packaging>|g' \
+    -e 's|<type>bundle</type>|<type>jar</type>|g' \
+    $(find . -name pom.xml)
+
+# Disable the plugins that we don't need:
+%pom_remove_plugin :maven-release-plugin
+%pom_remove_plugin :maven-source-plugin
+%pom_remove_plugin :maven-bundle-plugin
+
+# Disable the modules that we can't currently build:
+%pom_disable_module mina-legal
+%pom_disable_module mina-transport-apr
+%pom_disable_module mina-integration-beans
+%pom_disable_module mina-integration-xbean
+%pom_disable_module mina-integration-ognl
+%pom_disable_module mina-integration-jmx
+%pom_disable_module mina-example
 
 
-%install
-
-# Jar files:
-mkdir -p %{buildroot}%{_javadir}/%{name}
-cp -p src/mina-core/target/mina-core-%{version}.jar %{buildroot}%{_javadir}/%{name}/mina-core.jar
+%build
 
-# POM files:
-install -d -m 755 %{buildroot}%{_mavenpomdir}
-install -pm 644 src/pom.xml %{buildroot}%{_mavenpomdir}/JPP.%{name}-mina-parent.pom
-install -pm 644 src/mina-core/pom.xml %{buildroot}%{_mavenpomdir}/JPP.%{name}-mina-core.pom
+# The tests are disabled because they require EasyMock version 2 and we only
+# have version 3:
+%mvn_build -f
 
-# Dependency map:
-%add_maven_depmap JPP.%{name}-mina-parent.pom
-%add_maven_depmap JPP.%{name}-mina-core.pom %{name}/mina-core.jar
 
-# Javadoc files:
-install -d -m 755 %{buildroot}%{_javadocdir}/%{name}
-cp -rp src/target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}/.
+%install
+%mvn_install
 
 
 %files -f .mfiles
@@ -96,13 +88,16 @@ cp -rp src/target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}/.
 %doc NOTICE.txt
 
 
-%files javadoc
-%{_javadocdir}/%{name}
+%files javadoc -f .mfiles-javadoc
 %doc LICENSE.txt
 %doc NOTICE.txt
 
 
 %changelog
+* Mon Sep 30 2013 Juan Hernandez <juan.hernandez at redhat.com> 2.0.7-1
+- Update to upstream 2.0.7
+- Build with xmvn
+
 * Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.0.4-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
 
diff --git a/sources b/sources
index 93c610f..c8c2bcf 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-fc367630a1c419c31ff0ae4b07c19bdd  apache-mina-2.0.4-src.tar.gz
+eb28084a8d51909e05d07a03b5eb6331  apache-mina-2.0.7-src.tar.gz