rpms/java-1.5.0-gcj/devel .cvsignore, 1.2, 1.3 java-1.5.0-gcj.spec, 1.7, 1.8 sources, 1.2, 1.3

Sun Mar 25 03:15:02 UTC 2007

Author: fitzsim

Update of /cvs/dist/rpms/java-1.5.0-gcj/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv10016

Modified Files:
	.cvsignore java-1.5.0-gcj.spec sources 
Log Message:
* Sat Mar 24 2007 Thomas Fitzsimmons <fitzsim at redhat.com> - 1.5.0.0-7
- Import java-gcj-compat 1.0.73.
- Remove java-1.4.2-gcj-compat compatibility symlinks.
- Install tools.jar symlink to libgcj-tools.jar.
- Remove gcc-java and eclipse-ecj build requirements.
- Remove workaround for ppc64 file system corruption.
- Remove workaround for gjdoc/libgcj rounding error.




Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/java-1.5.0-gcj/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3

--- .cvsignore	19 Mar 2007 18:09:37 -0000	1.2
+++ .cvsignore	25 Mar 2007 03:14:59 -0000	1.3
@@ -1 +1 @@
-java-gcj-compat-1.0.72.tar.gz
+java-gcj-compat-1.0.73.tar.gz


Index: java-1.5.0-gcj.spec
===================================================================
RCS file: /cvs/dist/rpms/java-1.5.0-gcj/devel/java-1.5.0-gcj.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- java-1.5.0-gcj.spec	19 Mar 2007 20:13:58 -0000	1.7
+++ java-1.5.0-gcj.spec	25 Mar 2007 03:14:59 -0000	1.8
@@ -17,9 +17,9 @@
 # the naming suffix for the gcc rpms we require (e.g., gcc4, libgcj4)
 %define gccsuffix       %{nil}
 # the version-release string for the gcj rpms we require
-%define gccver          4.1.2
+%define gccver          4.1.2-5
 # the version string for the java-gcj-compat release we require
-%define jgcver          1.0.72
+%define jgcver          1.0.73
 
 # hard-code libdir on 64-bit architectures to make the 64-bit JDK
 # simply be another alternative
@@ -55,7 +55,7 @@
 
 Name:    %{name}
 Version: %{javaver}.%{buildver}
-Release: 6%{?dist}
+Release: 7%{?dist}
 Summary: JPackage runtime compatibility layer for GCJ
 Group:   Development/Languages
 
@@ -65,9 +65,7 @@
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires: gcc%{gccsuffix}-java >= %{gccver}
 BuildRequires: libgcj%{gccsuffix}-src >= %{gccver}
-BuildRequires: eclipse-ecj >= 3.2.1
 BuildRequires: python-devel
 %if ! %{bootstrap}
 BuildRequires: sinjdoc
@@ -291,8 +289,6 @@
     %{_jvmdir}/%{jredir}/lib/security)
   ln -sf $RELATIVE/classpath.security java.security
 popd
-# FIXME: add security.d support to libgcj, get rid of these and
-# rebuild-security-providers
 # default security providers, provided by libgcj
 install -dm 755 $RPM_BUILD_ROOT%{_sysconfdir}/java/security/security.d
 for provider in \
@@ -333,27 +329,17 @@
 pushd docsbuild
   GIJ_VERSION=$(gij%{gccsuffix} --version | head -n 2 | tail -n 1 \
     | awk '{ print $5 }')
-  # FIXME: work around ppc64 file system corruption
-  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"
-    # FIXME: work around apparent libgcj rounding error that causes a
-    # multilib conflict in Double.html
-    sed -i 's/2.147483647/2.147483648/g' \
-      $RPM_BUILD_ROOT%{_javadocdir}/%{name}/java/lang/Double.html
-  else
-    touch $RPM_BUILD_ROOT%{_javadocdir}/%{name}/package-list
-  fi
+  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"
 popd
 %endif
 
@@ -364,21 +350,25 @@
 popd
 %endif
 
