rpms/bouncycastle-mail/F-11 bouncycastle-mail.spec,1.7,1.8

[Orcan Ogetbil]

Author: oget

Update of /cvs/pkgs/rpms/bouncycastle-mail/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3870

Modified Files:
	bouncycastle-mail.spec 
Log Message:
* Tue Jul 13 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 1.43-2
- Re-enable AOT bits thanks to Andrew Haley.



Index: bouncycastle-mail.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bouncycastle-mail/F-11/bouncycastle-mail.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- bouncycastle-mail.spec	20 Apr 2009 23:39:09 -0000	1.7
+++ bouncycastle-mail.spec	14 Jul 2009 22:37:19 -0000	1.8
@@ -1,10 +1,10 @@
-%define with_gcj %{!?_with_gcj:0}%{?_with_gcj:1}
-%define archivever  jdk16-143
+%global with_gcj %{!?_without_gcj:1}%{?_without_gcj:0}
+%global archivever  jdk16-143
 
 Summary:          S/MIME and CMS libraries for Bouncy Castle
 Name:             bouncycastle-mail
 Version:          1.43
-Release:          1%{?dist}
+Release:          2%{?dist}
 Group:            System Environment/Libraries
 License:          MIT
 URL:              http://www.bouncycastle.org/
@@ -77,11 +77,11 @@ install -pm 644 bcmail-%{version}.jar \
 pushd $RPM_BUILD_ROOT%{_javadir}
   ln -sf bcmail-%{version}.jar bcmail.jar
 popd
-%if %{with_gcj}
 install -dm 755 $RPM_BUILD_ROOT%{_javadir}/gcj-endorsed
 pushd $RPM_BUILD_ROOT%{_javadir}/gcj-endorsed
   ln -sf ../bcmail-%{version}.jar bcmail-%{version}.jar
 popd
+%if %{with_gcj}
   %{_bindir}/aot-compile-rpm
 %endif
 
@@ -111,9 +111,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc *.html
 %{_javadir}/bcmail.jar
 %{_javadir}/bcmail-%{version}.jar
+%{_javadir}/gcj-endorsed/bcmail-%{version}.jar
 %if %{with_gcj}
-  %{_javadir}/gcj-endorsed/bcmail-%{version}.jar
-  %{_libdir}/gcj/%{name}
+  %{_libdir}/gcj/%{name}/
 %endif
 
 %files javadoc
@@ -121,6 +121,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_javadocdir}/%{name}
 
 %changelog
+* Tue Jul 13 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 1.43-2
+- Re-enable AOT bits thanks to Andrew Haley.
+
 * Mon Apr 20 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 1.43-1
 - Import Bouncy Castle 1.43.