rpms/icu4j/devel icu4j-osgiconfigdir.patch, NONE, 1.1 icu4j-individualsourcebundle.patch, NONE, 1.1 icu4j.spec, 1.10, 1.11 icu4j-crosslink.patch, 1.1, 1.2 sources, 1.3, 1.4 .cvsignore, 1.3, 1.4 icu4j-updatetimestamp.patch, 1.2, 1.3

Andrew Overholt (overholt) fedora-extras-commits at redhat.com
Fri Jul 11 15:31:59 UTC 2008 

Author: overholt

Update of /cvs/pkgs/rpms/icu4j/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21219/devel

Modified Files:
	icu4j.spec icu4j-crosslink.patch sources .cvsignore 
	icu4j-updatetimestamp.patch 
Added Files:
	icu4j-osgiconfigdir.patch icu4j-individualsourcebundle.patch 
Log Message:
* Fri Jul 11 2008 Andrew Overholt <overholt at redhat.com> 0:3.8.1-1
- 3.8.1

icu4j-osgiconfigdir.patch:

--- NEW FILE icu4j-osgiconfigdir.patch ---
--- build.xml.orig	2008-07-02 13:58:41.000000000 -0400
+++ build.xml	2008-07-02 14:03:57.000000000 -0400
@@ -1621,6 +1621,8 @@
       </copy>
 
       <java jar="${eclipse.launcher}" fork="true" failonerror="true">
+	  <sysproperty key="osgi.sharedConfiguration.area"
+	      value="/usr/lib/eclipse/configuration"/>
         <arg value="-application"/>
         <arg value="org.eclipse.ant.core.antRunner"/>
         <arg value="-buildfile"/>

icu4j-individualsourcebundle.patch:

--- NEW FILE icu4j-individualsourcebundle.patch ---
--- src/com/ibm/icu/dev/eclipse/features/com.ibm.icu/feature.xml	2007-12-10 21:56:10.000000000 -0500
+++ src/com/ibm/icu/dev/eclipse/features/com.ibm.icu/feature.xml	2008-07-08 10:45:08.000000000 -0400
@@ -27,6 +27,7 @@
          id="com.ibm.icu.source"
          download-size="0"
          install-size="0"
-         version="@BUILD_VERSION@"/>
+         version="@BUILD_VERSION@"
+         unpack="false"/>
 
 </feature>


Index: icu4j.spec
===================================================================
RCS file: /cvs/pkgs/rpms/icu4j/devel/icu4j.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- icu4j.spec	9 Jul 2008 18:40:08 -0000	1.10
+++ icu4j.spec	11 Jul 2008 15:31:12 -0000	1.11
@@ -44,22 +44,33 @@
 
 %define eclipse_name            eclipse
 %define eclipse_base            %{_datadir}/%{eclipse_name}
-%define eclipse_lib_base        %{_libdir}/%{eclipse_name}
+# All arches line up between Eclipse and Linux kernel names except i386 -> x86
+%ifarch %{ix86}
+%define eclipse_arch    x86
+%else
+%define eclipse_arch   %{_arch}
+%endif
 
 Name:           icu4j
-Version:        3.6.1
-Release:        3%{?dist}
+Version:        3.8.1
+Release:        1%{?dist}
 Epoch:          0
 Summary:        International Components for Unicode for Java
 License:        MIT and EPL 
 URL:            http://www-306.ibm.com/software/globalization/icu/index.jsp
 Group:          Development/Libraries/Java
-Source0:	http://download.icu-project.org/files/icu4j/3.6.1/icu4jsrc_3_6_1.jar
+Source0:        http://download.icu-project.org/files/icu4j/3.8.1/icu4j-3_8_1-src.jar
 Patch0:         %{name}-crosslink.patch
-Patch1:         %{name}-disable-javadocs.patch
-# Take from tag release-3-6-1-eclipse331-20070906
-# Patch made using Eclipse won't apply due to Windows line ending issue.
+# Set the OSGi shared configuration dir for our split (libdir and
+# datadir) Eclipse packages.  Will go away once 3.4 is in.
+Patch1:         %{name}-osgiconfigdir.patch
+# Update the MANIFEST.MF to have the same qualifier in the bundle as is
+# in Eclipse's Orbit project
 Patch2:         %{name}-updatetimestamp.patch
