Attachment 587581 Details for Bug 826327 – 0001-Add-additional-information-to-OSGi-manifest.patch

[patch] 0001-Add-additional-information-to-OSGi-manifest.patch

0001-Add-additional-information-to-OSGi-manifest.patch (text/plain), 4.00 KB, created by Gerard Ryan on 2012-05-30 02:56:30 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Gerard Ryan

Created: 2012-05-30 02:56:30 UTC

Size: 4.00 KB

patch

obsolete

>From 0e39c8673daaf87d580d881e396c743c6c38a2f2 Mon Sep 17 00:00:00 2001
>From: Gerard Ryan <gerard@ryan.lt>
>Date: Wed, 30 May 2012 03:51:33 +0100
>Subject: [PATCH] Add additional information to OSGi manifest.
>
>---
> javamail-add-osgi-info.patch |   24 ++++++++++++++++++++++++
> javamail.spec                |   21 +++++++++++++++------
> 2 files changed, 39 insertions(+), 6 deletions(-)
> create mode 100644 javamail-add-osgi-info.patch
>
>diff --git a/javamail-add-osgi-info.patch b/javamail-add-osgi-info.patch
>new file mode 100644
>index 0000000..2cf77b0
>--- /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@fedoraproject.org> - 1.4.3-10
>+- Add extra information to OSGi manifest
>+- Fix rpmlint error about mavendepmapfragdir
>+
> * Wed Mar 21 2012 Alexander Kurtakov <akurtako@redhat.com> 1.4.3-9
> - Drop tomcat6-jsp-api requires - it's dependency management not dependency, hence not needed.
> 
>-- 
>1.7.10.2
>

Actions: View | Diff

Attachments on bug 826327: 587581