[packages/hdf-java] - updated to 2.11.0 - updated install,hdfview patches
qboosh
qboosh at pld-linux.org
Fri Jan 30 22:24:27 CET 2015
commit dd9ed9aa52306fa1055f67e95c8778db68f0cfcd
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Fri Jan 30 22:26:36 2015 +0100
- updated to 2.11.0
- updated install,hdfview patches
hdf-java-hdfview.patch | 18 +++++++++---------
hdf-java-install.patch | 29 ++++++++++++++---------------
hdf-java.spec | 42 ++++++++++++++++++++++++++++++++----------
3 files changed, 55 insertions(+), 34 deletions(-)
---
diff --git a/hdf-java.spec b/hdf-java.spec
index dd9ab72..31d12a2 100644
--- a/hdf-java.spec
+++ b/hdf-java.spec
@@ -1,13 +1,13 @@
-# TODO: find fits.jar and netcdf.jar source, build separately
+# TODO: find fits.jar, netcdf.jar, slf4j-api, slf4j-nop source, build separately
Summary: HDF Java Products
Summary(pl.UTF-8): Produkty HDF Java
Name: hdf-java
-Version: 2.9
+Version: 2.11.0
Release: 1
Group: Applications/File
License: BSD-like, changed sources must be marked
-Source0: http://www.hdfgroup.org/ftp/HDF5/hdf-java/src/%{name}-%{version}-src.tar
-# Source0-md5: f8d53e7d51c9351f4b1c6d7573729558
+Source0: http://www.hdfgroup.org/ftp/HDF5/hdf-java/current/src/%{name}-%{version}.tar.gz
+# Source0-md5: 22c071948d9d140506e0f91fa1855f27
Patch0: %{name}-configure.patch
Patch1: %{name}-install.patch
Patch2: %{name}-hdfview.patch
@@ -34,6 +34,7 @@ Summary: Java HDF Interface (JHI)
Summary(pl.UTF-8): Interfejs HDF do Javy (JHI)
Group: Libraries/Java
URL: http://www.hdfgroup.org/hdf-java-html/JNI/jhi/index.html
+Requires: java-slf4j >= 1.7.5
%description -n java-hdf
The Java Native Interface to the standard HDF4 library.
@@ -46,6 +47,7 @@ Summary: Java HDF5 Interface (JHI5)
Summary(pl.UTF-8): Interfejs HDF5 do Javy (JHI5)
Group: Libraries/Java
URL: http://www.hdfgroup.org/hdf-java-html/JNI/jhi5/index.html
+Requires: java-slf4j >= 1.7.5
%description -n java-hdf5
The Java Native Interface to the standard HDF5 library.
@@ -96,8 +98,19 @@ HDF5. Przy jego użyciu można:
- podmieniać komponenty we/wy i GUI, takie jak widok tabeli, widok
obrazu czy widok metadanych.
+%package javadoc
+Summary: Javadoc documentation for hdf-java classes
+Summary(pl.UTF-8): Dokumentacja javadoc dla klas hdf-java
+Group: Documentation
+
+%description javadoc
+Javadoc documentation for hdf-java classes.
+
+%description javadoc -l pl.UTF-8
+Dokumentacja javadoc dla klas hdf-java.
+
%prep
-%setup -q -n %{name}
+%setup -q
%patch0 -p1
%patch1 -p1
%patch2 -p1
@@ -122,23 +135,29 @@ rm -rf $RPM_BUILD_ROOT
%{__make} install \
BINDIR=$RPM_BUILD_ROOT%{_bindir} \
LIBDIR=$RPM_BUILD_ROOT%{_libdir} \
- JARDIR=$RPM_BUILD_ROOT%{_javadir}
+ JARDIR=$RPM_BUILD_ROOT%{_javadir} \
+ DOCDIR=$RPM_BUILD_ROOT%{_docdir}
-# see java-junit package
+# in java-junit
%{__rm} $RPM_BUILD_ROOT%{_javadir}/junit.jar
+# in java-slf4j
+%{__rm} $RPM_BUILD_ROOT%{_javadir}/slf4j-*.jar
+
+install -d $RPM_BUILD_ROOT%{_javadocdir}
+cp -pr docs/javadocs $RPM_BUILD_ROOT%{_javadocdir}/hdf-java
%clean
rm -rf $RPM_BUILD_ROOT
%files -n java-hdf
%defattr(644,root,root,755)
-%doc COPYING Readme.txt docs/*.{gif,html,js}
+%doc COPYING Readme.txt
%attr(755,root,root) %{_libdir}/libjhdf.so
%{_javadir}/jhdf.jar
%files -n java-hdf5
%defattr(644,root,root,755)
-%doc COPYING Readme.txt docs/*.{gif,html,js}
+%doc COPYING Readme.txt
%attr(755,root,root) %{_libdir}/libjhdf5.so
%{_javadir}/jhdf5.jar
@@ -155,6 +174,9 @@ rm -rf $RPM_BUILD_ROOT
%files -n hdfview
%defattr(644,root,root,755)
-%doc docs/hdfview/*
%attr(755,root,root) %{_bindir}/hdfview.sh
%{_javadir}/jhdfview.jar
+
+%files javadoc
+%defattr(644,root,root,755)
+%{_javadocdir}/hdf-java
diff --git a/hdf-java-hdfview.patch b/hdf-java-hdfview.patch
index 1ec0178..bc1eea3 100644
--- a/hdf-java-hdfview.patch
+++ b/hdf-java-hdfview.patch
@@ -1,15 +1,15 @@
---- hdf-java/bin/hdfview.sh.in.orig 2012-11-13 00:11:59.000000000 +0100
-+++ hdf-java/bin/hdfview.sh.in 2013-04-07 10:30:34.507623660 +0200
-@@ -3,7 +3,7 @@
- # Set up default variable values if not supplied by the user.
+--- hdf-java-2.11.0/bin/hdfview.sh.in.orig 2014-09-03 15:42:10.000000000 +0200
++++ hdf-java-2.11.0/bin/hdfview.sh.in 2015-01-30 16:52:07.607051794 +0100
+@@ -4,7 +4,7 @@
+ # Adjust the following two variables to match your environment
# where the HDFView is installed, e.g. /home/user1/hdfview
-HDFJAVA=@JH45INST@
+HDFJAVA="/usr/share/java"
export HDFJAVA
# where Java is installed (requires jdk1.4.x or above), e.g. /usr/jdk1.4.2/bin
-@@ -14,10 +14,10 @@
+@@ -15,10 +15,10 @@
# DO NOT MODIFY BELOW THIS LINE
###############################################################################
@@ -24,7 +24,7 @@
TEST=/usr/bin/test
if [ ! -x /usr/bin/test ]
-@@ -60,7 +60,6 @@
+@@ -61,7 +61,6 @@
LD_LIBRARY_PATH=$HDFJAVA/lib/solaris:$HDFJAVA/lib/ext:$LD_LIBRARY_PATH
;;
Linux)
@@ -32,9 +32,9 @@
;;
IRIX*)
OSREV=`/bin/uname -r`
-@@ -89,4 +88,4 @@
+@@ -90,4 +89,4 @@
export LD_LIBRARY_PATH
--$JAVAHOME/java @JAVAX@ -Djava.library.path=$LD_LIBRARY_PATH ncsa.hdf.view.HDFView -root $HDFJAVA $*
-+$JAVAHOME/java @JAVAX@ ncsa.hdf.view.HDFView -root $HDFJAVA $*
+-$JAVABIN/java @JAVAX@ -Djava.library.path=$LD_LIBRARY_PATH ncsa.hdf.view.HDFView -root $HDFJAVA $*
++$JAVABIN/java @JAVAX@ ncsa.hdf.view.HDFView -root $HDFJAVA $*
diff --git a/hdf-java-install.patch b/hdf-java-install.patch
index 99ca176..fbdb5e9 100644
--- a/hdf-java-install.patch
+++ b/hdf-java-install.patch
@@ -1,14 +1,14 @@
---- hdf-java/Makefile.in.orig 2012-11-13 00:12:03.000000000 +0100
-+++ hdf-java/Makefile.in 2013-04-06 08:14:52.316260883 +0200
-@@ -32,6 +32,7 @@
+--- hdf-java-2.11.0/Makefile.in.orig 2014-02-20 23:01:32.000000000 +0100
++++ hdf-java-2.11.0/Makefile.in 2015-01-30 16:18:41.133802666 +0100
+@@ -34,6 +34,7 @@
#make this relative to the source root...
LIBDIR=$(JH45INSTALLDIR)/lib
BINDIR=$(JH45INSTALLDIR)/bin
+JARDIR=$(JH45INSTALLDIR)/share/java
DOCDIR= $(JH45INSTALLDIR)/docs
- UGDIR= $(JH45INSTALLDIR)/UsersGuide
-@@ -284,15 +285,12 @@
+ CLASS_DIR=$(TOP)/lib
+@@ -282,15 +283,12 @@
install-lib: natives
-mkdir -p $(LIBDIR);
@@ -27,7 +27,7 @@
@echo "Install Natives complete"
install-hdflib:
-@@ -300,8 +298,7 @@
+@@ -298,8 +296,7 @@
do-install-hdflib: hdflib
-mkdir -p $(LIBDIR);
@@ -37,7 +37,7 @@
@echo "Install Native HDF complete"
install-hdf5lib: hdf5lib
-@@ -309,8 +306,7 @@
+@@ -307,8 +304,7 @@
do-install-hdf5lib: hdf5lib
-mkdir -p $(LIBDIR);
@@ -47,7 +47,7 @@
echo "Install Native HDF5 complete"
uninstall-lib:
-@@ -323,50 +319,44 @@
+@@ -321,47 +317,46 @@
@if test x'$(H4INC)' != x'' ; then $(MAKE) do-install-jhdf ; fi
do-install-jhdf: jhdf-packages
@@ -96,22 +96,21 @@
- -mkdir -p $(LIBDIR)/ext
- $(JAR) cf $(JH45INSTALLDIR)/lib/ext/nc2obj.jar -C $(CLASS_DIR) $(NC2OBJCLASSES)
- $(JAR) cf $(JH45INSTALLDIR)/lib/ext/fitsobj.jar -C $(CLASS_DIR) $(FITSOBJCLASSES)
-- $(RM) -rf $(UGDIR);
-- -mkdir -p $(UGDIR);
-- cp -R docs/hdfview/UsersGuide/* $(UGDIR);
-- $(RM) -rf $(UGDIR)/.svn
-- $(RM) -rf $(UGDIR)/images/.svn
+ -mkdir -p $(JARDIR);
+ $(JAR) cf $(JARDIR)/jhdfview.jar -C $(CLASS_DIR) $(HDFVIEWCLASSES) $(HDFVIEWICONS)
-+ $(JAR) cf $(JARDIR)//nc2obj.jar -C $(CLASS_DIR) $(NC2OBJCLASSES)
-+ $(JAR) cf $(JARDIR)//fitsobj.jar -C $(CLASS_DIR) $(FITSOBJCLASSES)
++ $(JAR) cf $(JARDIR)/nc2obj.jar -C $(CLASS_DIR) $(NC2OBJCLASSES)
++ $(JAR) cf $(JARDIR)/fitsobj.jar -C $(CLASS_DIR) $(FITSOBJCLASSES)
-mkdir -p $(BINDIR);
- cp lib/netcdf.jar $(LIBDIR)
- cp lib/fits.jar $(LIBDIR)
- cp lib/junit.jar $(LIBDIR)
+- cp lib/slf4j-api-1.7.5.jar $(LIBDIR)
+- cp lib/ext/slf4j-nop-1.7.5.jar $(LIBDIR)
+ cp lib/netcdf.jar $(JARDIR)
+ cp lib/fits.jar $(JARDIR)
+ cp lib/junit.jar $(JARDIR)
++ cp lib/slf4j-api-1.7.5.jar $(JARDIR)
++ cp lib/ext/slf4j-nop-1.7.5.jar $(JARDIR)
cp bin/hdfview.sh $(BINDIR)
chmod a+x $(BINDIR)/hdfview.sh
@echo "Install HDFVIEW complete"
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/hdf-java.git/commitdiff/dd9ed9aa52306fa1055f67e95c8778db68f0cfcd
More information about the pld-cvs-commit
mailing list