[jhdf5] split jhdfobj as an object oriented API of jhdf and jhdf5.

[Clément David]

commit fac3a19956acfb1abbc07697db2a21abb15fd853
Author: Clément DAVID <davidcl at fedoraproject.org>
Date:   Mon Jan 30 09:01:12 2012 +0100

    split jhdfobj as an object oriented API of jhdf and jhdf5.

 jhdf5.spec |   69 +++++++++++++++++++++++++++++++++++++++++------------------
 1 files changed, 48 insertions(+), 21 deletions(-)
---
diff --git a/jhdf5.spec b/jhdf5.spec
index df419d0..d3d0066 100644
--- a/jhdf5.spec
+++ b/jhdf5.spec
@@ -1,7 +1,7 @@
 Name:           jhdf5
 Version:        2.8
-Release:        2%{?dist}
-Summary:        Java HDF5 Object Package
+Release:        3%{?dist}
+Summary:        Java HDF5 Package
 
 Group:          Development/Libraries
 License:        BSD with advertising
@@ -32,8 +32,7 @@ HDF is a versatile data model that can represent very complex data objects
 and a wide variety of meta-data. It is a completely portable file format
 with no limit on the number or size of data objects in the collection.
 
-This Java package implements HDF5 data objects in an 
-object-oriented form. It provides a common Java API for accessing HDF5 files.
+This Java package wrap the native HDF5 library.
 
 %package devel
 Summary: JHDF5 development files
@@ -45,7 +44,7 @@ Requires: hdf5-devel
 JHDF5 development headers and libraries.
 
 %package -n jhdf
-Summary:        Java HDF Object Package
+Summary:        Java HDF Package
 Group:          Development/Libraries
 
 BuildRequires:  jpackage-utils
@@ -60,17 +59,42 @@ HDF is a versatile data model that can represent very complex data objects
 and a wide variety of meta-data. It is a completely portable file format
 with no limit on the number or size of data objects in the collection.
 
-This Java package implements HDF data objects in an 
+This Java package wrap the native HDF4 library.
+
+%package -n jhdfobj
+Summary:        Java HDF/HDF5 Object Package
+Group:          Development/Libraries
+
+BuildRequires:  jpackage-utils
+BuildRequires:  java-devel
+BuildRequires:  hdf5-devel
+BuildRequires:  hdf-devel
+
+Requires:       jpackage-utils
+Requires:       java
+Requires:       hdf
+# hdf5 does not bump soname but check at runtime
+Requires:       hdf5 = %{_hdf5_version}
+Requires:       jhdf = %{version}-%{release}
+Requires:       jhdf5 = %{version}-%{release}
+
+BuildArch:      noarch
+
+%description -n jhdfobj
+HDF is a versatile data model that can represent very complex data objects
+and a wide variety of meta-data. It is a completely portable file format
+with no limit on the number or size of data objects in the collection.
+
+This Java package implements HDF4/HDF5 data objects in an 
 object-oriented form. It provides a common Java API for accessing HDF files.
 
+
 %package -n hdfview
 Summary:        Java HDF Object viewer
 Group:          Applications/File
 
 BuildRequires:  jpackage-utils
 BuildRequires:  java-devel
-BuildRequires:  hdf5-devel
-BuildRequires:  hdf-devel
 
 # for convert
 BuildRequires:  ImageMagick
@@ -79,11 +103,7 @@ BuildRequires:  desktop-file-utils
 
 Requires:       jpackage-utils
 Requires:       java
-Requires:       hdf
-# hdf5 does not bump soname but check at runtime
-Requires:       hdf5 = %{_hdf5_version}
-Requires:       jhdf = %{version}-%{release}
-Requires:       jhdf5 = %{version}-%{release}
+Requires:       jhdfobj = %{version}-%{release}
 
 Requires(post): desktop-file-utils
 Requires(postun): desktop-file-utils
@@ -143,8 +163,6 @@ make natives jhdf-packages jhdf5-packages \
 # jhdf5 jars
 install -dm 755 %{buildroot}%{_javadir}
 install -pm 0644 lib/jhdf5.jar %{buildroot}%{_javadir}/jhdf5.jar
-install -pm 0644 lib/jhdf5obj.jar %{buildroot}%{_javadir}/jhdf5obj.jar
-install -pm 0644 lib/jhdfobj.jar %{buildroot}%{_javadir}/jhdfobj.jar
 
 # jhdf5 lib
 install -dm 755 %{buildroot}%{_jnidir}
@@ -153,13 +171,17 @@ install -m 744 lib/linux/libjhdf5.so %{buildroot}%{_jnidir}
 # jhdf jars
 install -dm 755 %{buildroot}%{_javadir}
 install -pm 0644 lib/jhdf.jar %{buildroot}%{_javadir}/jhdf.jar
-install -pm 0644 lib/jhdf4obj.jar %{buildroot}%{_javadir}/jhdf4obj.jar
-install -pm 0644 lib/jhdfobj.jar %{buildroot}%{_javadir}/jhdfobj.jar
 
 # jhdf lib
 install -dm 755 %{buildroot}%{_jnidir}
 install -m 744 lib/linux/libjhdf.so %{buildroot}%{_jnidir}
 
+# jhdfobj jars
+install -dm 755 %{buildroot}%{_javadir}
+install -pm 0644 lib/jhdfobj.jar %{buildroot}%{_javadir}/jhdfobj.jar
+install -pm 0644 lib/jhdf4obj.jar %{buildroot}%{_javadir}/jhdf4obj.jar
+install -pm 0644 lib/jhdf5obj.jar %{buildroot}%{_javadir}/jhdf5obj.jar
+
 # hdfview
 install -dm 755 %{buildroot}%{_javadir}
 install -pm 0644 lib/jhdfview.jar %{buildroot}%{_javadir}/jhdfview.jar
@@ -218,18 +240,20 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
 %files
 %{_javadir}/jhdf5.jar
-%{_javadir}/jhdf5obj.jar
-%{_javadir}/jhdfobj.jar
 %attr(755,root,root) %{_jnidir}/libjhdf5.so
 %doc COPYING Readme.txt
 
 %files -n jhdf
 %{_javadir}/jhdf.jar
-%{_javadir}/jhdf4obj.jar
-%{_javadir}/jhdfobj.jar
 %attr(755,root,root) %{_jnidir}/libjhdf.so
 %doc COPYING Readme.txt
 
+%files -n jhdfobj
+%{_javadir}/jhdfobj.jar
+%{_javadir}/jhdf4obj.jar
+%{_javadir}/jhdf5obj.jar
+%doc COPYING Readme.txt
+
 %files -n hdfview
 %{_bindir}/hdfview
 %{_datadir}/applications/hdfview.desktop
@@ -240,6 +264,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %doc docs 
 
 %changelog
+* Wed Jan 30 2012 Clément David <davidcl at fedoraproject.org> - 2.8-3
+- split jhdfobj as an object oriented API of jhdf and jhdf5.
+
 * Wed Jan 27 2012 Clément David <davidcl at fedoraproject.org> - 2.8-2
 - use %%{_hdf5_version} for hdfview
 - use same jhdf and jhdf5 versions for hdfview