+# Bundle the source instead of having it be an exploded directory.  This
+# doesn't work with a 3.3 Eclipse SDK but will with a 3.4 so we'll have
+# to rebuild once we get 3.4 in.
+Patch3:         %{name}-individualsourcebundle.patch
 BuildRequires:  ant
 BuildRequires:  java-javadoc
 BuildRequires:  jpackage-utils >= 0:1.5
@@ -115,7 +126,8 @@
 %setup -q -c
 %patch0 -p0
 %patch1 -p0
-%patch2 -p1
+%patch2 -p0
+%patch3 -p0
 
 %{__sed} -i 's/\r//' license.html
 %{__sed} -i 's/\r//' APIChangeReport.html
@@ -123,41 +135,16 @@
 
 sed --in-place "s/ .*bootclasspath=.*//g" build.xml
 sed --in-place "s/<date datetime=.*when=\"after\"\/>//" build.xml
+sed --in-place "/javac1.3/d" build.xml
+sed --in-place "s:/usr/lib:%{_libdir}:g" build.xml
 
 %build
 %if %{without_eclipse}
 %ant -Dicu4j.javac.source=1.5 -Dicu4j.javac.target=1.5 -Dj2se.apidoc=%{_javadocdir}/java jar docs
 %else
-%ant -Dicu4j.javac.source=1.5 -Dicu4j.javac.target=1.5 -Dj2se.apidoc=%{_javadocdir}/java jar docs eclipseProjects
-%endif
-
-%if %{with_eclipse}
-# eclipse build
-export JAVA_HOME=%{java_home}
-export PATH=%{java_bin}:/usr/bin:$PATH
-    
-# See comments in the script to understand this.
-/bin/sh -x %{eclipse_base}/buildscripts/copy-platform SDK %{eclipse_base}
-SDK=$(cd SDK >/dev/null && pwd)
-    
-# Eclipse may try to write to the home directory.
-%__mkdir_p home
-
-homedir=$(cd home > /dev/null && pwd)
-
-pushd eclipseProjects
-java -cp $SDK/startup.jar \
-     -Dosgi.sharedConfiguration.area=%{_libdir}/eclipse/configuration \
-     -Duser.home=$homedir                        \
-     org.eclipse.core.launcher.Main             \
-     -application org.eclipse.ant.core.antRunner       \
-     -Dtype=feature                                    \
-     -Did=com.ibm.icu                                  \
-     -DsourceDirectory=$(pwd)                          \
-     -DbaseLocation=$SDK                               \
-     -Dbuilder=%{eclipse_base}/plugins/org.eclipse.pde.build/templates/package-build  \
-     -f %{eclipse_base}/plugins/org.eclipse.pde.build/scripts/build.xml
-
+%ant -Dj2se.apidoc=%{_javadocdir}/java -Declipse.home=%{eclipse_base} \
+  -Declipse.basews=gtk -Declipse.baseos=linux \
+  -Declipse.basearch=%{eclipse_arch} jar docs eclipsePDEBuild
 %endif
 
 %install
@@ -175,12 +162,10 @@
 
 %if %{with_eclipse}
 # eclipse
-install -d -m755 %{buildroot}/%{eclipse_lib_base}
+install -d -m755 %{buildroot}/%{eclipse_base}
 
-pushd eclipseProjects
 # FIXME: icu4j generates res_index.txt differently on different arches - possible libgcj bug.
-unzip -qq -d %{buildroot}/%{_datadir}/ build/rpmBuild/com.ibm.icu.zip
-popd
+unzip -qq -d %{buildroot}/%{eclipse_base} eclipseProjects/ICU4J.com.ibm.icu/com.ibm.icu-com.ibm.icu.zip
 
 %endif
 
@@ -235,6 +220,9 @@
 %endif
 
 %changelog
+* Fri Jul 11 2008 Andrew Overholt <overholt at redhat.com> 0:3.8.1-1
+- 3.8.1
+
 * Wed Jul  9 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0:3.6.1-3
 - drop repotag
 - fix license tag

icu4j-crosslink.patch:

