rpms/icu4j/devel icu4j-pdebuildlocation.patch, NONE, 1.1 icu4j.spec, 1.13, 1.14 icu4j-osgiconfigdir.patch, 1.1, NONE

[Andrew Overholt]

Author: overholt

Update of /cvs/pkgs/rpms/icu4j/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19191

Modified Files:
	icu4j.spec 
Added Files:
	icu4j-pdebuildlocation.patch 
Removed Files:
	icu4j-osgiconfigdir.patch 
Log Message:
* Mon Aug 11 2008 Andrew Overholt <overholt at redhat.com> 3.8.1-3
- Remove now-unnecessary OSGi configuration dir patch
- Add patch to point to PDE Build location

icu4j-pdebuildlocation.patch:

--- NEW FILE icu4j-pdebuildlocation.patch ---
diff -up ./build.xml.pdebuildlocation ./build.xml
--- ./build.xml.pdebuildlocation	2008-08-28 15:32:09.000000000 -0400
+++ ./build.xml	2008-08-28 15:41:33.000000000 -0400
@@ -1597,7 +1597,7 @@
           if="eclipse.home"
           description="Locate org.eclipse.pde.build plug-in and set the property 'eclipse.pde.dir'">
     <first id="eclipse.pde.plugin.dir">
-      <dirset dir="${eclipse.home}/plugins">
+      <dirset dir="${eclipse.home}/dropins/sdk/plugins">
         <include name="org.eclipse.pde.build_*"/>
       </dirset>
     </first>


Index: icu4j.spec
===================================================================
RCS file: /cvs/pkgs/rpms/icu4j/devel/icu4j.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- icu4j.spec	28 Aug 2008 18:45:20 -0000	1.13
+++ icu4j.spec	28 Aug 2008 19:50:22 -0000	1.14
@@ -58,9 +58,6 @@
 Group:          Development/Libraries/Java
 Source0:        http://download.icu-project.org/files/icu4j/3.8.1/icu4j-3_8_1-src.jar
 Patch0:         %{name}-crosslink.patch
-# 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
@@ -68,6 +65,8 @@
 # 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
+# PDE Build is in a location the upstream build.xml doesn't check
+Patch4:         %{name}-pdebuildlocation.patch
 BuildRequires:  ant
 # FIXME:  is this necessary or is it just adding strings in the hrefs in
 # the docs?
@@ -121,9 +120,9 @@
 %prep
 %setup -q -c
 %patch0 -p0
-%patch1 -p0
 %patch2 -p0
 %patch3 -p0
+%patch4 -p0
 
 %{__sed} -i 's/\r//' license.html
 %{__sed} -i 's/\r//' APIChangeReport.html
@@ -191,6 +190,8 @@
 - Get rid of eclipse_name macro
 - Rebuild with Eclipse 3.4 and put into Eclipse stuff into
   %{_libdir}/eclipse
+- Remove now-unnecessary OSGi configuration dir patch
+- Add patch to point to PDE Build location
 
 * Fri Jul 11 2008 Andrew Overholt <overholt at redhat.com> 0:3.8.1-2
 - Remove GCJ support due to


--- icu4j-osgiconfigdir.patch DELETED ---