rpms/java-1.4.2-gcj-compat/devel java-1.4.2-gcj-compat.spec, 1.68, 1.69

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

Modified Files:
	java-1.4.2-gcj-compat.spec 
Log Message:
- incorporate FC-4 branch changes.




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.68
retrieving revision 1.69
diff -u -r1.68 -r1.69
--- java-1.4.2-gcj-compat.spec	20 Jun 2005 09:10:45 -0000	1.68
+++ java-1.4.2-gcj-compat.spec	5 Jul 2005 17:57:37 -0000	1.69
@@ -4,18 +4,19 @@
 %{!?gcjprefix: 	%define gcjprefix %{nil}}
 %{!?origin:	%{expand: %%define origin gcj%{gccsuffix}}}
 %define gccsuffix	%{nil}
+%define gccsoversion	6
 %define priority	1420
 %define	javaver		1.4.2
 %define buildver	0
 # the version-release string for the gcj rpms we require
 %define gccver		4.0.0-0.42
-%define jgcver		1.0.30
+%define jgcver		1.0.29
 
 %define name		java-%{javaver}-%{origin}-compat
 %define version		%{javaver}.%{buildver}
-%define release		40jpp_30rh
+%define release		40jpp_31rh
 %define cname           java-%{javaver}-%{origin}
-%define bcarchivever	127
+#%define bcarchivever	127
 
 %define	sdklnk		java-%{javaver}-%{origin}
 %define	jrelnk		jre-%{javaver}-%{origin}
@@ -35,11 +36,11 @@
 License:	GPL
 URL:		ftp://sources.redhat.com/pub/rhug/java-gcj-compat
 Source0:        java-gcj-compat-%{jgcver}.tar.gz
-Source1:        bcprov-jdk14-%{bcarchivever}.tar.gz
+#Source1:        bcprov-jdk14-%{bcarchivever}.tar.gz
 BuildRoot:	%{_tmppath}/%{name}-buildroot
 BuildRequires:	jpackage-utils >= 0:1.5, sed
 BuildRequires:	gcc%{gccsuffix}-java >= %{gccver}
-# BuildRequires:	eclipse-ecj
+#BuildRequires:	eclipse-ecj
 Requires:	libgcj%{gccsuffix} >= %{gccver}
 Requires:	gjdoc
 Requires:	jessie >= 1.0.0-5
@@ -48,6 +49,8 @@
 Requires:	gnu-crypto-jce-jdk1.4 >= 0:2.0.1-1jpp_2fc
 Requires(post): jpackage-utils >= 0:1.6.3-1jpp_1rh
 Requires(postun): jpackage-utils >= 0:1.6.3-1jpp_1rh
+Requires(post): libgcj%{gccsuffix} >= %{gccver}
+Requires(postun): libgcj%{gccsuffix} >= %{gccver}
 Provides:	jre-%{javaver}-%{origin} = %{epoch}:%{version}-%{release}
 Provides:	jre-%{origin} = %{epoch}:%{version}-%{release}
 Provides:	jre-%{javaver}, java-%{javaver}, jre = %{javaver}
@@ -203,32 +206,34 @@
 
 # rt.jar
 ln -sf \
-  %{_javadir}/libgcj-`gcj%{gccsuffix} --version | head -n 1 | awk '{ print $3 }'`.jar \
+  %{_javadir}/libgcj-`gij%{gccsuffix} --version | head -n 2 | tail -n 1 | awk '{ print $5 }'`.jar \
   %{_jvmdir}/%{cname}-%{version}/jre/lib/rt.jar
 
 # jaas.jar
 ln -sf \
-  %{_javadir}/libgcj-`gcj%{gccsuffix} --version | head -n 1 | awk '{ print $3 }'`.jar \
+  %{_javadir}/libgcj-`gij%{gccsuffix} --version | head -n 2 | tail -n 1 | awk '{ print $5 }'`.jar \
   %{_jvmdir}/%{cname}-%{version}/jre/lib/jaas.jar
 
 # jdbc-stdext.jar
 ln -sf \
-  %{_javadir}/libgcj-`gcj%{gccsuffix} --version | head -n 1 | awk '{ print $3 }'`.jar \
+  %{_javadir}/libgcj-`gij%{gccsuffix} --version | head -n 2 | tail -n 1 | awk '{ print $5 }'`.jar \
   %{_jvmdir}/%{cname}-%{version}/jre/lib/jdbc-stdext.jar
 
 # jndi.jar
 ln -sf \
-  %{_javadir}/libgcj-`gcj%{gccsuffix} --version | head -n 1 | awk '{ print $3 }'`.jar \
+  %{_javadir}/libgcj-`gij%{gccsuffix} --version | head -n 2 | tail -n 1 | awk '{ print $5 }'`.jar \
   %{_jvmdir}/%{cname}-%{version}/jre/lib/jndi.jar
 
 # jta.jar
 ln -sf \
-  %{_javadir}/libgcj-`gcj%{gccsuffix} --version | head -n 1 | awk '{ print $3 }'`.jar \
+  %{_javadir}/libgcj-`gij%{gccsuffix} --version | head -n 2 | tail -n 1 | awk '{ print $5 }'`.jar \
   %{_jvmdir}/%{cname}-%{version}/jre/lib/jta.jar
 
-# libjawt.so
+# 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 \
-  `gcj%{gccsuffix} -print-file-name=libgcjawt.so` \
+  %{_libdir}/libgcjawt.so.%{gccsoversion} \
   %{_jvmdir}/%{cname}-%{version}/jre/lib/%{_arch}/libjawt.so
 
 # java.security