+# install operating system include directory
+install -dm 755 $RPM_BUILD_ROOT%{_jvmdir}/%{sdkdir}/include/linux
+
 # install libjvm.so directories
 install -dm 755 $RPM_BUILD_ROOT%{_jvmdir}/%{jredir}/lib/%{_arch}/client
 install -dm 755 $RPM_BUILD_ROOT%{_jvmdir}/%{jredir}/lib/%{_arch}/server
 
-# install operating system include directory
-install -dm 755 $RPM_BUILD_ROOT%{_jvmdir}/%{sdkdir}/include/linux
+# install tools.jar directory
+install -dm 755 $RPM_BUILD_ROOT%{_jvmdir}/%{sdkdir}/lib
 
-touch $RPM_BUILD_ROOT%{_jvmdir}/%{sdkdir}/jre/lib/rt.jar
 touch $RPM_BUILD_ROOT%{_jvmdir}/%{sdkdir}/include/jawt.h
 touch $RPM_BUILD_ROOT%{_jvmdir}/%{sdkdir}/include/jni.h
 touch $RPM_BUILD_ROOT%{_jvmdir}/%{sdkdir}/include/linux/jawt_md.h
 touch $RPM_BUILD_ROOT%{_jvmdir}/%{sdkdir}/include/linux/jni_md.h
+touch $RPM_BUILD_ROOT%{_jvmdir}/%{sdkdir}/lib/tools.jar
 touch $RPM_BUILD_ROOT%{_jvmdir}/%{jredir}/lib/%{_arch}/libjawt.so
 touch $RPM_BUILD_ROOT%{_jvmdir}/%{jredir}/lib/%{_arch}/client/libjvm.so
 touch $RPM_BUILD_ROOT%{_jvmdir}/%{jredir}/lib/%{_arch}/server/libjvm.so
+touch $RPM_BUILD_ROOT%{_jvmdir}/%{jredir}/lib/rt.jar
 touch $RPM_BUILD_ROOT%{_jvmdir}/%{sdkdir}/src.zip
 
 pushd $RPM_BUILD_ROOT%{_jvmdir}/%{sdkdir}/jre/lib
@@ -389,25 +379,6 @@
   done
 popd
 
-# FIXME: remove after gcc update: ecj uses libgcj's java.home property
-# to locate rt.jar.  the current libgcj is configured with
-# java.home=/usr/lib/jvm/java-1.4.2-gcj-1.4.2.0.  to avoid temporary
-# breakage of the compiler we take ownership of this compatibility
-# symlink until Rawhide libgcj is rebuild with
-# java.home=/usr/lib/jvm/java-1.5.0-gcj-1.5.0.0.  we do likewise for
-# tools.jar to avoid breaking ant.
-install -dm 755 $RPM_BUILD_ROOT%{_jvmdir}/java-1.4.2-gcj-1.4.2.0/jre/lib
-RELATIVE=$(%{abs2rel} %{_jvmdir}/%{sdkdir}/jre/lib \
-  %{_jvmdir}/java-1.4.2-gcj-1.4.2.0/jre/lib)
-ln -s $RELATIVE/rt.jar \
-  $RPM_BUILD_ROOT%{_jvmdir}/java-1.4.2-gcj-1.4.2.0/jre/lib/rt.jar
-# FIXME: remove after gcc update: tools.jar
-install -dm 755 $RPM_BUILD_ROOT%{_jvmdir}/java-1.4.2-gcj-1.4.2.0/lib
-RELATIVE=$(%{abs2rel} %{_jvmdir}/%{sdkdir}/lib \
-  %{_jvmdir}/java-1.4.2-gcj-1.4.2.0/lib)
-ln -s $RELATIVE/tools.jar \
-  $RPM_BUILD_ROOT%{_jvmdir}/java-1.4.2-gcj-1.4.2.0/lib/tools.jar
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -458,7 +429,7 @@
     jaxp_parser_impl \
     %{_javadir}/libgcj-$GIJ_VERSION.jar 20
 
