[apache-mime4j] Update to latest upstream.

[Alexander Kurtakov]

commit ba3defc2772c60fcfdba393c3b9c92e393af975f
Author: Alexander Kurtakov < <akurtako at redhat.com>
Date:   Wed Nov 30 22:54:02 2011 +0200

    Update to latest upstream.

 .gitignore         |    1 +
 apache-mime4j.spec |   32 +++++++++++++++++++++++---------
 sources            |    2 +-
 3 files changed, 25 insertions(+), 10 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index a677de2..ecf34d3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /apache-mime4j-0.6.1-src.tar.gz
+apache-mime4j-project-0.7.1-source-release.zip
diff --git a/apache-mime4j.spec b/apache-mime4j.spec
index 8ef9df7..4ba1c31 100644
--- a/apache-mime4j.spec
+++ b/apache-mime4j.spec
@@ -1,12 +1,12 @@
 Name:           apache-mime4j
-Version:        0.6.1
-Release:        2%{?dist}
+Version:        0.7.1
+Release:        1%{?dist}
 Summary:        Apache JAMES Mime4j
 
 Group:          Development/Libraries
 License:        ASL 2.0
 URL:            http://james.apache.org/mime4j
-Source0:        http://apache.skknet.net//james/mime4j/apache-mime4j-0.6.1-src.tar.gz
+Source0:        http://apache.online.bg//james/mime4j/apache-mime4j-project-%{version}-source-release.zip
 BuildArch: noarch
 
 BuildRequires: apache-commons-logging
@@ -32,23 +32,34 @@ API documentation for %{name}.
 
 
 %prep
-%setup -q 
+%setup -q -n %{name}-project-%{version}
 rm -fr stage
+# prevents rat plugin from failing the build
+rm -fr DEPENDENCIES
 
 %build
-mvn-rpmbuild install 
+mvn-rpmbuild install javadoc:aggregate
 
 %install
 # jars
 install -d -m 0755 %{buildroot}%{_javadir}
-install -m 644 target/%{name}-%{version}.jar   %{buildroot}%{_javadir}/%{name}.jar
 
 # poms
 install -d -m 755 %{buildroot}%{_mavenpomdir}
 install -pm 644 pom.xml \
     %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
 
-%add_maven_depmap JPP-%{name}.pom %{name}.jar
+for sub in core dom storage; do
+    # install jar
+    install -Dpm 644 ${sub}/target/%{name}-${sub}-%{version}.jar \
+            $RPM_BUILD_ROOT/%{_javadir}/%{name}/${sub}.jar;
+
+    # intall pom
+    install -Dpm 644 ${sub}/pom.xml $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP.%{name}-${sub}.pom
+
+    # maven depmap
+    %add_maven_depmap JPP.%{name}-${sub}.pom %{name}/${sub}.jar
+done
 
 # javadoc
 install -d -m 0755 %{buildroot}%{_javadocdir}/%{name}
@@ -56,16 +67,19 @@ cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}/
 rm -rf target/site/api*
 
 %files
-%doc LICENSE.txt NOTICE.txt RELEASE_NOTES.txt
+%doc LICENSE NOTICE RELEASE_NOTES.txt
 %{_javadir}/*
 %{_mavenpomdir}/*
 %{_mavendepmapfragdir}/*
 
 %files javadoc
-%doc LICENSE.txt
+%doc LICENSE
 %{_javadocdir}/%{name}
 
 %changelog
+* Wed Nov 30 2011 Alexander Kurtakov <akurtako at redhat.com> 0.7.1-1
+- Update to latest upstream.
+
 * Wed Nov 30 2011 Alexander Kurtakov <akurtako at redhat.com> 0.6.1-2
 - Adapt to current guidelines.
 
diff --git a/sources b/sources
index 6c8bb4f..37f6362 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-9dac4a5027d1dec0663f8d11d7e471e9  apache-mime4j-0.6.1-src.tar.gz
+e8d93626b752f7498548168b7d67e789  apache-mime4j-project-0.7.1-source-release.zip