@@ -238,14 +243,10 @@
 
 %{_bindir}/rebuild-security-providers
 
-ln -sf \
-  %{_javadir}/libgcj-`gcj%{gccsuffix} --version | head -n 1 | awk '{ print $3 }'`.jar \
-  %{_javadir}/jaas.jar
-
-  # jaxp_parser_impl
+# jaxp_parser_impl
 update-alternatives --install %{_javadir}/jaxp_parser_impl.jar \
   jaxp_parser_impl \
-  %{_javadir}/libgcj-`gcj%{gccsuffix} --version | head -n 1 | awk '{ print $3 }'`.jar 20
+  %{_javadir}/libgcj-`gij%{gccsuffix} --version | head -n 2 | tail -n 1 | awk '{ print $5 }'`.jar 20
 
 %post devel
 
@@ -309,45 +310,42 @@
    update-alternatives --remove java_sdk_%{javaver} %{_jvmdir}/%{sdklnk}
 fi
 
-# gcc-java requires libgcj and provides the gcj we run for the version
-# string
-%triggerin -- gcc%{gccsuffix}-java > %{gccver}
+%triggerin -- libgcj%{gccsuffix} > %{gccver}
 {
   # rt.jar
   ln -sf \
-    %{_javadir}/libgcj-`gcj%{gccsuffix} --version | head -n 1 | awk '{ print $3 }'`.jar \
+    %{_javadir}/libgcj-`gij%{gccsuffix} --version | head -n 2 | tail -n 1 | awk '{ print $5 }'`.jar \
     %{_jvmdir}/%{cname}-%{version}/jre/lib/rt.jar
 
   # jaas.jar
   ln -sf \
-    %{_javadir}/libgcj-`gcj%{gccsuffix} --version | head -n 1 | awk '{ print $3 }'`.jar \
+    %{_javadir}/libgcj-`gij%{gccsuffix} --version | head -n 2 | tail -n 1 | awk '{ print $5 }'`.jar \
     %{_jvmdir}/%{cname}-%{version}/jre/lib/jaas.jar
 
   # jdbc-stdext.jar
   ln -sf \
-    %{_javadir}/libgcj-`gcj%{gccsuffix} --version | head -n 1 | awk '{ print $3 }'`.jar \
+    %{_javadir}/libgcj-`gij%{gccsuffix} --version | head -n 2 | tail -n 1 | awk '{ print $5 }'`.jar \
     %{_jvmdir}/%{cname}-%{version}/jre/lib/jdbc-stdext.jar
 
   # jndi.jar
   ln -sf \
-    %{_javadir}/libgcj-`gcj%{gccsuffix} --version | head -n 1 | awk '{ print $3 }'`.jar \
+    %{_javadir}/libgcj-`gij%{gccsuffix} --version | head -n 2 | tail -n 1 | awk '{ print $5 }'`.jar \
     %{_jvmdir}/%{cname}-%{version}/jre/lib/jndi.jar
 
   # jta.jar
   ln -sf \
-    %{_javadir}/libgcj-`gcj%{gccsuffix} --version | head -n 1 | awk '{ print $3 }'`.jar \
+    %{_javadir}/libgcj-`gij%{gccsuffix} --version | head -n 2 | tail -n 1 | awk '{ print $5 }'`.jar \
     %{_jvmdir}/%{cname}-%{version}/jre/lib/jta.jar
 
   # libjawt.so
   ln -sf \
-    `gcj%{gccsuffix} -print-file-name=libgcjawt.so` \
+    %{_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 \
-    %{_javadir}/libgcj-`gcj%{gccsuffix} --version | head -n 1 | awk '{ print $3 }'`.jar 20
-
+    %{_javadir}/libgcj-`gij%{gccsuffix} --version | head -n 2 | tail -n 1 | awk '{ print $5 }'`.jar 20
 } || :
 
 # gcc-java requires libgcj-devel which provides jni.h
@@ -403,23 +401,10 @@
 %defattr(-,root,root)
 
 %changelog
-* Thu May 26 2005 Thomas Fitzsimmons <fitzsim redhat com> - 0:1.4.2.0-40jpp_30rh
+* Mon Jun  6 2005 Thomas Fitzsimmons <fitzsim redhat com> - 0:1.4.2.0-40jpp_31rh
 - Add jaxp_parser_impl.jar alternative. (#158751)
-
-* Thu May 26 2005 Thomas Fitzsimmons <fitzsim redhat com> - 0:1.4.2.0-40jpp_29rh
-- Separate post and postun requires lines
-
-* Thu May 26 2005 Thomas Fitzsimmons <fitzsim redhat com> - 0:1.4.2.0-40jpp_28rh
-- Re-remove bouncy castle provider.
-
-* Thu May 26 2005 Thomas Fitzsimmons <fitzsim redhat com> - 0:1.4.2.0-40jpp_27rh
-- Re-add bouncy castle provider. (#146782)
-
-* Wed May 25 2005 Thomas Fitzsimmons <fitzsim redhat com> - 0:1.4.2.0-40jpp_26rh
-- Import java-gcj-compat 1.0.30.
-
-* Wed May 25 2005 Gary Benson <gbenson redhat com> - 0:1.4.2.0-40jpp_25rh
-- Update tools.jar with the ecj's new jarfile name (#158734).
+- Separate post and postun requires lines.
+- Use gij, not gcj to compute version strings in post and triggerin sections.
 
 * Fri May 20 2005 Thomas Fitzsimmons <fitzsim redhat com> - 0:1.4.2.0-40jpp_24rh
 - Update libjawt.so symlink to reflect libgcjawt.so's new name.