[jhdf5] Update version

[Clément David]

commit 8240757445a5bfbdb75e0709dc1a5a85f38aebb3
Author: Clément DAVID <clement.david at scilab-enterprises.com>
Date:   Fri Feb 28 18:00:20 2014 +0100

    Update version
    
    - Change R:java to R:java-headless (Bug 1068283).

 .gitignore |    2 ++
 jhdf5.spec |   28 ++++++++++++++++++++--------
 sources    |    2 +-
 3 files changed, 23 insertions(+), 9 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 9aa80d1..a084fd1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,8 +3,10 @@
 /*.log
 /*.src.rpm
 /hdf-java/
+/hdf-java-*-source/
 /noarch/
 /i686/
 /x86_64/
 /results_jhdf5/
 /hdf-java-*-src.tar
+/hdf-java-*-source.tar.gz
diff --git a/jhdf5.spec b/jhdf5.spec
index 62d02a3..4a72dc0 100644
--- a/jhdf5.spec
+++ b/jhdf5.spec
@@ -1,12 +1,12 @@
 Name:           jhdf5
-Version:        2.9
-Release:        4%{?dist}
+Version:        2.10
+Release:        1%{?dist}
 Summary:        Java HDF5 Package
 
 Group:          Development/Libraries
 License:        BSD with advertising
 URL:            http://www.hdfgroup.org/hdf-java-html/
-Source0:        http://www.hdfgroup.org/ftp/HDF5/hdf-java/src/hdf-java-%{version}-src.tar
+Source0:        http://www.hdfgroup.org/ftp/HDF5/hdf-java/src/hdf-java-%{version}-source.tar.gz
 Source1:        hdfview
 Source2:        hdfview.xml
 Source3:        hdfview.desktop
@@ -22,11 +22,13 @@ BuildRequires:  jpackage-utils
 BuildRequires:  java-devel
 BuildRequires:  hdf5-devel
 BuildRequires:  libjpeg-devel
+BuildRequires:  slf4j
 
 BuildRequires:  junit
 
 Requires:       jpackage-utils
-Requires:       java
+Requires:       java-headless
+Requires:       slf4j
 # hdf5 does not bump soname but check at runtime
 Requires:       hdf5 = %{_hdf5_version}
 
@@ -55,7 +57,8 @@ BuildRequires:  java-devel
 BuildRequires:  hdf-devel
 
 Requires:       jpackage-utils
-Requires:       java
+Requires:       java-headless
+Requires:       slf4j
 
 %description -n jhdf
 HDF is a versatile data model that can represent very complex data objects
@@ -74,7 +77,8 @@ BuildRequires:  hdf5-devel
 BuildRequires:  hdf-devel
 
 Requires:       jpackage-utils
-Requires:       java
+Requires:       java-headless
+Requires:       slf4j
 Requires:       hdf
 # hdf5 does not bump soname but check at runtime
 Requires:       hdf5 = %{_hdf5_version}
@@ -106,6 +110,7 @@ BuildRequires:  desktop-file-utils
 
 Requires:       jpackage-utils
 Requires:       java
+Requires:       slf4j
 Requires:       jhdfobj = %{version}-%{release}
 
 Requires(post): desktop-file-utils
@@ -122,7 +127,7 @@ This package provides a HDF4/HDF5 viewer.
 
 
 %prep
-%setup -q -n hdf-java
+%setup -q -n hdf-java-%{version}-source
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
@@ -134,7 +139,10 @@ This package provides a HDF4/HDF5 viewer.
 rm $(find -name \*.jar)
 
 # build jar repo
-build-jar-repository -p lib junit
+build-jar-repository -p lib/ junit slf4j-
+ln -s slf4j-api.jar lib/slf4j-api-1.7.5.jar
+ln -s slf4j-nop.jar lib/slf4j-nop-1.7.5.jar
+
 
 # fix spurious-executable-perm
 chmod -x $(find docs -type f)
@@ -272,6 +280,10 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %doc docs 
 
 %changelog
+* Fri Feb 28 2014 Clément David <c.david86 at gmail.com> - 2.10-1
+- Update version
+- Change R:java to R:java-headless (Bug 1068283).
+
 * Fri Dec 27 2013 Orion Poplawski <orion at cora.nwra.com> - 2.9-4
 - Rebuild for hdf5 1.8.12
 
diff --git a/sources b/sources
index b22626b..bbdfa37 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-f8d53e7d51c9351f4b1c6d7573729558  hdf-java-2.9-src.tar
+4cdad087aaa381a342e936387ef26dde  hdf-java-2.10-source.tar.gz