Index: icu4j-crosslink.patch
===================================================================
RCS file: /cvs/pkgs/rpms/icu4j/devel/icu4j-crosslink.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- icu4j-crosslink.patch	14 Mar 2007 15:27:21 -0000	1.1
+++ icu4j-crosslink.patch	11 Jul 2008 15:31:12 -0000	1.2
@@ -1,20 +1,20 @@
---- build.xml.orig	2006-07-17 19:12:17.000000000 -0400
-+++ build.xml	2006-07-17 19:13:59.000000000 -0400
-@@ -339,7 +339,7 @@
-             docencoding="iso-8859-1"
-             bottom="&lt;font size=-1>Copyright (c) 2006 IBM Corporation and others.&lt;/font>"
-             additionalparam="${doc.params}"
--            link="http://java.sun.com/j2se/1.5/docs/api"
-+	     link="${j2se.apidoc}"
-             source="1.4"/>
-     </target>
+--- build.xml.orig	2007-12-10 21:56:54.000000000 -0500
++++ build.xml	2008-06-30 18:29:36.000000000 -0400
+@@ -425,7 +425,7 @@
+               docencoding="iso-8859-1"
+               bottom="&lt;font size=-1>Copyright (c) ${current.year} IBM Corporation and others.&lt;/font>"
+               additionalparam="${doc.params}"
+-              link="http://java.sun.com/j2se/1.5/docs/api"
++	      link="${j2se.apidoc}"
+               source="1.4" />
+   </target>
  
-@@ -357,7 +357,7 @@
-             docencoding="iso-8859-1"
-             bottom="&lt;font size=-1>Copyright (c) 2004 IBM Corporation and others.&lt;/font>"
-             additionalparam="${doc.params}"
--            link="http://java.sun.com/j2se/1.4/docs/api"
-+	     link="${j2se.apidoc}"
-             source="1.4"/>
-     </target>
+@@ -442,7 +442,7 @@
+               docencoding="iso-8859-1"
+               bottom="&lt;font size=-1>Copyright (c) ${current.year} IBM Corporation and others.&lt;/font>"
+               additionalparam="${doc.params}"
+-              link="http://java.sun.com/j2se/1.5/docs/api"
++	      link="${j2se.apidoc}"
+               source="1.4" />
+   </target>
  


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/icu4j/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	14 Jun 2007 16:20:17 -0000	1.3
+++ sources	11 Jul 2008 15:31:12 -0000	1.4
@@ -1 +1 @@
-e282dad6502ee0679c69d0a26e541552  icu4jsrc_3_6_1.jar
+fd16dc861110419e615a7ce540a7676d  icu4j-3_8_1-src.jar


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/icu4j/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	14 Jun 2007 16:20:17 -0000	1.3
+++ .cvsignore	11 Jul 2008 15:31:12 -0000	1.4
@@ -1 +1 @@
-icu4jsrc_3_6_1.jar
+icu4j-3_8_1-src.jar

icu4j-updatetimestamp.patch:

Index: icu4j-updatetimestamp.patch
===================================================================
RCS file: /cvs/pkgs/rpms/icu4j/devel/icu4j-updatetimestamp.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- icu4j-updatetimestamp.patch	13 Nov 2007 16:40:10 -0000	1.2
+++ icu4j-updatetimestamp.patch	11 Jul 2008 15:31:12 -0000	1.3
@@ -1,9 +1,11 @@
-diff -ur icu4j-3.6.1/build.properties icu4j-3.6.1/build.properties
---- icu4j-3.6.1/build.properties	2007-04-27 11:42:26.000000000 -0400
-+++ icu4j-3.6.1/build.properties	2007-11-13 11:29:21.000000000 -0500
-@@ -14,4 +14,4 @@
- copyright=Copyright (c) 2000-2007, International Business Machines Corporation and others.  All Rights Reserved.
- corp=IBM Corporation
- copyright.eclipse=Licensed Materials - Property of IBM \n (C) Copyright IBM Corp. 2000, 2007. All Rights Reserved. \n IBM is a registered trademark of IBM Corp.
--icu4j.eclipse.build.version.string=3.6.1.v20070417
-+icu4j.eclipse.build.version.string=3.6.1.v20070906
+--- build.properties.orig	2008-07-02 14:38:30.000000000 -0400
++++ build.properties	2008-07-02 14:38:49.000000000 -0400
+@@ -27,4 +27,6 @@
+ default.target.rt.version=J2SE15
+ 
+ icu4j.plugin.impl.version.string=3.8.1
+-copyright.eclipse=Licensed Materials - Property of IBM \n (C) Copyright IBM Corp. 2000, 2007. All Rights Reserved. \n IBM is a registered trademark of IBM Corp.
+\ No newline at end of file
++copyright.eclipse=Licensed Materials - Property of IBM \n (C) Copyright IBM Corp. 2000, 2007. All Rights Reserved. \n IBM is a registered trademark of IBM Corp.
++
++icu4j.eclipse.build.version.string=3.8.1.v20080530

More information about the scm-commits mailing list