rpms/log4j
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Remove "uses" OSGI directives from MANIFEST (related #826776)

Browse Source
This commit is contained in:
Stanislav Ochotnicky 2012-06-14 11:26:22 +02:00
parent a8f49087ba
commit 2cca6bf67f
3 changed files with 26 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
0011-Remove-openejb.patch
View File

@ -1,8 +1,17 @@
From 003125dc826417e1bf41b4a1bc344eeca715e3cf Mon Sep 17 00:00:00 2001
From: Stanislav Ochotnicky <sochotnicky@redhat.com>
Date: Thu, 14 Jun 2012 10:33:03 +0200
Subject: [PATCH 1/2] Remove openejb from dependencies
---
pom.xml | 7 -------
1 file changed, 7 deletions(-)
diff --git a/pom.xml b/pom.xml
index 2e6acaa..0c330cc 100644
index 8ddbbc2..a627c48 100644
--- a/pom.xml
+++ b/pom.xml
@@ -513,13 +513,6 @@ target platform and specify -Dntdll_target=msbuild on the mvn command line.
@@ -528,13 +528,6 @@ target platform and specify -Dntdll_target=msbuild on the mvn command line.
<version>1.4.3</version>
<optional>true</optional>
</dependency>
@ -16,3 +25,6 @@ index 2e6acaa..0c330cc 100644
<!-- the following dependency is not needed on JDK 1.5 and higher
<dependency>
<groupId>com.sun.jmx</groupId>
--
1.7.10.2

16
0012-Add-proper-bundle-symbolicname.patch
View File

@ -1,18 +1,17 @@
From 65653d73ec206041ace3892a969ac5298ec32d73 Mon Sep 17 00:00:00 2001
From 48a67c6bfa320277f40e5b8589ef43b2695b86c6 Mon Sep 17 00:00:00 2001
From: Stanislav Ochotnicky <sochotnicky@redhat.com>
Date: Mon, 4 Jun 2012 10:41:13 +0200
Subject: [PATCH] Add proper bundle-symbolicname
Date: Thu, 14 Jun 2012 10:50:09 +0200
Subject: [PATCH 2/2] Add proper bundle symbolicname
Also remove dependency on yet unpackages jmdns
---
pom.xml | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
pom.xml | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 0c330cc..4b8eb8f 100644
index a627c48..d235556 100644
--- a/pom.xml
+++ b/pom.xml
@@ -405,11 +405,12 @@ target platform and specify -Dntdll_target=msbuild on the mvn command line.
@@ -420,11 +420,13 @@ target platform and specify -Dntdll_target=msbuild on the mvn command line.
<Import-Package>!javax.swing.*,
!com.ibm.uvm.tools.*,
!com.sun.jdmk.comm.*,
@ -23,6 +22,7 @@ index 0c330cc..4b8eb8f 100644
*</Import-Package>
<Bundle-DocURL>http://logging.apache.org/log4j/1.2</Bundle-DocURL>
+ <Bundle-SymbolicName>org.apache.log4j</Bundle-SymbolicName>
+ <_nouses>true</_nouses>
</instructions>
</configuration>
</plugin>

5
log4j.spec
View File

@ -3,7 +3,7 @@
Name: log4j
Version: 1.2.17
Release: 1%{?dist}
Release: 2%{?dist}
Epoch: 0
Summary: Java logging package
BuildArch: noarch
@ -205,6 +205,9 @@ fi
%changelog
* Thu Jun 14 2012 Stanislav Ochotnicky <sochotnicky@redhat.com> - 0:1.2.17-2
- Remove "uses" OSGI directives from MANIFEST (related #826776)
* Mon Jun 04 2012 Stanislav Ochotnicky <sochotnicky@redhat.com> - 0:1.2.17-1
- Update to latest version
- Change OSGI bundle symbolic name to org.apache.log4j