[javamail] Add additional information to OSGi manifest.

[Mikolaj Izdebski]

commit c8751bcf1099a0ee569a21773b81f4e4c998d135
Author: Gerard Ryan <gerard at ryan.lt>
Date:   Wed May 30 03:51:33 2012 +0100

    Add additional information to OSGi manifest.

 javamail-add-osgi-info.patch |   24 ++++++++++++++++++++++++
 javamail.spec                |   21 +++++++++++++++------
 2 files changed, 39 insertions(+), 6 deletions(-)
---
diff --git a/javamail-add-osgi-info.patch b/javamail-add-osgi-info.patch
new file mode 100644
index 0000000..281abe3
--- /dev/null
+++ b/javamail-add-osgi-info.patch
@@ -0,0 +1,24 @@
+--- javamail-1.4.3/mail/META-INF/MANIFEST.MF.orig	2012-05-30 02:44:37.751517575 +0100
++++ javamail-1.4.3/mail/META-INF/MANIFEST.MF	2012-05-30 03:24:44.776888275 +0100
+@@ -1,4 +1,20 @@
+ Manifest-Version: 1.0
+ Archiver-Version: Plexus Archiver
+ Created-By: 11.0-b15 (Sun Microsystems Inc.)
+-
++Bundle-Vendor: %Bundle-Vendor.0
++Bundle-Localization: plugin
++Bundle-RequiredExecutionEnvironment: J2SE-1.4
++Bundle-Name: %Bundle-Name.0
++Bundle-SymbolicName: javax.mail
++Bundle-Version: 1.4.3
++Export-Package: javax.mail,
++ javax.mail.event,
++ javax.mail.internet,
++ javax.mail.search,
++ javax.mail.util,
++ com.sun.mail.imap,
++ com.sun.mail.pop3,
++ com.sun.mail.smtp,
++ com.sun.mail.util,
++ com.sun.mail.util.logging,
++ com.sun.mail.handlers
diff --git a/javamail.spec b/javamail.spec
index 7027c36..f467a68 100644
--- a/javamail.spec
+++ b/javamail.spec
@@ -1,6 +1,6 @@
 Name:		javamail
 Version:	1.4.3
-Release:	9%{?dist}
+Release:	10%{?dist}
 Summary:	Java Mail API
 
 Group:		Development/Libraries
@@ -25,9 +25,12 @@ Source8:	http://download.java.net/maven/2/com/sun/mail/smtp/%{version}/smtp-%{ve
 # http://kenai.com/projects/javamail/sources/mercurial/content/parent-distrib/pom.xml?raw=true
 Source9:	%{name}-parent-distrib.pom
 
+# Add additional OSGi information to manifest of mail.jar
+Patch0:		%{name}-add-osgi-info.patch
+
 # Remove Maven plugins we don't have yet
 # Remove unavailable-on-Fedora dependencies from pom.xml
-Patch0:		%{name}-cleanup-poms.patch
+Patch1:		%{name}-cleanup-poms.patch
 
 BuildRequires:	jpackage-utils
 BuildRequires:	maven
@@ -41,7 +44,7 @@ BuildRequires:	maven-resources-plugin
 BuildRequires:	maven-site-plugin
 BuildRequires:	maven-plugin-bundle
 BuildRequires:	maven-surefire-plugin
-BuildRequires:  maven-surefire-provider-junit4
+BuildRequires:	maven-surefire-provider-junit4
 BuildRequires:	tomcat6-jsp-2.1-api
 
 BuildRequires:	java-devel >= 1:1.6.0
@@ -74,6 +77,8 @@ mkdir -p mail dsn
 (cd mail && jar xvf %SOURCE1 && cp %SOURCE2 ./pom.xml)
 (cd dsn && jar xvf %SOURCE3 && cp %SOURCE4 ./pom.xml)
 
+%patch0 -p1
+
 for sub in *; do
 	pushd $sub
 	mkdir -p src/main/java src/main/resources
@@ -87,7 +92,7 @@ cp %SOURCE0 ./pom.xml
 mkdir poms
 cp %SOURCE5 %SOURCE6 %SOURCE7 %SOURCE8 %SOURCE9 poms
 
-%patch0 -p1
+%patch1 -p1
 
 # Convert license file to UTF-8
 for file in mail/src/main/resources/META-INF/*.txt; do
@@ -125,7 +130,7 @@ install -m 644 dsn/pom.xml $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP.%{name}-dsn.pom
 # Install the remaining POMs
 for sub in mailapi imap pop3 smtp; do
  install -m 644 poms/$sub-%{version}.pom \
-         $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP.%{name}-$sub.pom
+ 	 $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP.%{name}-$sub.pom
 done
 
 # Add maven dependency information
@@ -140,7 +145,7 @@ install -m 644 poms/%{name}-parent-distrib.pom \
 %files
 %doc mail/src/main/resources/META-INF/LICENSE.txt mail/overview.html
 %{_javadir}/%{name}
-%config(noreplace) %{_mavendepmapfragdir}/*
+%{_mavendepmapfragdir}/*
 %{_mavenpomdir}/*.pom
 
 %files javadoc
@@ -148,6 +153,10 @@ install -m 644 poms/%{name}-parent-distrib.pom \
 
 
 %changelog
+* Tue May 29 2012 Gerard Ryan <galileo at fedoraproject.org> - 1.4.3-10
+- Add extra information to OSGi manifest
+- Fix rpmlint error about mavendepmapfragdir
+
 * Wed Mar 21 2012 Alexander Kurtakov <akurtako at redhat.com> 1.4.3-9
 - Drop tomcat6-jsp-api requires - it's dependency management not dependency, hence not needed.