rpms/java-1.4.2-gcj-compat/devel .cvsignore, 1.33, 1.34 java-1.4.2-gcj-compat.spec, 1.98, 1.99 sources, 1.37, 1.38

fedora-cvs-commits at redhat.com fedora-cvs-commits at redhat.com
Tue Aug 30 21:03:12 UTC 2005 

Author: fitzsim

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

Modified Files:
	.cvsignore java-1.4.2-gcj-compat.spec sources 
Log Message:
* Tue Aug 30 2005 Thomas Fitzsimmons <fitzsim at redhat.com> - 0:1.4.2.0-40jpp_45rh
- Import java-gcj-compat 1.0.39.
- Remove libjawt.so symlinks.
- Symlink to jni_md.h.




Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/java-1.4.2-gcj-compat/devel/.cvsignore,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- .cvsignore	29 Aug 2005 18:16:17 -0000	1.33
+++ .cvsignore	30 Aug 2005 21:02:29 -0000	1.34
@@ -1,3 +1,3 @@
-java-gcj-compat-1.0.37.tar.gz
+java-gcj-compat-1.0.39.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.98
retrieving revision 1.99
diff -u -r1.98 -r1.99
--- java-1.4.2-gcj-compat.spec	30 Aug 2005 15:55:38 -0000	1.98
+++ java-1.4.2-gcj-compat.spec	30 Aug 2005 21:02:32 -0000	1.99
@@ -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.37
+%define jgcver		1.0.39
 
 %define name		java-%{javaver}-%{origin}-compat
 %define version		%{javaver}.%{buildver}
-%define release		40jpp_44rh
+%define release		40jpp_45rh
 %define cname           java-%{javaver}-%{origin}
 #%define bcarchivever	127
 
@@ -140,8 +140,10 @@
 
 %if %{custom}
 cp -a %{SOURCE2} eclipse-ecj-%{cname}.jar
-sed 's:@JAVADIR@:%{_javadir}:g;s:eclipse-ecj.jar:eclipse-ecj-%{cname}.jar:g' \
-  < %{SOURCE3} > ecj-%{cname}
+sed 's:@JAVADIR@:%{_javadir}:g' < %{SOURCE3} > ecj-1
+sed 's:eclipse-ecj.jar:eclipse-ecj-%{cname}.jar:g' < ecj-1 > ecj-2
+LIBGCJ_JAR="%{gcj_prefix}/share/java/libgcj-`gij%{gccsuffix} --version | head -n 2 | tail -n 1 | awk '{ print $5 }'`.jar"
+sed "s,compiler.batch.Main,compiler.batch.Main -bootclasspath $LIBGCJ_JAR,g" < ecj-2 > ecj-%{cname}
 %endif
 
 %if %{bootstrap}
@@ -158,6 +160,9 @@
 %endif
 
 %install
+%if %{custom}
+export PATH=%{gcj_prefix}/bin:$PATH
+%endif
 rm -rf $RPM_BUILD_ROOT
 
 make DESTDIR=$RPM_BUILD_ROOT install
@@ -245,6 +250,11 @@
 rm -rf $RPM_BUILD_ROOT
 
 %post
+
+%if %{custom}
+export PATH=%{gcj_prefix}/bin:$PATH
+%endif
+
 update-alternatives \
   --install %{_bindir}/java java %{jrebindir}/java %{priority} \
   --slave %{_jvmdir}/jre          jre          %{_jvmdir}/%{jrelnk} \
@@ -284,13 +294,6 @@
   %{_javadir}/libgcj-`gij%{gccsuffix} --version | head -n 2 | tail -n 1 | awk '{ print $5 }'`.jar \
   %{_jvmdir}/%{cname}-%{version}/jre/lib/jndi.jar
 
-# hard-code this to %{_libdir}/libgcjawt.so.6 -- if we want to support
-# another major library version installed in parallel we can create a
-# separate java-1.4.2-gcjNEXTVERSION-compat RPM
-ln -sf \
-  %{_libdir}/libgcjawt.so.%{gccsoversion} \
-  %{_jvmdir}/%{cname}-%{version}/jre/lib/%{_arch}/libjawt.so
-
 # java.security
 ln -sf \
   %{_prefix}/lib/security/classpath.security \
@@ -305,6 +308,10 @@
 
 %post devel
 
+%if %{custom}
+export PATH=%{gcj_prefix}/bin:$PATH
+%endif
+
 update-alternatives \
   --install %{_bindir}/javac javac %{sdkbindir}/javac %{priority} \
   --slave %{_jvmdir}/java     java_sdk          %{_jvmdir}/%{sdklnk} \
@@ -332,6 +339,11 @@
   `gcj%{gccsuffix} -print-file-name=include/jni.h` \
   %{_jvmdir}/%{cname}-%{version}/include/jni.h
 
+# jni_md.h
+ln -sf \
+  `gcj%{gccsuffix} -print-file-name=include/jni_md.h` \
+  %{_jvmdir}/%{cname}-%{version}/include/linux/jni_md.h
+
 # jawt.h
 ln -sf \
   `gcj%{gccsuffix} -print-file-name=include/jawt.h` \
