[jBCrypt] Update to upstream version 0.4

[Michal Srb]

commit 99c80d0ac1d3da669088b80893ae9562cb9d48dc
Author: Michal Srb <msrb at redhat.com>
Date:   Tue Mar 3 00:08:51 2015 +0100

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

 .gitignore   |  1 +
 jBCrypt.spec | 30 +++++++++++++++---------------
 sources      |  3 +--
 3 files changed, 17 insertions(+), 17 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 180297f..ed1d934 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 jBCrypt-0.3.tar.gz
 /LICENSE
 /jbcrypt-0.3m.tar.gz
+/jBCrypt-0.4.tar.gz
diff --git a/jBCrypt.spec b/jBCrypt.spec
index d16da92..e5e13d0 100644
--- a/jBCrypt.spec
+++ b/jBCrypt.spec
@@ -1,20 +1,20 @@
 Name:           jBCrypt
-Version:        0.3
-Release:        12%{?dist}
+Version:        0.4
+Release:        1%{?dist}
 Summary:        Strong password hashing for Java
 
 License:        ISC
-URL:            http://www.mindrot.org/projects/jBCrypt/
-# tarball with pom.xml:
-# svn export http://jbcrypt.googlecode.com/svn/tags/jbcrypt-0.3m jBCrypt-0.3
-# tar czvf jbcrypt-0.3m.tar.gz jBCrypt-0.3
-Source0:        jbcrypt-%{version}m.tar.gz
-Source1:        http://www.mindrot.org/files/%{name}/LICENSE
+URL:            http://www.mindrot.org/projects/jBCrypt
+Source0:        http://www.mindrot.org/files/%{name}/%{name}-%{version}.tar.gz
 BuildArch:      noarch
 
-BuildRequires:  maven-local
+BuildRequires:  ant
+BuildRequires:  ant-junit
+BuildRequires:  javapackages-local
 BuildRequires:  junit
 
+Obsoletes:      %{name}-javadoc < %{version}-%{release}
+
 %description
 A Java implementation of OpenBSD's Blowfish password hashing code. 
 
@@ -27,24 +27,24 @@ This package contains the API documentation for %{name}.
 %prep
 %setup -q
 
-cp %{SOURCE1} .
-
 %mvn_file : %{name}/%{name} %{name}
 
 %build
-%mvn_build
+ant test dist
 
 %install
+%mvn_artifact 'org.mindrot:jbcrypt:0.4' jbcrypt.jar
 %mvn_install
 
 %files -f .mfiles
 %dir %{_javadir}/%{name}
 %doc LICENSE
 
-%files javadoc -f .mfiles-javadoc
-%doc LICENSE
-
 %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 Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.3-12
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
 
diff --git a/sources b/sources
index e029b00..b5e132c 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-8ac9e65ef0e09deedd05f8e131b5b2e5  LICENSE
-05c88c97c6fbd6adfda6d7f83d77a134  jbcrypt-0.3m.tar.gz
+8d059246e055a0ea9bcbf0463e439f3d  jBCrypt-0.4.tar.gz