From 5822ede2648c47331e3ef4735a78fa640afab017 Mon Sep 17 00:00:00 2001 From: Alexander Kurtakov Date: Wed, 9 Jun 2010 18:08:45 +0000 Subject: [PATCH] - Add osgi manifest entries. --- apache-commons-logging.spec | 9 +++++++-- commons-logging-eclipse-manifest.patch | 15 +++++++++++++++ 2 files changed, 22 insertions(+), 2 deletions(-) create mode 100644 commons-logging-eclipse-manifest.patch diff --git a/apache-commons-logging.spec b/apache-commons-logging.spec index 662f21b..6f4afa9 100644 --- a/apache-commons-logging.spec +++ b/apache-commons-logging.spec @@ -4,13 +4,14 @@ Name: apache-%{short_name} Version: 1.1.1 -Release: 9%{?dist} +Release: 10%{?dist} Summary: Apache Commons Logging License: ASL 2.0 Group: Development/Libraries URL: http://commons.apache.org/%{base_name} Source0: http://www.apache.org/dist/commons/%{base_name}/source/%{short_name}-%{version}-src.tar.gz Source1: %{short_name}.depmap +Patch1: %{short_name}-eclipse-manifest.patch Patch0: %{short_name}-maven-release-plugin.patch BuildArch: noarch BuildRequires: java-devel >= 1:1.6.0 @@ -73,6 +74,8 @@ Obsoletes: jakarta-%{short_name}-javadoc <= 0:1.0.4 %patch0 -p1 -b .rhbug_588142 +%patch1 + sed -i 's/\r//' RELEASE-NOTES.txt LICENSE.txt # ----------------------------------------------------------------------------- @@ -150,6 +153,9 @@ rm -rf $RPM_BUILD_ROOT # ----------------------------------------------------------------------------- %changelog +* Wed Jun 9 2010 Alexander Kurtakov 1.1.1-10 +- Add osgi manifest entries. + * Fri May 21 2010 Stanislav Ochotnicky - 1.1.1-9 - Correct depmap filename for backward compatibility @@ -182,4 +188,3 @@ rm -rf $RPM_BUILD_ROOT * Thu May 6 2010 Stanislav Ochotnicky - 1.1.1-1 - Rename and rebase from jakarta-commons-logging - diff --git a/commons-logging-eclipse-manifest.patch b/commons-logging-eclipse-manifest.patch new file mode 100644 index 0000000..38a39d2 --- /dev/null +++ b/commons-logging-eclipse-manifest.patch @@ -0,0 +1,15 @@ +--- src/conf/MANIFEST.MF.orig 2007-11-22 01:27:52.000000000 +0200 ++++ src/conf/MANIFEST.MF 2010-06-09 21:04:06.532857757 +0300 +@@ -6,3 +6,12 @@ Implementation-Title: Commons Logging + Implementation-Vendor-Id: org.apache + Implementation-Vendor: Apache Software Foundation + Implementation-Version: 1.1.1 ++Bundle-ManifestVersion: 2 ++Export-Package: org.apache.commons.logging;version="1.1.1",org.apache. ++ commons.logging.impl;version="1.1.1" ++Bundle-Version: 1.1.1.v20080605-1930 ++Bundle-SymbolicName: org.apache.commons.logging ++Bundle-Name: Apache Commons Logging Plug-in ++Bundle-RequiredExecutionEnvironment: CDC-1.0/Foundation-1.0,J2SE-1.3 ++Bundle-Localization: plugin ++Bundle-Vendor: Apache Software Foundation