[jhdf5: 1/3] move jars to more standard locations

[Clément David]

commit 1da52c6998d12744c927bba0092aa663fc39236b
Author: Clément DAVID <clement.david at scilab-enterprises.com>
Date:   Wed Jan 25 14:25:57 2012 +0100

    move jars to more standard locations

 jhdf5.spec |   51 ++++++++++++++++++++++++++-------------------------
 1 files changed, 26 insertions(+), 25 deletions(-)
---
diff --git a/jhdf5.spec b/jhdf5.spec
index 265cd95..00dec0c 100644
--- a/jhdf5.spec
+++ b/jhdf5.spec
@@ -1,6 +1,6 @@
 Name:           jhdf5
 Version:        2.7
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        Java HDF5 Object Package
 
 Group:          Development/Libraries
@@ -18,8 +18,6 @@ Patch5:         0005-update-config.sub-and-config.guess.patch
 Patch6:         0006-clean-hdfview.sh.patch
 Patch7:         0007-update-configure.patch
 
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
 BuildRequires:  jpackage-utils
 BuildRequires:  java-devel
 BuildRequires:  hdf5-devel
@@ -137,30 +135,30 @@ make natives jhdf-packages jhdf5-packages \
 %install
 
 # jhdf5 jars
-mkdir -p %{buildroot}%{_libdir}/jhdf5
-install -pm 0644 lib/jhdf5.jar %{buildroot}%{_libdir}/jhdf5/jhdf5.jar
-install -pm 0644 lib/jhdf5obj.jar %{buildroot}%{_libdir}/jhdf5/jhdf5obj.jar
-install -pm 0644 lib/jhdfobj.jar %{buildroot}%{_libdir}/jhdf5/jhdfobj.jar
+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}%{_libdir}/jhdf5
-install -m 744 lib/linux/libjhdf5.so %{buildroot}%{_libdir}/jhdf5
+install -dm 755 %{buildroot}%{_jnidir}
+install -m 744 lib/linux/libjhdf5.so %{buildroot}%{_jnidir}
 
 # jhdf jars
-mkdir -p %{buildroot}%{_libdir}/jhdf
-install -pm 0644 lib/jhdf.jar %{buildroot}%{_libdir}/jhdf/jhdf.jar
-install -pm 0644 lib/jhdf4obj.jar %{buildroot}%{_libdir}/jhdf/jhdf4obj.jar
-install -pm 0644 lib/jhdfobj.jar %{buildroot}%{_libdir}/jhdf/jhdfobj.jar
+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}%{_libdir}/jhdf
-install -m 744 lib/linux/libjhdf.so %{buildroot}%{_libdir}/jhdf
+install -dm 755 %{buildroot}%{_jnidir}
+install -m 744 lib/linux/libjhdf.so %{buildroot}%{_jnidir}
 
 # hdfview
-mkdir -p %{buildroot}%{_javadir}
+install -dm 755 %{buildroot}%{_javadir}
 install -pm 0644 lib/jhdfview.jar %{buildroot}%{_javadir}/jhdfview.jar
 
-mkdir -p %{buildroot}%{_bindir}
+install -dm 755 %{buildroot}%{_bindir}
 install -m 755 bin/hdfview.sh %{buildroot}%{_bindir}/hdfview
 
 # Create and install hicolor icons.
@@ -212,21 +210,21 @@ fi
 %posttrans -n hdfview
 gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
-
 %files
-%defattr(-,root,root,-)
+%{_javadir}/jhdf5.jar
+%{_javadir}/jhdf5obj.jar
+%{_javadir}/jhdfobj.jar
+%attr(755,root,root) %{_jnidir}/libjhdf5.so
 %doc COPYING Readme.txt
-%{_libdir}/jhdf5/
-%attr(755,root,root) %{_libdir}/jhdf5/libjhdf5.so
 
 %files -n jhdf
-%defattr(-,root,root,-)
+%{_javadir}/jhdf.jar
+%{_javadir}/jhdf4obj.jar
+%{_javadir}/jhdfobj.jar
+%attr(755,root,root) %{_jnidir}/libjhdf.so
 %doc COPYING Readme.txt
-%{_libdir}/jhdf/
-%attr(755,root,root) %{_libdir}/jhdf/libjhdf.so
 
 %files -n hdfview
-%defattr(-,root,root,-)
 %{_bindir}/hdfview
 %{_datadir}/applications/hdfview.desktop
 %{_datadir}/icons/hicolor/*/*/*
@@ -236,6 +234,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %doc docs 
 
 %changelog
+* Wed Jan 25 2012 Clément David <davidcl at fedoraproject.org> - 2.7-8
+- move jars to more standard locations
+
 * Tue Nov 22 2011 Orion Poplawski <orion at cora.nwra.com> - 2.7-7
 - use %%{_hdf5_version}