-" Makeconfig.in > Makeconfig
-
-grep -v tz-art.htm tzcode%{version}/tz-link.htm > tzcode%{version}/tz-link.html
+" 'Makeconfig.in' > Makeconfig
+
+grep -v tz-art.htm tzcode/tz-link.htm > tzcode/tz-link.html
+
+%if %{with java}
+install -d javazic
+tar zxf %{SOURCE5} -C javazic
+cd javazic
+%patch1
+
+# Hack alert! sun.tools may be defined and installed in the
+# VM. In order to guarantee that we are using IcedTea/OpenJDK
+# for creating the zoneinfo files, rebase all the packages
+# from "sun." to "rht.". Unfortunately, gcj does not support
+# any of the -Xclasspath options, so we must go this route
+# to ensure the greatest compatibility.
+# XXX: do we want 'pld' instead of 'rht'?
+mv sun rht
+find . -type f -name '*.java' -print0 \
+ | xargs -0 -- sed -i -e 's:sun\.tools\.:rht.tools.:g' \
+ -e 's:sun\.util\.:rht.util.:g'
+cd -
+%endif