[jBCrypt/f20] Update to upstream version 0.4

[Michal Srb]

commit b1dc9141086b8efcb4329c33109083e1439b1cae
Author: Michal Srb <msrb at redhat.com>
Date:   Tue Mar 3 01:21:22 2015 +0100

    Update to upstream version 0.4
    
    - Resolves: CVE-2015-0886

 .gitignore   |  1 +
 jBCrypt.spec | 27 ++++++++++++---------------
 sources      |  2 +-
 3 files changed, 14 insertions(+), 16 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 244a505..14cf1f7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 jBCrypt-0.3.tar.gz
+/jBCrypt-0.4.tar.gz
diff --git a/jBCrypt.spec b/jBCrypt.spec
index f85184e..8c27891 100644
--- a/jBCrypt.spec
+++ b/jBCrypt.spec
@@ -1,18 +1,20 @@
 Name:           jBCrypt
-Version:        0.3
-Release:        9%{?dist}
+Version:        0.4
+Release:        1%{?dist}
 Summary:        Strong password hashing for Java
 
 Group:          Development/Libraries
 License:        ISC
-URL:            http://www.mindrot.org/projects/jBCrypt/
-Source0:        http://www.mindrot.org/files/jBCrypt/jBCrypt-%{version}.tar.gz
+URL:            http://www.mindrot.org/projects/jBCrypt
+Source0:        http://www.mindrot.org/files/%{name}/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
 BuildRequires:  java-devel
 BuildRequires:  jpackage-utils
 BuildRequires:  junit
+BuildRequires:  ant
+BuildRequires:  ant-junit
 
 Requires:       java
 Requires:       jpackage-utils  
@@ -26,22 +28,13 @@ A Java implementation of OpenBSD's Blowfish password hashing code.
 
 
 %build
-javac BCrypt.java
-jar cvf jBCrypt.jar BCrypt.class
-
-# compile test cases too
-javac -encoding UTF-8 -cp %{_javadir}/junit.jar:jBCrypt.jar TestBCrypt.java
-jar cvf jBCrypt-test.jar TestBCrypt.class
+ant test dist
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT%{_javadir}
-cp jBCrypt.jar $RPM_BUILD_ROOT%{_javadir}/jBCrypt.jar
-
-
-%check
-java -cp %{_javadir}/junit.jar:jBCrypt.jar:jBCrypt-test.jar TestBCrypt
+cp jbcrypt.jar $RPM_BUILD_ROOT%{_javadir}/jBCrypt.jar
 
 
 %clean
@@ -55,6 +48,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Mar 02 2015 Michal Srb <msrb at redhat.com> - 0.4-1
+- Update to upstream version 0.4
+- Resolves: CVE-2015-0886
+
 * Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.3-9
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
 
diff --git a/sources b/sources
index 22ef315..b5e132c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-84bc904669f532b7a55fc656c0f5c6d6  jBCrypt-0.3.tar.gz
+8d059246e055a0ea9bcbf0463e439f3d  jBCrypt-0.4.tar.gz