-  # create symbolic links to libgcj.jar for extension jars
+  # rt.jar
   RELATIVE=$(%{abs2rel} %{_javadir} %{_jvmdir}/%{sdkdir}/jre/lib)
   ln -sf \
     $RELATIVE/libgcj-$GIJ_VERSION.jar \
@@ -530,6 +501,15 @@
 # gcc-java requires libgcj-devel which provides jni.h
 %triggerin devel -- gcc%{gccsuffix}-java >= %{gccver}
 {
+  GIJ_VERSION=$(gij%{gccsuffix} --version | head -n 2 | tail -n 1 \
+    | awk '{ print $5 }')
+
+  # tools.jar
+  RELATIVE=$(%{abs2rel} %{_javadir} %{_jvmdir}/%{sdkdir}/lib)
+  ln -sf \
+    $RELATIVE/libgcj-tools-$GIJ_VERSION.jar \
+    %{_jvmdir}/%{sdkdir}/lib/tools.jar
+
   # create symbolic links to headers in gcj's versioned directory
   for headername in jawt jni
   do
@@ -665,8 +645,6 @@
 %{_sysconfdir}/java/security/security.d/1002-gnu.javax.crypto.jce.GnuSasl
 %{_sysconfdir}/java/security/security.d/1003-gnu.javax.net.ssl.provider.Jessie
 %{_sysconfdir}/java/security/security.d/1004-gnu.javax.security.auth.callback.GnuCallbacks
-# FIXME: remove after gcc update:
-%{_jvmdir}/java-1.4.2-gcj-1.4.2.0/jre/lib/rt.jar
 
 %files devel
 %defattr(-,root,root,-)
@@ -688,15 +666,13 @@
 %{_jvmdir}/%{sdkdir}/bin/keytool
 %{_jvmdir}/%{sdkdir}/bin/rmic
 %{_jvmdir}/%{sdkdir}/bin/rmiregistry
-%{_jvmdir}/%{sdkdir}/lib/tools.jar
 %{_jvmdir}/%{sdklnk}
 %{_jvmjardir}/%{sdklnk}
 %ghost %{_jvmdir}/%{sdkdir}/include/jawt.h
 %ghost %{_jvmdir}/%{sdkdir}/include/jni.h
 %ghost %{_jvmdir}/%{sdkdir}/include/linux/jawt_md.h
 %ghost %{_jvmdir}/%{sdkdir}/include/linux/jni_md.h
-# FIXME: remove after gcc update:
-%{_jvmdir}/java-1.4.2-gcj-1.4.2.0/lib/tools.jar
+%ghost %{_jvmdir}/%{sdkdir}/lib/tools.jar
 
 %files src
 %defattr(-,root,root,-)
@@ -721,6 +697,14 @@
 %endif
 
 %changelog
+* Sat Mar 24 2007 Thomas Fitzsimmons <fitzsim at redhat.com> - 1.5.0.0-7
+- Import java-gcj-compat 1.0.73.
+- Remove java-1.4.2-gcj-compat compatibility symlinks.
+- Install tools.jar symlink to libgcj-tools.jar.
+- Remove gcc-java and eclipse-ecj build requirements.
+- Remove workaround for ppc64 file system corruption.
+- Remove workaround for gjdoc/libgcj rounding error.
+
 * Mon Mar 19 2007 Thomas Fitzsimmons <fitzsim at redhat.com> - 1.5.0.0-6
 - Set bootstrap to 0.
 - Remove bootstrap hacks.


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/java-1.5.0-gcj/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	19 Mar 2007 18:09:37 -0000	1.2
+++ sources	25 Mar 2007 03:14:59 -0000	1.3
@@ -1 +1 @@
-f42fb313f965d9c4f504c52ecd610c2b  java-gcj-compat-1.0.72.tar.gz
+0ad841e2c3a4805cf97c166d496b71b3  java-gcj-compat-1.0.73.tar.gz


