rpms/java-1.5.0-gcj/devel .cvsignore, 1.7, 1.8 java-1.5.0-gcj.spec, 1.33, 1.34 sources, 1.7, 1.8

[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-serv10381

Modified Files:
	.cvsignore java-1.5.0-gcj.spec sources 
Log Message:
* Thu Apr  3 2008 Thomas Fitzsimmons <fitzsim at redhat.com> - 1.5.0.0-21
- Require java-1.6.0-openjdk-devel for javadoc instead of sinjdoc.




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/java-1.5.0-gcj/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	27 Nov 2007 15:13:11 -0000	1.7
+++ .cvsignore	3 Apr 2008 15:52:45 -0000	1.8
@@ -1 +1,2 @@
 java-gcj-compat-1.0.77.tar.gz
+javadoc-workaround.patch


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.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- java-1.5.0-gcj.spec	2 Apr 2008 22:11:01 -0000	1.33
+++ java-1.5.0-gcj.spec	3 Apr 2008 15:52:45 -0000	1.34
@@ -62,6 +62,7 @@
 License: GPL
 URL:     http://sources.redhat.com/rhug/java-gcj-compat.html
 Source0: ftp://sources.redhat.com/pub/rhug/java-gcj-compat-%{jgcver}.tar.gz
+Source1: javadoc-workaround.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -73,7 +74,8 @@
 BuildRequires: openssl
 BuildRequires: python-devel
 %if ! %{bootstrap}
-BuildRequires: sinjdoc
+# required for javadoc
+BuildRequires: java-1.6.0-openjdk-devel
 %endif
 BuildRequires: unzip
 
@@ -373,13 +375,14 @@
   then
     fastjar xvf /usr/share/java/src-$GIJ_VERSION.zip
     rm -rf gnu
+    patch -p0 < %{SOURCE1}
     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 \
+      | xargs javadoc -quiet \
       -d $RPM_BUILD_ROOT%{_javadocdir}/%{name} \
-      -encoding UTF-8 -breakiterator -licensetext \
+      -encoding UTF-8 -breakiterator \
       -linksource -splitindex -doctitle "GNU libgcj $GIJ_VERSION" \
       -windowtitle "GNU libgcj $GIJ_VERSION Documentation"
   else
@@ -738,7 +741,6 @@
 %{_bindir}/aot-compile-rpm
 %{python_sitelib}/aotcompile.py*
 %{python_sitelib}/classfile.py*
-%{python_sitelib}/java_gcj_compat-1.0.77-py2.5.egg-info
 %{_jvmdir}/%{sdkdir}/bin/appletviewer
 %{_jvmdir}/%{sdkdir}/bin/jar
 %{_jvmdir}/%{sdkdir}/bin/jarsigner
@@ -780,6 +782,9 @@
 %endif
 
 %changelog
+* Thu Apr  3 2008 Thomas Fitzsimmons <fitzsim at redhat.com> - 1.5.0.0-21
+- Require java-1.6.0-openjdk-devel for javadoc instead of sinjdoc.
+
 * Wed Apr  2 2008 Thomas Fitzsimmons <fitzsim at redhat.com> - 1.5.0.0-21
 - Commit patch to add proper triggerin requires from Orion Poplawski
   <orion at cora.nwra.com>.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/java-1.5.0-gcj/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	27 Nov 2007 15:13:11 -0000	1.7
+++ sources	3 Apr 2008 15:52:45 -0000	1.8
@@ -1 +1,2 @@
 cafa8e490957ad2c56fc61802332e9a4  java-gcj-compat-1.0.77.tar.gz
+c1b0b1c5507c73c3f5195c408d2a6406  javadoc-workaround.patch