[java-sig-commits] [icu4j] Add OSGi manifest for bootstrapping Eclipse.

[Alexander Kurtakov]

commit da330a5419e137f7b5ce59c1d6618991a5df2388
Author: Alexander Kurtakov < <akurtako at redhat.com>
Date:   Tue Nov 15 15:04:46 2011 +0200

    Add OSGi manifest for bootstrapping Eclipse.

 icu4j-4.4.2-MANIFEST.MF |   28 ++++++++++++++++++++++++++++
 icu4j.spec              |   18 +++++++++++++++++-
 2 files changed, 45 insertions(+), 1 deletions(-)
---
diff --git a/icu4j-4.4.2-MANIFEST.MF b/icu4j-4.4.2-MANIFEST.MF
new file mode 100644
index 0000000..91c262a
--- /dev/null
+++ b/icu4j-4.4.2-MANIFEST.MF
@@ -0,0 +1,28 @@
+Manifest-Version: 1.0
+Export-Package: com.ibm.icu.lang;base=true;full=true;version="4.4.2.1"
+ ,com.ibm.icu.math;base=true;full=true;version="4.4.2.1",com.ibm.icu.t
+ ext;base=true;full=true;version="4.4.2.1",com.ibm.icu.util;base=true;
+ full=true;version="4.4.2.1",com.ibm.icu.impl;x-internal:=true,com.ibm
+ .icu.impl.data;x-internal:=true,com.ibm.icu.impl.data.icudt44b;x-inte
+ rnal:=true,com.ibm.icu.impl.data.icudt44b.brkitr;x-internal:=true,com
+ .ibm.icu.impl.data.icudt44b.coll;x-internal:=true,com.ibm.icu.impl.da
+ ta.icudt44b.curr;x-internal:=true,com.ibm.icu.impl.data.icudt44b.lang
+ ;x-internal:=true,com.ibm.icu.impl.data.icudt44b.rbnf;x-internal:=tru
+ e,com.ibm.icu.impl.data.icudt44b.region;x-internal:=true,com.ibm.icu.
+ impl.data.icudt44b.translit;x-internal:=true,com.ibm.icu.impl.data.ic
+ udt44b.zone;x-internal:=true,com.ibm.icu.impl.duration;x-internal:=tr
+ ue,com.ibm.icu.impl.locale;x-internal:=true
+Bundle-ClassPath: icu-data.jar,.
+Bundle-Name: %pluginName
+Bundle-Localization: plugin
+Bundle-Copyright: Licensed Materials - Property of IBM (C) Copyright I
+ BM Corp. 2000, 2011. All Rights Reserved. IBM is a registered tradema
+ rk of IBM Corp.
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-Vendor: %providerName
+Eclipse-LazyStart: true
+Bundle-Version: 4.4.2.v20110208
+Bundle-ManifestVersion: 2
+Bundle-SymbolicName: com.ibm.icu; singleton:=true
+Eclipse-ExtensibleAPI: true
+
diff --git a/icu4j.spec b/icu4j.spec
index fe37e8a..91a7420 100644
--- a/icu4j.spec
+++ b/icu4j.spec
@@ -42,7 +42,7 @@
 
 Name:           icu4j
 Version:        4.4.2
-Release:        3%{?dist}
+Release:        4%{?dist}
 Epoch:          1
 Summary:        International Components for Unicode for Java
 License:        MIT and EPL 
@@ -52,6 +52,11 @@ Group:          Development/Libraries
 #tar caf icu4j-4.4.2.tar.xz icu4j-4.4.2/
 Source0:        icu4j-4.4.2.tar.xz
 Source1:        %{name}-4.4.2.pom
+## CAUTION
+## Please do not forget to update this Manifest to the latest one taken from the icu4j bundle from
+## out/projects/ICU4J.com.ibm.icu/com.ibm.icu-com.ibm.icu.zip
+## This is needed to unbreak cyclic dependencies between Eclipse and ICU4J
+Source2:        icu4j-%{version}-MANIFEST.MF
 
 Patch0:         %{name}-crosslink.patch
 BuildRequires:  ant >= 1.7.0
@@ -61,6 +66,7 @@ BuildRequires:  java-javadoc >= 1:1.6.0
 # This is to ensure we get OpenJDK and not GCJ
 BuildRequires:  java-devel >= 1:1.6.0
 BuildRequires:  jpackage-utils >= 0:1.5
+BuildRequires:  zip
 Requires:       jpackage-utils
 # This is to ensure we get OpenJDK and not GCJ
 Requires:       java >= 1:1.6.0
@@ -132,6 +138,13 @@ popd
 %endif
   
 %install
+
+# inject OSGi manifests
+mkdir -p META-INF
+cp -p %{SOURCE2} META-INF/MANIFEST.MF
+touch META-INF/MANIFEST.MF
+zip -u %{name}.jar META-INF/MANIFEST.MF
+
 # jars
 %__mkdir_p %{buildroot}%{_javadir}
 %__cp -ap %{name}.jar %{buildroot}%{_javadir}/%{name}.jar
@@ -172,6 +185,9 @@ cp %{name}-4.4.2.pom $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}.pom
 %endif
 
 %changelog
+* Tue Nov 15 2011 Alexander Kurtakov <akurtako at redhat.com> 1:4.4.2-4
+- Add proper manifest to the jar in the main package.
+
 * Fri Sep 16 2011 Alexander Kurtakov <akurtako at redhat.com> 1:4.4.2-3
 - Adapt to current guidelines.