commit 05bdcb7983eeddb291845d77ecb016d704b2ba2f
Author: Jakub Bogusz <[email protected]>
Date: Thu Dec 19 21:37:27 2024 +0100
- updated to 4.3.0
hdf-shared.patch | 12 ++++++------
hdf-szip.patch | 11 -----------
hdf-types.patch | 11 -----------
hdf.spec | 43 +++++++++++++------------------------------
4 files changed, 19 insertions(+), 58 deletions(-)
---
diff --git a/hdf.spec b/hdf.spec
index bb060cd..9c7ad4c 100644
--- a/hdf.spec
+++ b/hdf.spec
@@ -6,22 +6,17 @@
Summary: Hierarchical Data Format library
Summary(pl.UTF-8): Biblioteka HDF (Hierarchical Data Format)
Name: hdf
-%define basever 4.2.16
-%define subver 2
-Version: %{basever}.%{subver}
-%define origver %{basever}-%{subver}
+Version: 4.3.0
Release: 1
Epoch: 1
Group: Libraries
License: BSD-like
# latest releases listed at https://support.hdfgroup.org/downloads/index.html
-Source0:
https://hdf-wordpress-1.s3.amazonaws.com/wp-content/uploads/manual/HDF4/HDF%{origver}/src/hdf-%{origver}.tar.bz2
-# Source0-md5: 82f834cd6217ea2ae71e035268674f7e
+Source0:
https://github.com/HDFGroup/hdf4/archive/hdf%{version}/hdf4-hdf%{version}.tar.gz
+# Source0-md5: 9789b5ad3341ce5f25fac1de231e2608
Source1:
http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/%{name}-man-pages.tar.bz2
# Source1-md5: 607df78cacc131b37dfdb443e61e789a
Patch0: %{name}-shared.patch
-Patch1: %{name}-types.patch
-Patch3: %{name}-szip.patch
Patch5: %{name}-opt.patch
URL: https://www.hdfgroup.org/solutions/hdf4/
BuildRequires: autoconf >= 2.50
@@ -41,6 +36,8 @@ BuildRequires: zlib-devel >= 1.1.4
%{?with_szip:Requires: libaec-szip >= 1.0}
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
+%define javaver 4.2.17-1
+
%description
HDF is a multi-object file format that facilitates the transfer of
various types of scientific data between machines and operating
@@ -141,10 +138,8 @@ Javadoc documentation for Java HDF Interface (JHI).
Dokumentacja javadoc do interfejsu HDF do Javy (JHI).
%prep
-%setup -q -n %{name}-%{origver}
+%setup -q -n hdf4-hdf%{version}
%patch -P0 -p1
-%patch -P1 -p1
-%patch -P3 -p1
%patch -P5 -p1
%ifarch x32
@@ -175,19 +170,14 @@ ln -s linux-gnu config/linux-gnux32
%install
rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_mandir}/man{3,7},%{_includedir}/hdf}
+install -d $RPM_BUILD_ROOT{%{_includedir}/hdf,%{_examplesdir}}
%{__make} install \
DESTDIR=$RPM_BUILD_ROOT \
- EXAMPLETOPDIR=$RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version} \
- EXAMPLEDIR=$RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}/c \
hdf_javadir=%{_javadir}
%{__mv} $RPM_BUILD_ROOT%{_includedir}/*.{h,inc,f90}
$RPM_BUILD_ROOT%{_includedir}/hdf
-cp -p man/gr_chunk.3 $RPM_BUILD_ROOT%{_mandir}/man3
-%{__mv} $RPM_BUILD_ROOT%{_mandir}/man1/hdf.1
$RPM_BUILD_ROOT%{_mandir}/man7/hdf.7
-
# resolve conflict with netcdf
for i in ncdump ncgen ; do
%{__mv} $RPM_BUILD_ROOT%{_bindir}/$i $RPM_BUILD_ROOT%{_bindir}/hdf$i
@@ -196,11 +186,13 @@ done
%if %{with java}
%{__rm} $RPM_BUILD_ROOT%{_libdir}/libhdf_java.{la,a}
-ln -sf jarhdf-%{origver}.jar $RPM_BUILD_ROOT%{_javadir}/jarhdf.jar
+ln -sf jarhdf-%{javaver}.jar $RPM_BUILD_ROOT%{_javadir}/jarhdf.jar
install -d $RPM_BUILD_ROOT%{_javadocdir}
cp -pr java/src/javadoc $RPM_BUILD_ROOT%{_javadocdir}/hdflib
%endif
+cp -pr HDF4Examples $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
+
bzip2 -dc %{SOURCE1} | tar xf - -C $RPM_BUILD_ROOT%{_mandir}
%{__rm} $RPM_BUILD_ROOT%{_mandir}/README.hdf-man-pages
%{__rm} $RPM_BUILD_ROOT%{_mandir}/diff.*
@@ -230,8 +222,6 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/libdf.la
%{_libdir}/libmfhdf.la
%{_includedir}/hdf
-%{_mandir}/man3/gr_chunk.3*
-%{_mandir}/man7/hdf.7*
%files static
%defattr(644,root,root,755)
@@ -283,7 +273,7 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man1/hdftor8.1*
%{_mandir}/man1/hdp.1*
%{_mandir}/man1/jpeg2hdf.1*
-%{_mandir}/man1/paltohdf.1*
+%{_mandir}/man1/paltohdf.1
%{_mandir}/man1/r8tohdf.1*
%{_mandir}/man1/ristosds.1*
%{_mandir}/man1/vmake.1*
@@ -291,14 +281,7 @@ rm -rf $RPM_BUILD_ROOT
%files examples
%defattr(644,root,root,755)
-%dir %{_examplesdir}/%{name}-%{version}
-%{_examplesdir}/%{name}-%{version}/README
-%attr(755,root,root) %{_examplesdir}/%{name}-%{version}/run-all-ex.sh
-%dir %{_examplesdir}/%{name}-%{version}/c
-%{_examplesdir}/%{name}-%{version}/c/*.c
-%{_examplesdir}/%{name}-%{version}/c/*.f
-%attr(755,root,root) %{_examplesdir}/%{name}-%{version}/c/run-c-ex.sh
-%attr(755,root,root) %{_examplesdir}/%{name}-%{version}/c/run-fortran-ex.sh
+%{_examplesdir}/%{name}-%{version}
%if %{with java}
%files -n java-hdf
@@ -306,7 +289,7 @@ rm -rf $RPM_BUILD_ROOT
%attr(755,root,root) %{_libdir}/libhdf_java.so.*.*.*
%attr(755,root,root) %ghost %{_libdir}/libhdf_java.so.0
%attr(755,root,root) %{_libdir}/libhdf_java.so
-%{_javadir}/jarhdf-%{origver}.jar
+%{_javadir}/jarhdf-%{javaver}.jar
%{_javadir}/jarhdf.jar
%files -n java-hdf-javadoc
diff --git a/hdf-shared.patch b/hdf-shared.patch
index defffb2..6d041b1 100644
--- a/hdf-shared.patch
+++ b/hdf-shared.patch
@@ -1,6 +1,6 @@
---- hdf-4.2.15/configure.ac.orig 2020-03-03 18:40:50.000000000 +0100
-+++ hdf-4.2.15/configure.ac 2020-11-12 21:00:42.794377396 +0100
-@@ -294,12 +294,6 @@
+--- hdf4-hdf4.3.0/configure.ac.orig 2024-12-19 21:02:23.923808617 +0100
++++ hdf4-hdf4.3.0/configure.ac 2024-12-19 21:08:01.925310839 +0100
+@@ -336,12 +336,6 @@ if test "X${enable_shared}" != "Xyes"; t
enable_shared="no"
fi
@@ -10,6 +10,6 @@
- fi
-fi
-
- AC_PROG_INSTALL
- AC_PROG_LN_S
-
+ ## ----------------------------------------------------------------------
+ ## Check if they would like the Java native interface (JNI) compiled
+ ##
diff --git a/hdf-szip.patch b/hdf-szip.patch
deleted file mode 100644
index 28ece44..0000000
--- a/hdf-szip.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- hdf-4.2.15/configure.ac.orig 2020-11-12 21:00:56.401745032 +0100
-+++ hdf-4.2.15/configure.ac 2020-11-12 21:04:32.302866945 +0100
-@@ -533,7 +533,7 @@
- X-yes)
- HAVE_SZIP="yes"
- AC_CHECK_HEADERS([szlib.h], [HAVE_SZLIB_H="yes"], [unset HAVE_SZIP])
-- if test "x$HAVE_SZLIB" = "xyes" -a "x$HAVE_SZLIB_H" = "xyes"; then
-+ if test "x$HAVE_SZIP" = "xyes" -a "x$HAVE_SZLIB_H" = "xyes"; then
- AC_CHECK_LIB([sz], [SZ_BufftoBuffCompress],, [unset HAVE_SZIP])
- fi
-
diff --git a/hdf-types.patch b/hdf-types.patch
deleted file mode 100644
index 5449592..0000000
--- a/hdf-types.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- hdf-4.2.16-2/mfhdf/libsrc/putget.c.orig 2023-02-06 15:13:34.000000000
+0100
-+++ hdf-4.2.16-2/mfhdf/libsrc/putget.c 2024-12-19 18:01:49.998654094 +0100
-@@ -593,7 +593,7 @@ xdr_NCv1data(XDR *xdrs, u_long where, nc
- #ifdef H4_HAVE_LP64
- return (xdr_int(xdrs, (nclong *)values));
- #else
-- return (xdr_long(xdrs, (nclong *)values));
-+ return (xdr_long(xdrs, (long *)values));
- #endif
- case NC_FLOAT:
- return (xdr_float(xdrs, (float *)values));
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/hdf.git/commitdiff/05bdcb7983eeddb291845d77ecb016d704b2ba2f
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
