[bouncycastle] Drop gcj.

[Alexander Kurtakov]

commit 2b8eb2a710e31d5372064016f8ec33a43ecc8e2e
Author: Alexander Kurtakov <akurtako at redhat.com>
Date:   Thu Dec 30 13:00:33 2010 +0200

    Drop gcj.
    
    Adapt to current guidelines.

 bouncycastle.spec |   34 +++++-----------------------------
 1 files changed, 5 insertions(+), 29 deletions(-)
---
diff --git a/bouncycastle.spec b/bouncycastle.spec
index f48c85f..d2a6c6a 100644
--- a/bouncycastle.spec
+++ b/bouncycastle.spec
@@ -1,4 +1,3 @@
-%global with_gcj %{!?_without_gcj:1}%{?_without_gcj:0}
 %global ver  1.45
 %global archivever  jdk16-%(echo %{ver}|sed 's|\\\.||')
 %global classname   org.bouncycastle.jce.provider.BouncyCastleProvider
@@ -6,7 +5,7 @@
 Summary:          Bouncy Castle Crypto Package for Java
 Name:             bouncycastle
 Version:          %{ver}
-Release:          1%{?dist}
+Release:          2%{?dist}
 Group:            System Environment/Libraries
 License:          MIT
 URL:              http://www.%{name}.org/
@@ -21,14 +20,7 @@ BuildRequires:    jpackage-utils >= 1.5
 Requires:         jpackage-utils >= 1.5
 Requires(post):   jpackage-utils >= 1.7
 Requires(postun): jpackage-utils >= 1.7
-%if %{with_gcj}
-Requires:         java-1.5.0-gcj
-Requires(post):   java-gcj-compat
-Requires(postun): java-gcj-compat
-BuildRequires:    java-gcj-compat-devel
-%else
 BuildArch:        noarch
-%endif
 BuildRequires:    java-devel >= 1.7
 Requires:         java >= 1.7
 BuildRequires:    junit4
@@ -92,9 +84,6 @@ popd
   pushd $RPM_BUILD_ROOT%{_javadir}/gcj-endorsed
     ln -sf ../bcprov-%{version}.jar bcprov-%{version}.jar
   popd
-%if %{with_gcj}
-  %{_bindir}/aot-compile-rpm
-%endif
 
 # javadoc
 mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}
@@ -138,11 +127,6 @@ popd
   done
 } || :
 
-%if %{with_gcj}
-  if [ -x %{_bindir}/rebuild-gcj-db ]; then
-    %{_bindir}/rebuild-gcj-db
-  fi
-%endif
 %update_maven_depmap
 
 %postun
@@ -169,27 +153,15 @@ if [ $1 -eq 0 ] ; then
     done
   } || :
 
-  %if %{with_gcj}
-    if [ -x %{_bindir}/rebuild-gcj-db ]; then
-      %{_bindir}/rebuild-gcj-db
-    fi
-  %endif
-
 fi
 %update_maven_depmap
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
 %files
 %defattr(-,root,root,-)
 %doc *.html
 %{_javadir}/bcprov.jar
 %{_javadir}/bcprov-%{version}.jar
   %{_javadir}/gcj-endorsed/bcprov-%{version}.jar
-%if %{with_gcj}
-  %{_libdir}/gcj/%{name}/
-%endif
 %{_sysconfdir}/java/security/security.d/2000-%{classname}
 %{_mavenpomdir}/JPP-bcprov.pom
 %{_mavendepmapfragdir}/%{name}
@@ -199,6 +171,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_javadocdir}/%{name}/
 
 %changelog
+* Thu Dec 30 2010 Alexander Kurtakov <akurtako at redhat.com> 1.45-2
+- Drop gcj.
+- Adapt to current guidelines.
+
 * Thu Feb 11 2010 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 1.45-1
 - Import Bouncy Castle 1.45.