rpms/icu4j/devel icu4j.spec,1.1,1.2

[Fernando Nasser (fnasser)]

Author: fnasser

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

Modified Files:
	icu4j.spec 
Log Message:
auto-import icu4j-3.4.5-2jpp.2 on branch devel from icu4j-3.4.5-2jpp.2.src.rpm


Index: icu4j.spec
===================================================================
RCS file: /cvs/extras/rpms/icu4j/devel/icu4j.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- icu4j.spec	14 Mar 2007 15:27:21 -0000	1.1
+++ icu4j.spec	19 Mar 2007 14:59:34 -0000	1.2
@@ -31,7 +31,7 @@
 # If you want to build with eclipse support
 # give rpmbuild option '--with eclipse'
 
-%define _with_eclipse 1
+# FIXME: Add back _with_eclipse define later.
 
 %define with_eclipse %{?_with_eclipse:1}%{!?_with_eclipse:0}
 %define without_eclipse %{!?_with_eclipse:1}%{?_with_eclipse:0}
@@ -48,7 +48,7 @@
 
 Name:           icu4j
 Version:        3.4.5
-Release:        2jpp.1%{?dist}
+Release:        2jpp.2%{?dist}
 Epoch:          0
 Summary:        International Components for Unicode for Java
 License:        MIT style 
@@ -60,6 +60,7 @@
 BuildRequires:  ant
 BuildRequires:  java-javadoc
 BuildRequires:  jpackage-utils >= 0:1.5
+BuildRequires:  sinjdoc
 Requires:       jpackage-utils
 %if %{with_eclipse}
 BuildRequires:  eclipse-pde >= 0:3.2.1
@@ -118,10 +119,10 @@
 %{__sed} -i 's/\r//' APIChangeReport.html
 %{__sed} -i 's/\r//' readme.html
 
-%if %{with_eclipse}
+#%if %{with_eclipse}
 # Without this, we get the dreaded "java.lang.Object not found" error
 sed --in-place "s/ .*bootclasspath=.*//g" build.xml
-%endif
+#%endif
 
 %build
 %if %{without_eclipse}
@@ -147,7 +148,7 @@
 pushd eclipseProjects
 # com.ibm.icu plugins
 java -cp $SDK/startup.jar \
-     -Dosgi.sharedConfiguration.area=%{_libdir}/eclipse/configuration                        \
+     -Dosgi.sharedConfiguration.area=%{_libdir}/eclipse/configuration \
      -Duser.home=$homedir                        \
      org.eclipse.core.launcher.Main             \
      -application org.eclipse.ant.core.antRunner       \
@@ -247,6 +248,12 @@
 %endif
 
 %changelog
+* Fri Mar 16 2007 Jeff Johnston <jjohnstn at redhat.com> - 0:3.4.5-2jpp.2
+- Disable eclipse plugin support temporarily until build problems
+  can be worked out.  Plugin is still being built as part of
+  eclipse platform.
+- BuildRequire sinjdoc.
+
 * Mon Feb 12 2007 Matt Wringe <mwringe at redhat.com> - 0:3.4.5-2jpp.1
 - Fix some rpmlint issues
 - Make use of buildroot more consistent