Attachment 587876 Details for Bug 826776 – 0001-Fix-OSGi-bundle-generation-in-pom.xml.patch

[patch] 0001-Fix-OSGi-bundle-generation-in-pom.xml.patch

0001-Fix-OSGi-bundle-generation-in-pom.xml.patch (text/plain), 3.07 KB, created by Gerard Ryan on 2012-05-30 23:49:23 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Gerard Ryan

Created: 2012-05-30 23:49:23 UTC

Size: 3.07 KB

patch

obsolete

>From 186a5583c8265ae2cb53b99767ffc8420ac09598 Mon Sep 17 00:00:00 2001
>From: Gerard Ryan <gerard@ryan.lt>
>Date: Thu, 31 May 2012 00:30:48 +0100
>Subject: [PATCH] Fix OSGi bundle generation in pom.xml
>
>---
> log4j-fix-bundle-generation-in-pom.patch |   25 +++++++++++++++++++++++++
> log4j.spec                               |    7 ++++++-
> 2 files changed, 31 insertions(+), 1 deletion(-)
> create mode 100644 log4j-fix-bundle-generation-in-pom.patch
>
>diff --git a/log4j-fix-bundle-generation-in-pom.patch b/log4j-fix-bundle-generation-in-pom.patch
>new file mode 100644
>index 0000000..89125b5
>--- /dev/null
>+++ b/log4j-fix-bundle-generation-in-pom.patch
>@@ -0,0 +1,25 @@
>+--- pom.xml.orig	2010-03-31 05:14:39.000000000 +0100
>++++ pom.xml	2012-05-31 00:13:33.051058948 +0100
>+@@ -409,8 +409,12 @@
>+             <instructions>
>+                 
>+                 <Export-Package>!org.apache.log4j.lf5.*,!org.apache.log4j.chainsaw.*,org.apache.log4j.*</Export-Package>
>+-                <Import-Package>com.sun.jdmk.comm;resolution:=optional,
>+-                                javax.jms;resolution:=optional,
>++                <Import-Package>!org.apache.log4j,
>++                                !org.apache.log4j.*,
>++                                !com.sun.jdmk.comm,
>++                                !javax.jms,
>++                                !com.ibm.uvm.tools,
>++                                !javax.jmdns,
>+                                 javax.mail.*;resolution:=optional,
>+                                 javax.management;resolution:=optional,
>+                                 javax.naming;resolution:=optional,
>+@@ -419,6 +423,7 @@
>+                                 javax.swing.*;resolution:=optional,
>+                                 *</Import-Package>
>+                 <Bundle-DocURL>http://logging.apache.org/log4j/1.2</Bundle-DocURL>
>++                <Bundle-SymbolicName>org.apache.log4j</Bundle-SymbolicName>
>+             </instructions>
>+         </configuration>
>+       </plugin>
>diff --git a/log4j.spec b/log4j.spec
>index 6a06d8f..ec352e2 100644
>--- a/log4j.spec
>+++ b/log4j.spec
>@@ -3,7 +3,7 @@
> 
> Name:           log4j
> Version:        1.2.16
>-Release:        11%{?dist}
>+Release:        12%{?dist}
> Epoch:          0
> Summary:        Java logging package
> BuildArch:      noarch
>@@ -26,6 +26,7 @@ Patch2:         0009-Remove-ant-run-of-tests.patch
> Patch3:         0010-Fix-javadoc-link.patch
> Patch4:        fix_junit_dep.patch
> Patch5:        remove_duplicate_manifest_entry.patch
>+Patch6:        log4j-fix-bundle-generation-in-pom.patch
> 
> BuildRequires:  %{__perl}
> BuildRequires:  java >= 1:1.6.0
>@@ -84,6 +85,7 @@ Requires:       jpackage-utils
> 
> %patch4
> %patch5
>+%patch6
> 
> sed -i "s|groupId>ant<|groupId>org.apache.ant<|g" pom.xml
> 
>@@ -203,6 +205,9 @@ fi
> 
> 
> %changelog
>+* Wed May 30 2012 Gerard Ryan <galileo@fedoraproject.org> - 0:1.2.16-12
>+- Fix OSGi Bundle generation in pom.xml
>+
> * Fri Jan 13 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0:1.2.16-11
> - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
> 
>-- 
>1.7.10.2
>

Actions: View | Diff

Attachments on bug 826776: 587876