rpms/gnu-crypto/devel gnu-crypto.spec,1.12,1.13

[fedora-cvs-commits at redhat.com]

Author: gbenson

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

Modified Files:
	gnu-crypto.spec 
Log Message:
Build on ia64, ppc64, s390 and s390x


Index: gnu-crypto.spec
===================================================================
RCS file: /cvs/dist/rpms/gnu-crypto/devel/gnu-crypto.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- gnu-crypto.spec	28 Jun 2005 10:27:36 -0000	1.12
+++ gnu-crypto.spec	15 Jul 2005 11:46:18 -0000	1.13
@@ -2,7 +2,7 @@
 
 Name:           gnu-crypto
 Version:        2.0.1
-Release:        1jpp_6fc
+Release:        1jpp_7fc
 Epoch:          0
 Summary:        GNU Crypto library for Java
 
@@ -27,10 +27,9 @@
 Requires:       java-sasl
 %if %{gcj_support}
 # libgcj aot-compiled native libraries
-BuildRequires:         gcc-java >= 4.0.0-0.43
-BuildRequires:         java-1.4.2-gcj-compat >= 1.4.2.0-40jpp_16rh
-Requires(post,postun): java-1.4.2-gcj-compat >= 1.4.2.0-40jpp_16rh
-ExclusiveArch:         %{ix86} x86_64 ppc alpha
+BuildRequires:    java-gcj-compat-devel >= 1.0.31
+Requires(post):   java-gcj-compat >= 1.0.31
+Requires(postun): java-gcj-compat >= 1.0.31
 %else
 BuildArch:      noarch
 %endif
@@ -47,7 +46,8 @@
 Provides:       java-sasl
 %if %{gcj_support}
 Requires:	libgcj >= 4.0.0-0.42
-Requires(post,postun): java-1.4.2-gcj-compat >= 1.4.2.0-40jpp_16rh
+Requires(post):   java-gcj-compat >= 1.0.31
+Requires(postun): java-gcj-compat >= 1.0.31
 %endif
 
 %description    sasl-jdk1.4
@@ -59,7 +59,8 @@
 Group:          Security/Cryptography
 Provides:       jce
 Requires:	libgcj >= 4.0.0-0.42
-Requires(post,postun): java-1.4.2-gcj-compat >= 1.4.2.0-40jpp_16rh
+Requires(post):   java-gcj-compat >= 1.0.31
+Requires(postun): java-gcj-compat >= 1.0.31
 
 %description    jce-jdk1.4
 %{summary}.
@@ -85,25 +86,6 @@
 %build
 ant -Djdk2=true -Dj2se.apidoc=%{_javadocdir}/java jar javadoc2
 
-%if %{gcj_support}
-for dst in %{name} %{name}-sasl-jdk1.4 %{name}-jce-jdk1.4; do
-    case $dst in
-        %{name})             src=%{name};        size=1024 ;;
-        %{name}-sasl-jdk1.4) src=javax-security; size=64 ;;
-        %{name}-jce-jdk1.4)  src=javax-crypto;   size=128 ;;
-    esac
-    gcj-dbtool -n lib/$dst-%{version}.db $size
-    aot-compile \
-        lib/$src.jar \
-        lib/lib$dst-%{version}.jar.so \
-        "$RPM_OPT_FLAGS -fPIC"
-    gcj-dbtool -f \
-        lib/$dst-%{version}.db \
-        lib/$src.jar \
-        %{_libdir}/lib$dst-%{version}.jar.so
-done
-%endif
-
 %install
 rm -rf $RPM_BUILD_ROOT
 
@@ -148,21 +130,13 @@
   $RPM_BUILD_ROOT%{_javadir}/gcj-endorsed/%{name}-jce-jdk1.4.jar
 %endif
 
