rpms/java-1.4.2-gcj-compat/devel java-1.4.2-gcj-compat.spec, 1.159, 1.160

[fedora-cvs-commits at redhat.com]

Author: fitzsim

Update of /cvs/dist/rpms/java-1.4.2-gcj-compat/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv5182

Modified Files:
	java-1.4.2-gcj-compat.spec 
Log Message:
* Sat Jul 22 2006 Thomas Fitzsimmons <fitzsim at redhat.com> - 0:1.4.2.0-40jpp_96rh
- Remove gjdoc workaround.




Index: java-1.4.2-gcj-compat.spec
===================================================================
RCS file: /cvs/dist/rpms/java-1.4.2-gcj-compat/devel/java-1.4.2-gcj-compat.spec,v
retrieving revision 1.159
retrieving revision 1.160
diff -u -r1.159 -r1.160
--- java-1.4.2-gcj-compat.spec	22 Jul 2006 06:30:02 -0000	1.159
+++ java-1.4.2-gcj-compat.spec	22 Jul 2006 22:13:18 -0000	1.160
@@ -15,7 +15,7 @@
 
 %define name		java-%{javaver}-%{origin}-compat
 %define version		%{javaver}.%{buildver}
-%define release 	40jpp_95rh
+%define release 	40jpp_96rh
 %define cname           java-%{javaver}-%{origin}
 
 %define	sdklnk		java-%{javaver}-%{origin}
@@ -234,23 +234,22 @@
 # build and install api documentation
 install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
 touch $RPM_BUILD_ROOT%{_javadocdir}/{%{name},java}
-# mkdir docsbuild
-# pushd docsbuild
-# # work around ppc64 file system corruption
-#   if unzip -tq /usr/share/java/src-`gij%{gccsuffix} --version | head -n 2 | tail -n 1 | awk '{ print $5 }'`.zip
-#   then
-#     fastjar xvf /usr/share/java/src-`gij%{gccsuffix} --version | head -n 2 | tail -n 1 | awk '{ print $5 }'`.zip
-#     rm -rf gnu
-#     find ./ -name \*.java | xargs -n 1 dirname | sort | uniq | sed -e "s/\.\///" | sed -e "s/\//\./" | \
-#       sed -e "s/\//\./" | sed -e "s/\//\./" | sed -e "s/\//\./" | sed -e "s/\//\./" | \
-#       xargs gjdoc -d $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version} -encoding UTF-8 -breakiterator -licensetext \
-#         -linksource -splitindex -doctitle "GNU libgcj `gij%{gccsuffix} --version | head -n 2 | tail -n 1 | awk '{ print $5 }'`" \
-#         -windowtitle "GNU libgcj `gij%{gccsuffix} --version | head -n 2 | tail -n 1 | awk '{ print $5 }'` Documentation"
-#   else
-#     touch $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/package-list
-#   fi
-# popd
-touch $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/package-list
+mkdir docsbuild
+pushd docsbuild
+# work around ppc64 file system corruption
+  if unzip -tq /usr/share/java/src-`gij%{gccsuffix} --version | head -n 2 | tail -n 1 | awk '{ print $5 }'`.zip
+  then
+    fastjar xvf /usr/share/java/src-`gij%{gccsuffix} --version | head -n 2 | tail -n 1 | awk '{ print $5 }'`.zip
+    rm -rf gnu
+    find ./ -name \*.java | xargs -n 1 dirname | sort | uniq | sed -e "s/\.\///" | sed -e "s/\//\./" | \
+      sed -e "s/\//\./" | sed -e "s/\//\./" | sed -e "s/\//\./" | sed -e "s/\//\./" | \
+      xargs gjdoc -d $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version} -encoding UTF-8 -breakiterator -licensetext \
+        -linksource -splitindex -doctitle "GNU libgcj `gij%{gccsuffix} --version | head -n 2 | tail -n 1 | awk '{ print $5 }'`" \
+        -windowtitle "GNU libgcj `gij%{gccsuffix} --version | head -n 2 | tail -n 1 | awk '{ print $5 }'` Documentation"
+  else
+    touch $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/package-list
+  fi
+popd
 
 %ifarch x86_64
 ln -sf %{_jvmdir}/%{jredir}/lib/%{_arch} \
@@ -623,6 +622,9 @@
 %defattr(-,root,root)
 
 %changelog
+* Sat Jul 22 2006 Thomas Fitzsimmons <fitzsim at redhat.com> - 0:1.4.2.0-40jpp_96rh
+- Remove gjdoc workaround.
+
 * Sat Jul 22 2006 Thomas Fitzsimmons <fitzsim at redhat.com> - 0:1.4.2.0-40jpp_95rh
 - Remove hack-libgcj requirement.
 - Work around gjdoc failure by not building javadocs.