- Add osgi manifest entries.

This commit is contained in:
Alexander Kurtakov 2010-06-09 18:08:45 +00:00
parent 686fe99953
commit 5822ede264
2 changed files with 22 additions and 2 deletions

View File

@ -4,13 +4,14 @@
Name: apache-%{short_name} Name: apache-%{short_name}
Version: 1.1.1 Version: 1.1.1
Release: 9%{?dist} Release: 10%{?dist}
Summary: Apache Commons Logging Summary: Apache Commons Logging
License: ASL 2.0 License: ASL 2.0
Group: Development/Libraries Group: Development/Libraries
URL: http://commons.apache.org/%{base_name} URL: http://commons.apache.org/%{base_name}
Source0: http://www.apache.org/dist/commons/%{base_name}/source/%{short_name}-%{version}-src.tar.gz Source0: http://www.apache.org/dist/commons/%{base_name}/source/%{short_name}-%{version}-src.tar.gz
Source1: %{short_name}.depmap Source1: %{short_name}.depmap
Patch1: %{short_name}-eclipse-manifest.patch
Patch0: %{short_name}-maven-release-plugin.patch Patch0: %{short_name}-maven-release-plugin.patch
BuildArch: noarch BuildArch: noarch
BuildRequires: java-devel >= 1:1.6.0 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 %patch0 -p1 -b .rhbug_588142
%patch1
sed -i 's/\r//' RELEASE-NOTES.txt LICENSE.txt sed -i 's/\r//' RELEASE-NOTES.txt LICENSE.txt
# ----------------------------------------------------------------------------- # -----------------------------------------------------------------------------
@ -150,6 +153,9 @@ rm -rf $RPM_BUILD_ROOT
# ----------------------------------------------------------------------------- # -----------------------------------------------------------------------------
%changelog %changelog
* Wed Jun 9 2010 Alexander Kurtakov <akurtako@redhat.com> 1.1.1-10
- Add osgi manifest entries.
* Fri May 21 2010 Stanislav Ochotnicky <sochotnicky@redhat.com> - 1.1.1-9 * Fri May 21 2010 Stanislav Ochotnicky <sochotnicky@redhat.com> - 1.1.1-9
- Correct depmap filename for backward compatibility - Correct depmap filename for backward compatibility
@ -182,4 +188,3 @@ rm -rf $RPM_BUILD_ROOT
* Thu May 6 2010 Stanislav Ochotnicky <sochotnicky@redhat.com> - 1.1.1-1 * Thu May 6 2010 Stanislav Ochotnicky <sochotnicky@redhat.com> - 1.1.1-1
- Rename and rebase from jakarta-commons-logging - Rename and rebase from jakarta-commons-logging

View File

@ -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