rpms/bouncycastle/devel bouncycastle.spec,1.15,1.16

[Orcan Ogetbil]

Author: oget

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

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



Index: bouncycastle.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bouncycastle/devel/bouncycastle.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- bouncycastle.spec	20 Apr 2009 22:18:54 -0000	1.15
+++ bouncycastle.spec	10 Jul 2009 23:19:26 -0000	1.16
@@ -1,11 +1,11 @@
-%global with_gcj %{!?_with_gcj:0}%{?_with_gcj:1}
+%global with_gcj %{!?_without_gcj:1}%{?_without_gcj:0}
 %global archivever  jdk16-143
 %global classname   org.bouncycastle.jce.provider.BouncyCastleProvider
 
 Summary:          Bouncy Castle Crypto Package for Java
 Name:             bouncycastle
 Version:          1.43
-Release:          1%{?dist}
+Release:          2%{?dist}
 Group:            System Environment/Libraries
 License:          MIT
 URL:              http://www.%{name}.org/
@@ -24,8 +24,8 @@ BuildRequires:    java-gcj-compat-devel
 %else
 BuildArch:        noarch
 %endif
-BuildRequires:    java-devel >= 1.7
-Requires:         java >= 1.7
+BuildRequires:    java-devel >= 1.5
+Requires:         java >= 1.5
 BuildRequires:    junit4
 Requires:         junit4
 
@@ -59,7 +59,7 @@ unzip -qq src.zip -d src/
 %build
 pushd src
   export CLASSPATH=$(build-classpath junit4)
-  javac -target 1.5 `find . -type f -name "*.java"`
+  javac -g -target 1.5 `find . -type f -name "*.java"`
   jarfile="../bcprov-%{version}.jar"
   files="`find . -type f -name "*.class"`"
   test ! -d classes && mf="" \
@@ -81,11 +81,11 @@ install -pm 644 bcprov-%{version}.jar \
 pushd $RPM_BUILD_ROOT%{_javadir}
   ln -sf bcprov-%{version}.jar bcprov.jar
 popd
-%if %{with_gcj}
   install -dm 755 $RPM_BUILD_ROOT%{_javadir}/gcj-endorsed
   pushd $RPM_BUILD_ROOT%{_javadir}/gcj-endorsed
     ln -sf ../bcprov-%{version}.jar bcprov-%{version}.jar
   popd
+%if %{with_gcj}
   %{_bindir}/aot-compile-rpm
 %endif
 
@@ -161,8 +161,8 @@ rm -rf $RPM_BUILD_ROOT
 %doc *.html
 %{_javadir}/bcprov.jar
 %{_javadir}/bcprov-%{version}.jar
-%if %{with_gcj}
   %{_javadir}/gcj-endorsed/bcprov-%{version}.jar
+%if %{with_gcj}
   %{_libdir}/gcj/%{name}
 %endif
 %{_sysconfdir}/java/security/security.d/2000-%{classname}
@@ -172,6 +172,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_javadocdir}/%{name}
 
 %changelog
+* Fri Jul 10 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.