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

[Fernando Nasser (fnasser)]

Author: fnasser

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

Modified Files:
	icu4j.spec 
Log Message:
>From Ben Konrath <bkonrath at redhat.com>:
- 3.6.1.
- Enable eclipse sub-package.




Index: icu4j.spec
===================================================================
RCS file: /cvs/extras/rpms/icu4j/devel/icu4j.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- icu4j.spec	19 Mar 2007 14:59:34 -0000	1.2
+++ icu4j.spec	14 Jun 2007 14:44:59 -0000	1.3
@@ -31,7 +31,7 @@
 # If you want to build with eclipse support
 # give rpmbuild option '--with eclipse'
 
-# FIXME: Add back _with_eclipse define later.
+%define _with_eclipse 1
 
 %define with_eclipse %{?_with_eclipse:1}%{!?_with_eclipse:0}
 %define without_eclipse %{!?_with_eclipse:1}%{?_with_eclipse:0}
@@ -47,20 +47,19 @@
 %define eclipse_lib_base        %{_libdir}/%{eclipse_name}
 
 Name:           icu4j
-Version:        3.4.5
-Release:        2jpp.2%{?dist}
+Version:        3.6.1
+Release:        1jpp.1%{?dist}
 Epoch:          0
 Summary:        International Components for Unicode for Java
 License:        MIT style 
 URL:            http://www-306.ibm.com/software/globalization/icu/index.jsp
 Group:          Development/Libraries/Java
-Source0:        ftp://ftp.software.ibm.com/software/globalization/icu/icu4j/3.4.5/icu4jsrc_3_4_5.jar
+Source0:	http://download.icu-project.org/files/icu4j/3.6.1/icu4jsrc_3_6_1.jar
 Patch0:         %{name}-crosslink.patch
 Patch1:         %{name}-disable-javadocs.patch
 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
@@ -119,16 +118,14 @@
 %{__sed} -i 's/\r//' APIChangeReport.html
 %{__sed} -i 's/\r//' readme.html
 
-#%if %{with_eclipse}
-# Without this, we get the dreaded "java.lang.Object not found" error
 sed --in-place "s/ .*bootclasspath=.*//g" build.xml
-#%endif
+sed --in-place "s/<date datetime=.*when=\"after\"\/>//" build.xml
 
 %build
 %if %{without_eclipse}
-%ant -Dj2se.apidoc=%{_javadocdir}/java jar docs
+%ant -Dicu4j.javac.source=1.5 -Dicu4j.javac.target=1.5 -Dj2se.apidoc=%{_javadocdir}/java jar docs
 %else
-%ant -Dj2se.apidoc=%{_javadocdir}/java jar docs eclipseProjects
+%ant -Dicu4j.javac.source=1.5 -Dicu4j.javac.target=1.5 -Dj2se.apidoc=%{_javadocdir}/java jar docs eclipseProjects
 %endif
 
 %if %{with_eclipse}
@@ -146,7 +143,6 @@
 homedir=$(cd home > /dev/null && pwd)
 
 pushd eclipseProjects
-# com.ibm.icu plugins
 java -cp $SDK/startup.jar \
      -Dosgi.sharedConfiguration.area=%{_libdir}/eclipse/configuration \
      -Duser.home=$homedir                        \
@@ -159,21 +155,6 @@
      -Dbuilder=%{eclipse_base}/plugins/org.eclipse.pde.build/templates/package-build  \
      -f %{eclipse_base}/plugins/org.eclipse.pde.build/scripts/build.xml
 
-# com.ibm.icu.source build fails to include actual src zip.  Let's do it manually.
-relzipfiledir=%{eclipse_name}/plugins/com.ibm.icu.source_%{version}/src/com.ibm.icu_%{version}
-zipfiledir=$PWD/$relzipfiledir
-%__mkdir_p $relzipfiledir
-zipfile=$zipfiledir/src.zip
-pushd com.ibm.icu
-%__cp -rp about_files $zipfiledir
-%__cp -p about.html $zipfiledir
-pushd src
-find -name \*.java | xargs touch --date=1/1/1980
-zip -X -9 -r $zipfile . -i \*.java
-popd
-popd
-zip -X -9 -r -u build/rpmBuild/com.ibm.icu.zip $relzipfiledir
-popd
 %endif
 
 %install
@@ -229,7 +210,7 @@
 %{_javadir}/%{name}*.jar
 %if %{gcj_support}
 %dir %attr(-,root,root) %{_libdir}/gcj/%{name}
-%attr(-,root,root) %{_libdir}/gcj/%{name}/icu4j-3.4.5.jar.*
+%attr(-,root,root) %{_libdir}/gcj/%{name}/icu4j-%{version}.jar.*
 %endif
 
 %files javadoc
@@ -239,6 +220,9 @@
 %if %{with_eclipse}
 %files eclipse
 %defattr(0644,root,root,0755)
+%dir %{_datadir}/eclipse
+%dir %{_datadir}/eclipse/features
+%dir %{_datadir}/eclipse/plugins
 %{_datadir}/eclipse/features/*
 %{_datadir}/eclipse/plugins/*
 %doc license.html readme.html
@@ -248,6 +232,10 @@
 %endif
 
 %changelog
+* Thu Jun 07 2007 Ben Konrath <bkonrath at redhat.com> - 0:3.6.1-1jpp.1
+- 3.6.1.
+- Enable eclipse sub-package.
+
 * 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