rpms/bouncycastle-mail/devel bouncycastle-mail.spec,1.4,1.5

[Orcan Ogetbil]

Author: oget

Update of /cvs/pkgs/rpms/bouncycastle-mail/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1268

Modified Files:
	bouncycastle-mail.spec 
Log Message:
* Sat Apr 18 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 1.42-3
- Don't build AOT bits. The package needs java1.6



Index: bouncycastle-mail.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bouncycastle-mail/devel/bouncycastle-mail.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- bouncycastle-mail.spec	9 Apr 2009 19:11:59 -0000	1.4
+++ bouncycastle-mail.spec	18 Apr 2009 21:38:41 -0000	1.5
@@ -1,10 +1,10 @@
-%define with_gcj %{!?_without_gcj:1}%{?_without_gcj:0}
+%define with_gcj %{!?_with_gcj:0}%{?_with_gcj:1}
 %define archivever  jdk16-142
 
 Summary:          S/MIME and CMS libraries for Bouncy Castle
 Name:             bouncycastle-mail
 Version:          1.42
-Release:          2%{?dist}
+Release:          3%{?dist}
 Group:            System Environment/Libraries
 License:          MIT
 URL:              http://www.bouncycastle.org/
@@ -14,6 +14,7 @@
 Source0:          bcmail-%{archivever}-FEDORA.tar.gz
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires:         bouncycastle == %{version}
+BuildRequires:    jpackage-utils >= 1.5
 Requires:         jpackage-utils >= 1.5
 %if %{with_gcj}
 Requires:         java-1.5.0-gcj
@@ -25,8 +26,8 @@
 %endif
 BuildRequires:    bouncycastle == %{version}
 BuildRequires:    java-devel >= 1.7
+Requires:         java >= 1.7
 BuildRequires:    javamail
-BuildRequires:    jpackage-utils >= 1.5
 Requires:         javamail
 
 Provides:         bcmail == %{version}-%{release}
@@ -88,15 +89,15 @@
 mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 cp -pr docs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 
-%post
 %if %{with_gcj}
+%post
   if [ -x %{_bindir}/rebuild-gcj-db ]; then
     %{_bindir}/rebuild-gcj-db
   fi
 %endif
 
-%postun
 %if %{with_gcj}
+%postun
   if [ -x %{_bindir}/rebuild-gcj-db ]; then
     %{_bindir}/rebuild-gcj-db
   fi
@@ -120,6 +121,9 @@
 %{_javadocdir}/%{name}
 
 %changelog
+* Sat Apr 18 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 1.42-3
+- Don't build AOT bits. The package needs java1.6
+
 * Thu Apr 09 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 1.42-2
 - Add missing Requires: javamail
 - Remove redundant BR: junit4