rpms/icu4j/devel icu4j.spec,1.11,1.12

[Andrew Overholt (overholt)]

Author: overholt

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

Modified Files:
	icu4j.spec 
Log Message:
* Fri Jul 11 2008 Andrew Overholt <overholt at redhat.com> 0:3.8.1-2
- Remove GCJ support due to
  com.sun.tools.doclets.internal.toolkit.taglets.* import (not in gjdoc)


Index: icu4j.spec
===================================================================
RCS file: /cvs/pkgs/rpms/icu4j/devel/icu4j.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- icu4j.spec	11 Jul 2008 15:31:12 -0000	1.11
+++ icu4j.spec	11 Jul 2008 19:37:44 -0000	1.12
@@ -36,14 +36,12 @@
 %define with_eclipse %{?_with_eclipse:1}%{!?_with_eclipse:0}
 %define without_eclipse %{!?_with_eclipse:1}%{?_with_eclipse:0}
 
-%define _with_gcj_support 1
-
-%define gcj_support %{?_with_gcj_support:1}%{!?_with_gcj_support:%{?_without_gcj_support:0}%{!?_without_gcj_support:%{?_gcj_support:%{_gcj_support}}%{!?_gcj_support:0}}}
-
 %define section free
 
 %define eclipse_name            eclipse
 %define eclipse_base            %{_datadir}/%{eclipse_name}
+# Note:  this next section looks weird having an arch specified in a
+# noarch specfile but the parts of the build
 # All arches line up between Eclipse and Linux kernel names except i386 -> x86
 %ifarch %{ix86}
 %define eclipse_arch    x86
@@ -53,7 +51,7 @@
 
 Name:           icu4j
 Version:        3.8.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Epoch:          0
 Summary:        International Components for Unicode for Java
 License:        MIT and EPL 
@@ -72,21 +70,19 @@
 # to rebuild once we get 3.4 in.
 Patch3:         %{name}-individualsourcebundle.patch
 BuildRequires:  ant
-BuildRequires:  java-javadoc
+# FIXME:  is this necessary or is it just adding strings in the hrefs in
+# the docs?
+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
 Requires:       jpackage-utils
+# This is to ensure we get OpenJDK and not GCJ
+Requires:       java >= 1:1.6.0
 %if %{with_eclipse}
 BuildRequires:  eclipse-pde >= 0:3.2.1
 %endif
-%if ! %{gcj_support}
-BuildArch:      noarch
-%endif
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-%if %{gcj_support}
-BuildRequires:          java-gcj-compat-devel
-Requires(post):         java-gcj-compat
-Requires(postun):       java-gcj-compat
-%endif
 
 %description
 The International Components for Unicode (ICU) library provides robust and
@@ -107,6 +103,7 @@
 Summary:        Javadoc for %{name}
 Group:          Development/Documentation
 Requires:       jpackage-utils
+Requires:       java-javadoc >= 1:1.6.0
 
 %description javadoc
 Javadoc for %{name}.
@@ -164,42 +161,16 @@
 # eclipse
 install -d -m755 %{buildroot}/%{eclipse_base}
 
-# FIXME: icu4j generates res_index.txt differently on different arches - possible libgcj bug.
 unzip -qq -d %{buildroot}/%{eclipse_base} eclipseProjects/ICU4J.com.ibm.icu/com.ibm.icu-com.ibm.icu.zip
-
-%endif
-
-%if %{gcj_support}
-%{_bindir}/aot-compile-rpm
 %endif
 
 %clean
 %__rm -rf %{buildroot}
 
-%if %{gcj_support}
-%post
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
-
-%if %{gcj_support}
-%postun
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
-
 %files
 %defattr(0644,root,root,0755)
 %doc license.html readme.html APIChangeReport.html
 %{_javadir}/%{name}*.jar
-%if %{gcj_support}
-%dir %attr(-,root,root) %{_libdir}/gcj/%{name}
-%attr(-,root,root) %{_libdir}/gcj/%{name}/icu4j-%{version}.jar.*
-%endif
 
 %files javadoc
 %defattr(0644,root,root,0755)
@@ -214,12 +185,13 @@
 %{_datadir}/eclipse/features/*
 %{_datadir}/eclipse/plugins/*
 %doc license.html readme.html
-%if %{gcj_support}
-%{_libdir}/gcj/%{name}/com.ibm.icu*
-%endif
 %endif
 
 %changelog
+* Fri Jul 11 2008 Andrew Overholt <overholt at redhat.com> 0:3.8.1-2
+- Remove GCJ support due to
+  com.sun.tools.doclets.internal.toolkit.taglets.* import (not in gjdoc)
+
 * Fri Jul 11 2008 Andrew Overholt <overholt at redhat.com> 0:3.8.1-1
 - 3.8.1