rpms/gnu-crypto/devel gnu-crypto.spec,1.7,1.8

[fedora-cvs-commits at redhat.com]

Update of /cvs/dist/rpms/gnu-crypto/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24946

Modified Files:
	gnu-crypto.spec 
Log Message:
* Wed Apr 13 2005 Thomas Fitzsimmons <fitzsim at redhat.com> - 0:2.0.1-1jpp_2fc
- Add gcj endorsed dir support.
- Add GnuCrypto security provider to classpath.security.




Index: gnu-crypto.spec
===================================================================
RCS file: /cvs/dist/rpms/gnu-crypto/devel/gnu-crypto.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- gnu-crypto.spec	4 Nov 2004 17:54:34 -0000	1.7
+++ gnu-crypto.spec	14 Apr 2005 21:39:01 -0000	1.8
@@ -1,10 +1,8 @@
-# This flag causes a jce subpackage to be built.
-# (required for libgcj which does not contain JCE).
-%define build_jce 1
+%define gcj_support 1
 
 Name:           gnu-crypto
 Version:        2.0.1
-Release:        1jpp_1fc
+Release:        1jpp_2fc
 Epoch:          0
 Summary:        GNU Crypto library for Java
 
@@ -19,10 +17,11 @@
 
 BuildArch:      noarch
 BuildRequires:  ant, java-devel >= 0:1.4
-%if !%{build_jce}
+%if !%{gcj_support}
 Requires:       java >= 0:1.4
 %else
 Requires:       jce
+Requires:       jpackage-utils >= 0:1.6.2-1jpp_5rh
 %endif
 Requires:       java-sasl
 
@@ -36,15 +35,19 @@
 Summary:        Gnu Crypto SASL API
 Group:          Security/Cryptography
 Provides:       java-sasl
+%if %{gcj_support}
+Requires:	gcc-java >= 4.0.0-0.42
+%endif
 
 %description    sasl-jdk1.4
 %{summary}.
 
-%if %{build_jce}
+%if %{gcj_support}
 %package        jce-jdk1.4
 Summary:        Gnu Crypto JCE API
 Group:          Security/Cryptography
 Provides:       jce
+Requires:	gcc-java >= 4.0.0-0.42
 
 %description    jce-jdk1.4
 %{summary}.
@@ -62,7 +65,7 @@
 %prep
 %setup -q
 %patch0 -p0
-%if !%{build_jce}
+%if !%{gcj_support}
 %patch1 -p0
 %endif
 
@@ -74,10 +77,20 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 
+%if %{gcj_support}
+install -dm 755 $RPM_BUILD_ROOT%{_sysconfdir}/java/security/security.d
+touch $RPM_BUILD_ROOT%{_sysconfdir}/java/security/security.d/3000-gnu.crypto.jce.GnuCrypto
+%endif
+
 install -dm 755 $RPM_BUILD_ROOT%{_javadir}
 install -pm 644 lib/gnu-crypto.jar \
   $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
 ln -s %{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
+%if %{gcj_support}
+install -dm 755 $RPM_BUILD_ROOT%{_javadir}/gcj-endorsed
+ln -s %{_javadir}/%{name}-%{version}.jar \
+  $RPM_BUILD_ROOT%{_javadir}/gcj-endorsed/%{name}-%{version}.jar
+%endif
 
 install -dm 755 \
   $RPM_BUILD_ROOT%{_javadir}-{ext,1.4.0,1.4.1,1.4.2}
@@ -87,14 +100,22 @@
   ln -s %{_javadir}-ext/%{name}-sasl-jdk1.4.jar \
     $RPM_BUILD_ROOT%{_javadir}-$javaver/sasl.jar
 done
+%if %{gcj_support}
+ln -s %{_javadir}-ext/%{name}-sasl-jdk1.4.jar \
+  $RPM_BUILD_ROOT%{_javadir}/gcj-endorsed/%{name}-sasl-jdk1.4.jar
+%endif
 
-%if %{build_jce}
+# The jce subpackage is required for libgcj which does not contain
+# JCE.
+%if %{gcj_support}
 install -pm 644 lib/javax-crypto.jar \
   $RPM_BUILD_ROOT%{_javadir}-ext/%{name}-jce-jdk1.4.jar
 for javaver in 1.4.0 1.4.1 1.4.2 ; do
   ln -s %{_javadir}-ext/%{name}-jce-jdk1.4.jar \
     $RPM_BUILD_ROOT%{_javadir}-$javaver/jce.jar
 done
+ln -s %{_javadir}-ext/%{name}-jce-jdk1.4.jar \
+  $RPM_BUILD_ROOT%{_javadir}/gcj-endorsed/%{name}-jce-jdk1.4.jar
 %endif
 
 install -dm 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
@@ -110,6 +131,14 @@
 rm -rf $RPM_BUILD_ROOT
 
 
+%if %{gcj_support}
+%post
+rebuild-security-providers
+
+%postun
+rebuild-security-providers
+%endif
+
 %post javadoc
 rm -f %{_javadocdir}/%{name}
 ln -s %{name}-%{version} %{_javadocdir}/%{name}
@@ -119,6 +148,10 @@
 %defattr(644,root,root,755)
 %doc AUTHORS ChangeLog COPYING README THANKS
 %{_javadir}/%{name}*.jar
+%if %{gcj_support}
+%{_sysconfdir}/java/security/security.d/3000-gnu.crypto.jce.GnuCrypto
+%{_javadir}/gcj-endorsed/%{name}-%{version}.jar
+%endif
 
 %files sasl-jdk1.4
 %defattr(644,root,root,755)
@@ -128,7 +161,7 @@
 %{_javadir}-1.4.1/sasl.jar
 %{_javadir}-1.4.2/sasl.jar
 
-%if %{build_jce}
+%if %{gcj_support}
 %files jce-jdk1.4
 %defattr(644,root,root,755)
 %doc AUTHORS ChangeLog COPYING README THANKS
@@ -136,6 +169,8 @@
 %{_javadir}-1.4.0/jce.jar
 %{_javadir}-1.4.1/jce.jar
 %{_javadir}-1.4.2/jce.jar
+%{_javadir}/gcj-endorsed/%{name}-sasl-jdk1.4.jar
+%{_javadir}/gcj-endorsed/%{name}-jce-jdk1.4.jar
 %endif
 
 %files javadoc
@@ -145,6 +180,10 @@
 
 
 %changelog
+* Wed Apr 13 2005 Thomas Fitzsimmons <fitzsim at redhat.com> - 0:2.0.1-1jpp_2fc
+- Add gcj endorsed dir support.
+- Add GnuCrypto security provider to classpath.security.
+
 * Thu Nov  4 2004 Gary Benson <gbenson at redhat.com> 0:2.0.1-1jpp_1fc
 - Build into Fedora.