@@ -344,6 +356,10 @@
 
 %post src
 
+%if %{custom}
+export PATH=%{gcj_prefix}/bin:$PATH
+%endif
+
 # src.zip
 ln -sf \
   %{_javadir}/src-`gcj%{gccsuffix} --version | head -n 1 | awk '{ print $3 }'`.zip \
@@ -351,6 +367,11 @@
 
 %postun
 if [ $1 -eq 0 ] ; then
+
+%if %{custom}
+export PATH=%{gcj_prefix}/bin:$PATH
+%endif
+
    update-alternatives --remove java %{jrebindir}/java
    update-alternatives --remove jre_%{origin}  %{_jvmdir}/%{jrelnk}
    update-alternatives --remove jre_%{javaver} %{_jvmdir}/%{jrelnk}
@@ -362,6 +383,11 @@
 
 %postun devel
 if [ $1 -eq 0 ] ; then
+
+%if %{custom}
+export PATH=%{gcj_prefix}/bin:$PATH
+%endif
+
    update-alternatives --remove javac %{sdkbindir}/javac
    update-alternatives --remove java_sdk_%{origin}  %{_jvmdir}/%{sdklnk}
    update-alternatives --remove java_sdk_%{javaver} %{_jvmdir}/%{sdklnk}
@@ -369,6 +395,11 @@
 
 %triggerin -- libgcj%{gccsuffix} > %{gccver}
 {
+
+%if %{custom}
+export PATH=%{gcj_prefix}/bin:$PATH
+%endif
+
   # rt.jar
   ln -sf \
     %{_javadir}/libgcj-`gij%{gccsuffix} --version | head -n 2 | tail -n 1 | awk '{ print $5 }'`.jar \
@@ -389,11 +420,6 @@
     %{_javadir}/libgcj-`gij%{gccsuffix} --version | head -n 2 | tail -n 1 | awk '{ print $5 }'`.jar \
     %{_jvmdir}/%{cname}-%{version}/jre/lib/jndi.jar
 
-  # libjawt.so
-  ln -sf \
-    %{_libdir}/libgcjawt.so.%{gccsoversion} \
-    %{_jvmdir}/%{cname}-%{version}/jre/lib/%{_arch}/libjawt.so
-
   # jaxp_parser_impl
   update-alternatives --install %{_javadir}/jaxp_parser_impl.jar \
     jaxp_parser_impl \
@@ -403,11 +429,21 @@
 # gcc-java requires libgcj-devel which provides jni.h
 %triggerin devel -- gcc%{gccsuffix}-java > %{gccver}
 {
+
+%if %{custom}
+export PATH=%{gcj_prefix}/bin:$PATH
+%endif
+
   # jni.h
   ln -sf \
     `gcj%{gccsuffix} -print-file-name=include/jni.h` \
     %{_jvmdir}/%{cname}-%{version}/include/jni.h
 
+  # jni_md.h
+  ln -sf \
+    `gcj%{gccsuffix} -print-file-name=include/jni_md.h` \
+    %{_jvmdir}/%{cname}-%{version}/include/jni_md.h
+
   # jawt.h
   ln -sf \
     `gcj%{gccsuffix} -print-file-name=include/jawt.h` \
@@ -421,6 +457,11 @@
 
 %triggerin src -- libgcj%{gccsuffix}-src >= %{gccver}
 {
+
+%if %{custom}
+export PATH=%{gcj_prefix}/bin:$PATH
+%endif
+
   ln -sf \
     %{_javadir}/src-`gcj%{gccsuffix} --version | head -n 1 | awk '{ print $3 }'`.zip \
     %{_jvmdir}/%{cname}-%{version}/src.zip
@@ -464,6 +505,11 @@
 %defattr(-,root,root)
 
 %changelog
+* Tue Aug 30 2005 Thomas Fitzsimmons <fitzsim at redhat.com> - 0:1.4.2.0-40jpp_45rh
+- Import java-gcj-compat 1.0.39.
+- Remove libjawt.so symlinks.
+- Symlink to jni_md.h.
+
 * Tue Aug 30 2005 Thomas Fitzsimmons <fitzsim at redhat.com> - 0:1.4.2.0-40jpp_44rh
 - Install ecj when building a custom java-1.4.2-gcj-compat.
 - Fix removal of jaxp_parser_impl.jar alternative.


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/java-1.4.2-gcj-compat/devel/sources,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- sources	29 Aug 2005 18:16:18 -0000	1.37
+++ sources	30 Aug 2005 21:02:44 -0000	1.38
@@ -1,3 +1,3 @@
-af31f97c779068ed4c089a61c6d5a36a  java-gcj-compat-1.0.37.tar.gz
+bdda21f3a995cba1490b3e0990a43659  java-gcj-compat-1.0.39.tar.gz
 d17b7fa532fc87fdf14d42c2d293ec3f  bcprov-jdk14-127.tar.gz
 95766e40c6ab6b641341f3a44dcf0b9e  eclipse-ecj-3.1.0_fc-12.jar

More information about the fedora-cvs-commits mailing list