-%if %{gcj_support}
-# solibs
-install -d -m 755 $RPM_BUILD_ROOT%{_libdir}
-install -m 755 lib/lib*.jar.so $RPM_BUILD_ROOT%{_libdir}
-
-# gcjdb
-gcjdbdir=`gcj-dbtool -p %{_libdir}`.d
-install -d -m 755 $RPM_BUILD_ROOT$gcjdbdir
-install -m 644 lib/*.db $RPM_BUILD_ROOT$gcjdbdir
-%endif
-
 install -dm 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
 cp -pR docs/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
 ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 
+%if %{gcj_support}
+aot-compile-rpm
+%endif
 
 %check || :
 # ant check # takes a looooong time
@@ -175,23 +149,23 @@
 %if %{gcj_support}
 %post
 %{_bindir}/rebuild-security-providers
-%{_bindir}/rebuild-gcj-db %{_libdir}
+%{_bindir}/rebuild-gcj-db
 
 %postun
 %{_bindir}/rebuild-security-providers
-%{_bindir}/rebuild-gcj-db %{_libdir}
+%{_bindir}/rebuild-gcj-db
 
 %post sasl-jdk1.4
-%{_bindir}/rebuild-gcj-db %{_libdir}
+%{_bindir}/rebuild-gcj-db
 
 %postun sasl-jdk1.4
-%{_bindir}/rebuild-gcj-db %{_libdir}
+%{_bindir}/rebuild-gcj-db
 
 %post jce-jdk1.4
-%{_bindir}/rebuild-gcj-db %{_libdir}
+%{_bindir}/rebuild-gcj-db
 
 %postun jce-jdk1.4
-%{_bindir}/rebuild-gcj-db %{_libdir}
+%{_bindir}/rebuild-gcj-db
 %endif
 
 %post javadoc
@@ -206,8 +180,8 @@
 %if %{gcj_support}
 %{_sysconfdir}/java/security/security.d/3000-gnu.crypto.jce.GnuCrypto
 %{_javadir}/gcj-endorsed/%{name}-%{version}.jar
-%attr(0755,root,root) %{_libdir}/lib%{name}-%{version}.jar.so
-%{_libdir}/*/*/%{name}-%{version}.db
+%dir %{_libdir}/gcj/%{name}
+%attr(-,root,root) %{_libdir}/gcj/%{name}/%{name}-%{version}.jar.*
 %endif
 
 %files sasl-jdk1.4
@@ -219,8 +193,7 @@
 %{_javadir}-1.4.2/sasl.jar
 %if %{gcj_support}
 %{_javadir}/gcj-endorsed/%{name}-sasl-jdk1.4.jar
-%attr(0755,root,root) %{_libdir}/lib%{name}-sasl-jdk1.4-%{version}.jar.so
-%{_libdir}/*/*/%{name}-sasl-jdk1.4-%{version}.db
+%attr(-,root,root) %{_libdir}/gcj/%{name}/%{name}-sasl-jdk1.4.jar.*
 %endif
 
 %if %{gcj_support}
@@ -232,8 +205,7 @@
 %{_javadir}-1.4.1/jce.jar
 %{_javadir}-1.4.2/jce.jar
 %{_javadir}/gcj-endorsed/%{name}-jce-jdk1.4.jar
-%attr(0755,root,root) %{_libdir}/lib%{name}-jce-jdk1.4-%{version}.jar.so
-%{_libdir}/*/*/%{name}-jce-jdk1.4-%{version}.db
+%attr(-,root,root) %{_libdir}/gcj/%{name}/%{name}-jce-jdk1.4.jar.*
 %endif
 
 %files javadoc
@@ -243,6 +215,10 @@
 
 
 %changelog
+* Fri Jul 15 2005 Gary Benson <gbenson at redhat.com> - 0:2.0.1-1jpp_7fc
+- Build on ia64, ppc64, s390 and s390x.
+- Switch to aot-compile-rpm.
+
 * Tue Jun 28 2005 Gary Benson <gbenson at redhat.com> - 0:2.0.1-1jpp_6fc
 - BC-compile.