[bouncycastle-mail] Build with -source 1.6 -target 1.6

[Orcan Ogetbil]

commit 0730af5b95bc16f03dc06e3242788f618c76b2e7
Author: Orcan Ogetbil <oget.fedora at gmail.com>
Date:   Sat Feb 18 01:13:21 2012 -0500

    Build with -source 1.6 -target 1.6

 bouncycastle-mail.spec |   17 +++++++----------
 1 files changed, 7 insertions(+), 10 deletions(-)
---
diff --git a/bouncycastle-mail.spec b/bouncycastle-mail.spec
index a662420..12266c8 100644
--- a/bouncycastle-mail.spec
+++ b/bouncycastle-mail.spec
@@ -4,7 +4,7 @@
 Summary:          S/MIME and CMS libraries for Bouncy Castle
 Name:             bouncycastle-mail
 Version:          %{ver}
-Release:          3%{?dist}
+Release:          4%{?dist}
 Group:            System Environment/Libraries
 License:          MIT
 URL:              http://www.bouncycastle.org/
@@ -14,14 +14,15 @@ URL:              http://www.bouncycastle.org/
 # Speciifically: IDEA algorithms got removed.
 Source0:          bcmail-%{archivever}-FEDORA.tar.gz
 Source1:          http://repo2.maven.org/maven2/org/bouncycastle/bcmail-jdk16/%{version}/bcmail-jdk16-%{version}.pom
-BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires:         bouncycastle == %{version}
+Requires:         bouncycastle >= 1.46-4
 BuildRequires:    jpackage-utils >= 1.5
 Requires:         jpackage-utils >= 1.5
 Requires(post):   jpackage-utils >= 1.7
 Requires(postun): jpackage-utils >= 1.7
 BuildArch:        noarch
 BuildRequires:    bouncycastle == %{version}
+BuildRequires:    bouncycastle >= 1.46-4
 BuildRequires:    java-devel >= 1.7
 Requires:         java >= 1.7
 BuildRequires:    javamail
@@ -57,7 +58,7 @@ find . -type f -name "*.jar" -exec rm -f {} \;
 %build
 pushd src
   export CLASSPATH=$(build-classpath junit4 bcprov javamail)
-  %javac -g -target 1.7 -encoding UTF-8 $(find . -type f -name "*.java")
+  %javac -g -source 1.6 -target 1.6 -encoding UTF-8 $(find . -type f -name "*.java")
   jarfile="../bcmail-%{version}.jar"
   # Exclude all */test/* , cf. upstream
   files="$(find . -type f \( -name '*.class' -o -name '*.properties' \) -not -path '*/test/*')"
@@ -68,8 +69,6 @@ pushd src
 popd
 
 %install
-rm -rf $RPM_BUILD_ROOT
-
 # install bouncy castle mail
 install -dm 755 $RPM_BUILD_ROOT%{_javadir}
 install -pm 644 bcmail-%{version}.jar \
@@ -107,11 +106,7 @@ popd
 %postun
 %update_maven_depmap
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
 %files
-%defattr(-,root,root,-)
 %doc *.html
 %{_javadir}/bcmail.jar
 %{_javadir}/bcmail-%{version}.jar
@@ -120,10 +115,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_mavendepmapfragdir}/%{name}
 
 %files javadoc
-%defattr(-,root,root,-)
 %{_javadocdir}/%{name}
 
 %changelog
+* Sat Feb 18 2012 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 1.46-4
+- Build with -source 1.6 -target 1.6
+
 * Thu Jan 12 2012 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 1.46-3
 - Update javac target version to 1.7 to build with new java