rpms/java-1.5.0-gcj/devel java-1.5.0-gcj.spec,1.28,1.29

[Thomas Fitzsimmons (fitzsim)]

Author: fitzsim

Update of /cvs/pkgs/rpms/java-1.5.0-gcj/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26854

Modified Files:
	java-1.5.0-gcj.spec 
Log Message:
- Work around rhbz#404981




Index: java-1.5.0-gcj.spec
===================================================================
RCS file: /cvs/pkgs/rpms/java-1.5.0-gcj/devel/java-1.5.0-gcj.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- java-1.5.0-gcj.spec	21 Jan 2008 16:45:32 -0000	1.28
+++ java-1.5.0-gcj.spec	21 Jan 2008 19:09:31 -0000	1.29
@@ -347,19 +347,25 @@
   GIJ_VERSION=$(gij%{gccsuffix} --version | head -n 2 | tail -n 1 \
     | awk '{ print $5 }')
   echo ==== CHECK ZIP ====
-  unzip -t /usr/share/java/src-$GIJ_VERSION.zip
-  echo ==== CHECK ZIP ====
-  fastjar xvf /usr/share/java/src-$GIJ_VERSION.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 sinjdoc \
-    -d $RPM_BUILD_ROOT%{_javadocdir}/%{name} \
-    -encoding UTF-8 -breakiterator -licensetext \
-    -linksource -splitindex -doctitle "GNU libgcj $GIJ_VERSION" \
-    -windowtitle "GNU libgcj $GIJ_VERSION Documentation"
+  unzip -tq /usr/share/java/src-$GIJ_VERSION.zip || :
+  echo ==== END CHECK ZIP ====
+  if `unzip -tq /usr/share/java/src-$GIJ_VERSION.zip`
+  then
+    fastjar xvf /usr/share/java/src-$GIJ_VERSION.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 sinjdoc \
+      -d $RPM_BUILD_ROOT%{_javadocdir}/%{name} \
+      -encoding UTF-8 -breakiterator -licensetext \
+      -linksource -splitindex -doctitle "GNU libgcj $GIJ_VERSION" \
+      -windowtitle "GNU libgcj $GIJ_VERSION Documentation"
+  else
+    # Work around https://bugzilla.redhat.com/show_bug.cgi?id=404981
+    touch $RPM_BUILD_ROOT%{_javadocdir}/%{name}/package-list
+  fi
 popd
 %endif
 
@@ -754,6 +760,7 @@
 
 %changelog
 * Mon Jan 21 2008 Thomas Fitzsimmons <fitzsim at redhat.com> - 1.5.0.0-19
+- Work around rhbz#404981
 - Inline rebuild-security-providers.
 - Resolves: rhbz#260161