rpms/java-1.4.2-gcj-compat/devel .cvsignore, 1.34, 1.35 java-1.4.2-gcj-compat.spec, 1.100, 1.101 sources, 1.38, 1.39

[fedora-cvs-commits redhat com]

Author: fitzsim

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

Modified Files:
	.cvsignore java-1.4.2-gcj-compat.spec sources 
Log Message:
* Wed Aug 31 2005 Thomas Fitzsimmons <fitzsim redhat com> - 0:1.4.2.0-40jpp_47rh
- Import java-gcj-compat 1.0.40.
- Point jaxp_parser_impl at proper libgcj-<version>.jar for custom
  builds.




Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/java-1.4.2-gcj-compat/devel/.cvsignore,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- .cvsignore	30 Aug 2005 21:02:29 -0000	1.34
+++ .cvsignore	31 Aug 2005 21:54:39 -0000	1.35
@@ -1,3 +1,3 @@
-java-gcj-compat-1.0.39.tar.gz
+java-gcj-compat-1.0.40.tar.gz
 bcprov-jdk14-127.tar.gz
 eclipse-ecj-3.1.0_fc-12.jar


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.100
retrieving revision 1.101
diff -u -r1.100 -r1.101
--- java-1.4.2-gcj-compat.spec	31 Aug 2005 18:40:42 -0000	1.100
+++ java-1.4.2-gcj-compat.spec	31 Aug 2005 21:54:39 -0000	1.101
@@ -17,11 +17,11 @@
 %define buildver	0
 # the version-release string for the gcj rpms we require
 %define gccver		4.0.0-0.42
-%define jgcver		1.0.39
+%define jgcver		1.0.40
 
 %define name		java-%{javaver}-%{origin}-compat
 %define version		%{javaver}.%{buildver}
-%define release		40jpp_46rh
+%define release		40jpp_47rh
 %define cname           java-%{javaver}-%{origin}
 #%define bcarchivever	127
 
@@ -305,10 +305,17 @@
 
 %{_bindir}/rebuild-security-providers
 
+%if %{custom}
+# jaxp_parser_impl
+update-alternatives --install %{_javadir}/jaxp_parser_impl.jar \
+  jaxp_parser_impl \
+  %{gcj_prefix}/share/java/libgcj-`gij%{gccsuffix} --version | head -n 2 | tail -n 1 | awk '{ print $5 }'`.jar 20
+%else
 # jaxp_parser_impl
 update-alternatives --install %{_javadir}/jaxp_parser_impl.jar \
   jaxp_parser_impl \
   %{_javadir}/libgcj-`gij%{gccsuffix} --version | head -n 2 | tail -n 1 | awk '{ print $5 }'`.jar 20
+%endif
 
 %post devel
 
@@ -379,8 +386,13 @@
    update-alternatives --remove java %{jrebindir}/java
    update-alternatives --remove jre_%{origin}  %{_jvmdir}/%{jrelnk}
    update-alternatives --remove jre_%{javaver} %{_jvmdir}/%{jrelnk}
+%if %{custom}
+   update-alternatives --remove jaxp_parser_impl \
+     %{gcj_prefix}/share/java/libgcj-`gij%{gccsuffix} --version | head -n 2 | tail -n 1 | awk '{ print $5 }'`.jar
+%else
    update-alternatives --remove jaxp_parser_impl \
      %{_javadir}/libgcj-`gij%{gccsuffix} --version | head -n 2 | tail -n 1 | awk '{ print $5 }'`.jar
+%endif
 fi
 
 %{_bindir}/rebuild-security-providers
@@ -424,10 +436,17 @@
     %{_javadir}/libgcj-`gij%{gccsuffix} --version | head -n 2 | tail -n 1 | awk '{ print $5 }'`.jar \
     %{_jvmdir}/%{cname}-%{version}/jre/lib/jndi.jar
 
+%if %{custom}
+  # jaxp_parser_impl
+  update-alternatives --install %{_javadir}/jaxp_parser_impl.jar \
+    jaxp_parser_impl \
+    %{gcj_prefix}/share/java/libgcj-`gij%{gccsuffix} --version | head -n 2 | tail -n 1 | awk '{ print $5 }'`.jar 20
+%else
   # jaxp_parser_impl
   update-alternatives --install %{_javadir}/jaxp_parser_impl.jar \
     jaxp_parser_impl \
     %{_javadir}/libgcj-`gij%{gccsuffix} --version | head -n 2 | tail -n 1 | awk '{ print $5 }'`.jar 20
+%endif
 } || :
 
 # gcc-java requires libgcj-devel which provides jni.h
@@ -509,6 +528,11 @@
 %defattr(-,root,root)
 
 %changelog
+* Wed Aug 31 2005 Thomas Fitzsimmons <fitzsim redhat com> - 0:1.4.2.0-40jpp_47rh
+- Import java-gcj-compat 1.0.40.
+- Point jaxp_parser_impl at proper libgcj-<version>.jar for custom
+  builds.
+
 * Wed Aug 31 2005 Thomas Fitzsimmons <fitzsim redhat com> - 0:1.4.2.0-40jpp_46rh
 - Don't autogenerate libjawt.so dependencies in custom builds.
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/java-1.4.2-gcj-compat/devel/sources,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- sources	30 Aug 2005 21:02:44 -0000	1.38
+++ sources	31 Aug 2005 21:54:39 -0000	1.39
@@ -1,3 +1,3 @@
-bdda21f3a995cba1490b3e0990a43659  java-gcj-compat-1.0.39.tar.gz
+5fbcef1164e0aef6f93615179212016f  java-gcj-compat-1.0.40.tar.gz
 d17b7fa532fc87fdf14d42c2d293ec3f  bcprov-jdk14-127.tar.gz
 95766e40c6ab6b641341f3a44dcf0b9e  eclipse-ecj-3.1.0_fc-12.jar