rpms/java-1.4.2-gcj-compat/devel java-1.4.2-gcj-compat.spec, 1.126, 1.127

[fedora-cvs-commits at redhat.com]

Author: fitzsim

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

Modified Files:
	java-1.4.2-gcj-compat.spec 
Log Message:
* Thu Feb  2 2006 Thomas Fitzsimmons <fitzsim at redhat.com> - 0:1.4.2.0-40jpp_68rh
- Obsolete gnu-crypto-sasl-jdk1.4 and gnu-crypto-jce-jdk1.4.
- Provide java-sasl and jce.




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.126
retrieving revision 1.127
diff -u -r1.126 -r1.127
--- java-1.4.2-gcj-compat.spec	2 Feb 2006 20:19:46 -0000	1.126
+++ java-1.4.2-gcj-compat.spec	3 Feb 2006 01:52:59 -0000	1.127
@@ -21,7 +21,7 @@
 
 %define name		java-%{javaver}-%{origin}-compat
 %define version		%{javaver}.%{buildver}
-%define release 	40jpp_67rh
+%define release 	40jpp_68rh
 %define cname           java-%{javaver}-%{origin}
 %define bcarchivever	131
 
@@ -53,8 +53,9 @@
 Requires:	gjdoc
 Requires:	jessie >= 1.0.0-5
 Requires:	gnu-crypto >= 0:2.0.1-1jpp_2fc
-Requires:	gnu-crypto-sasl-jdk1.4 >= 0:2.0.1-1jpp_2fc
-Requires:	gnu-crypto-jce-jdk1.4 >= 0:2.0.1-1jpp_2fc
+# SASL and JCE are provided by libgcj.
+Obsoletes:	gnu-crypto-sasl-jdk1.4 <= 0:2.0.1-1jpp_11fc
+Obsoletes:	gnu-crypto-jce-jdk1.4 <= 0:2.0.1-1jpp_11fc
 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}
@@ -67,6 +68,9 @@
 Provides:	jaxp_parser_impl
 Provides:	jndi, jdbc-stdext, jaas, jsse
 Provides:	java-gcj-compat = %{jgcver}
+# SASL and JCE are provided by libgcj.
+Provides:	java-sasl
+Provides:	jce
 Obsoletes:	java-1.4.2-gcj4-compat <= 1.4.2.0-4jpp_2rh
 %if %{custom}
 # prevent autogeneration of libjawt.so dependencies
@@ -550,6 +554,10 @@
 %defattr(-,root,root)
 
 %changelog
+* Thu Feb  2 2006 Thomas Fitzsimmons <fitzsim at redhat.com> - 0:1.4.2.0-40jpp_68rh
+- Obsolete gnu-crypto-sasl-jdk1.4 and gnu-crypto-jce-jdk1.4.
+- Provide java-sasl and jce.
+
 * Thu Feb  2 2006 Thomas Fitzsimmons <fitzsim at redhat.com> - 0:1.4.2.0-40jpp_67rh
 - Remove conditional BuildRequires, which isn't supported by beehive.