commit 16f96698a286774b7699c9f0d26a869fae43b021
Author: Jakub Bogusz <[email protected]>
Date: Wed Dec 18 22:14:29 2024 +0100
- updated to 4.2.16-2 (last 4.2.x release; 4.3 will break some
compatibility)
hdf-link.patch | 28 ---------------------------
hdf-morearchs.patch | 30 -----------------------------
hdf-opt.patch | 55 ++++++++++++++++++++++-------------------------------
hdf-tirpc.patch | 10 ----------
hdf.spec | 49 +++++++++++++++++++++++------------------------
5 files changed, 47 insertions(+), 125 deletions(-)
---
diff --git a/hdf.spec b/hdf.spec
index f6267c3..43b29a4 100644
--- a/hdf.spec
+++ b/hdf.spec
@@ -1,27 +1,28 @@
#
# Conditional build:
%bcond_without java # Java JNI interface
-%bcond_without szip # build without SZIP support
+%bcond_without szip # SZIP compression support
#
Summary: Hierarchical Data Format library
Summary(pl.UTF-8): Biblioteka HDF (Hierarchical Data Format)
Name: hdf
-Version: 4.2.15
+%define basever 4.2.16
+%define subver 2
+Version: %{basever}.%{subver}
+%define origver %{basever}-%{subver}
Release: 1
Epoch: 1
Group: Libraries
-License: Nearly BSD, but changed sources must be marked
-Source0:
https://support.hdfgroup.org/ftp/HDF/releases/HDF%{version}/src/hdf-%{version}.tar.bz2
-# Source0-md5: 27ab87b22c31906883a0bfaebced97cb
+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
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}-morearchs.patch
-Patch2: %{name}-link.patch
Patch3: %{name}-szip.patch
-Patch4: %{name}-tirpc.patch
Patch5: %{name}-opt.patch
-URL: http://portal.hdfgroup.org/display/HDF4/HDF4
+URL: https://www.hdfgroup.org/solutions/hdf4/
BuildRequires: autoconf >= 2.50
BuildRequires: automake
BuildRequires: bison
@@ -29,13 +30,14 @@ BuildRequires: flex
BuildRequires: gcc-fortran
BuildRequires: groff
%{?with_java:BuildRequires: jdk}
+%{?with_szip:BuildRequires: libaec-szip-devel >= 1.0}
BuildRequires: libjpeg-devel >= 6b
BuildRequires: libtirpc-devel
-BuildRequires: libtool >= 2:1.4d-3
+BuildRequires: libtool >= 2:2
BuildRequires: rpmbuild(macros) >= 1.750
-%{?with_szip:BuildRequires: szip-devel >= 2.0}
BuildRequires: which
BuildRequires: zlib-devel >= 1.1.4
+%{?with_szip:Requires: libaec-szip >= 1.0}
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%description
@@ -67,9 +69,9 @@ Summary: HDF library development package
Summary(pl.UTF-8): Pliki nagłówkowe biblioteki HDF
Group: Development/Libraries
Requires: %{name} = %{epoch}:%{version}-%{release}
+%{?with_szip:Requires: libaec-szip-devel >= 1.0}
Requires: libjpeg-devel >= 6b
Requires: libtirpc-devel
-%{?with_szip:Requires: szip-devel >= 2.0}
Requires: zlib-devel >= 1.1.4
%description devel
@@ -117,7 +119,6 @@ Przykładowe programy dla biblioteki HDF (w postaci
źródłowej).
Summary: Java HDF Interface (JHI)
Summary(pl.UTF-8): Interfejs HDF do Javy (JHI)
Group: Libraries/Java
-URL: http://portal.hdfgroup.org/display/HDFVIEW/JHI+Design+Notes
Requires: %{name} = %{epoch}:%{version}-%{release}
Requires: java-slf4j >= 1.7.25
@@ -131,7 +132,6 @@ Natywny interfejs Javy (JNI) do biblioteki standardowej HDF.
Summary: Javadoc documentation for Java HDF Interface (JHI)
Summary(pl.UTF-8): Dokumentacja javadoc do interfejsu HDF do Javy (JHI)
Group: Documentation
-URL: http://portal.hdfgroup.org/display/HDFVIEW/JHI+Design+Notes
%description -n java-hdf-javadoc
Javadoc documentation for Java HDF Interface (JHI).
@@ -140,13 +140,10 @@ Javadoc documentation for Java HDF Interface (JHI).
Dokumentacja javadoc do interfejsu HDF do Javy (JHI).
%prep
-%setup -q
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
+%setup -q -n %{name}-%{origver}
+%patch -P0 -p1
+%patch -P3 -p1
+%patch -P5 -p1
%build
%{__libtoolize}
@@ -164,10 +161,12 @@ Dokumentacja javadoc do interfejsu HDF do Javy (JHI).
%configure \
F77="%{gfortran}" \
%if "%{_ver_ge '%{gfortran_version}' '10.0'}" == "1"
- FFLAGS="%{rpmcflags} -fallow-argument-mismatch" \
+ XXXFFLAGS="%{rpmcflags} -fallow-argument-mismatch" \
%endif
+ --enable-fortran \
%{?with_java:--enable-java} \
--enable-shared \
+ --disable-silent-rules \
%{?with_szip:--with-szlib}
%{__make}
@@ -195,7 +194,7 @@ done
%if %{with java}
%{__rm} $RPM_BUILD_ROOT%{_libdir}/libhdf_java.{la,a}
-ln -sf jarhdf-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/jarhdf.jar
+ln -sf jarhdf-%{origver}.jar $RPM_BUILD_ROOT%{_javadir}/jarhdf.jar
install -d $RPM_BUILD_ROOT%{_javadocdir}
cp -pr java/src/javadoc $RPM_BUILD_ROOT%{_javadocdir}/hdflib
%endif
@@ -215,7 +214,7 @@ rm -rf $RPM_BUILD_ROOT
%files
%defattr(644,root,root,755)
-%doc COPYING README.txt
release_notes/{HISTORY,RELEASE,bugs_fixed,misc_docs}.txt
+%doc COPYING README.md release_notes/{HISTORY,RELEASE,bugs_fixed,misc_docs}.txt
%attr(755,root,root) %{_libdir}/libdf.so.*.*.*
%attr(755,root,root) %ghost %{_libdir}/libdf.so.0
%attr(755,root,root) %{_libdir}/libmfhdf.so.*.*.*
@@ -305,7 +304,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-%{version}.jar
+%{_javadir}/jarhdf-%{origver}.jar
%{_javadir}/jarhdf.jar
%files -n java-hdf-javadoc
diff --git a/hdf-link.patch b/hdf-link.patch
deleted file mode 100644
index 9bcfc0b..0000000
--- a/hdf-link.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- hdf-4.2.15/mfhdf/libsrc/Makefile.am.orig 2020-03-03 18:40:50.000000000
+0100
-+++ hdf-4.2.15/mfhdf/libsrc/Makefile.am 2020-11-12 06:21:46.537767787
+0100
-@@ -33,7 +33,7 @@
- libmfhdf_la_SOURCES = $(CSOURCES)
- endif
-
--libmfhdf_la_LIBADD = $(XDRLIB)
-+libmfhdf_la_LIBADD = $(LIBHDF) $(XDRLIB)
-
- if HDF_BUILD_NETCDF
- include_HEADERS = hdf2netcdf.h local_nc.h mfhdf.h netcdf.h mfhdfi.h
mfdatainfo.h
---- hdf-4.2.15/config/commence.am.orig 2020-03-03 18:40:50.000000000 +0100
-+++ hdf-4.2.15/config/commence.am 2020-11-12 06:25:05.443356890 +0100
-@@ -27,14 +27,6 @@
- H4CC = ${DESTDIR}$(bindir)/h4cc
- H4FC = ${DESTDIR}$(bindir)/h4fc
-
--if HDF_BUILD_XDR
-- XDR_ADD = -R$(abs_top_builddir)/mfhdf/xdr/.libs
--endif
--
--if HDF_BUILD_SHARED
-- AM_LDFLAGS = -R$(abs_top_builddir)/mfhdf/libsrc/.libs
-R$(abs_top_builddir)/hdf/src/.libs $(XDR_ADD)
--endif
--
- ACLOCAL_AMFLAGS = "-I m4"
-
- # .chkexe files are used to mark tests that have run successfully.
diff --git a/hdf-morearchs.patch b/hdf-morearchs.patch
deleted file mode 100644
index 56513fa..0000000
--- a/hdf-morearchs.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- hdf-4.2.5/hdf/src/hdfi.h.orig 2010-01-29 05:57:57.000000000 +0100
-+++ hdf-4.2.5/hdf/src/hdfi.h 2010-10-09 08:33:07.215741882 +0200
-@@ -155,7 +155,7 @@
- * be renamed as LONGNEINT32.
- */
-
--#if (defined(SUN) || defined(sun) || defined(__sun__) || defined(__SUNPRO_C))
& !defined(__i386)
-+#if (defined(SUN) || defined(sun) || defined(__sun__) || defined(__sparc__)
|| defined(__SUNPRO_C)) & !defined(__i386)
- #ifdef __STDC__
- #define ANSISUN
- #else /* __STDC__ */
-@@ -282,7 +282,7 @@
- #endif /* SUN */
-
-
--#if defined(IBM6000) || defined(_AIX)
-+#if defined(IBM6000) || defined(_AIX) || defined(__powerpc__)
-
- #ifndef IBM6000
- #define IBM6000
-@@ -326,6 +326,9 @@
- typedef int hdf_pint_t; /* an integer the same size as a
pointer */
- #endif /*AIX5L64 */
- #define _fcdtocp(desc) (desc)
-+#ifdef __GNUC__
-+#define FNAME_POST_UNDERSCORE
-+#endif
- #define FILELIB UNIXBUFIO
-
- /* JPEG #define's - Look in the JPEG docs before changing - (Q) */
diff --git a/hdf-opt.patch b/hdf-opt.patch
index 8c081e9..ddb4752 100644
--- a/hdf-opt.patch
+++ b/hdf-opt.patch
@@ -1,12 +1,7 @@
---- hdf-4.2.15/config/linux-gnu.orig 2020-03-03 18:40:50.000000000 +0100
-+++ hdf-4.2.15/config/linux-gnu 2020-11-12 21:56:55.160467962 +0100
-@@ -182,11 +182,11 @@
- # value of CC may have changed above).
-
- case $CC_BASENAME in
-- gcc)
-+ *gcc)
- CFLAGS="$CFLAGS"
+--- hdf-4.2.16-2/config/gnu-flags.orig 2024-12-18 19:47:50.539445329 +0100
++++ hdf-4.2.16-2/config/gnu-flags 2024-12-18 19:47:53.502762608 +0100
+@@ -120,7 +120,7 @@ if test "X-gcc" = "X-$cc_vendor"; then
+ fi
DEBUG_CFLAGS="-g -fverbose-asm"
DEBUG_CPPFLAGS=
- PROD_CFLAGS="-O3 -fomit-frame-pointer"
@@ -14,30 +9,26 @@
PROD_CPPFLAGS=
PROFILE_CFLAGS="-pg"
PROFILE_CPPFLAGS=
-@@ -196,7 +196,7 @@
- CFLAGS="$CFLAGS"
- DEBUG_CFLAGS="-g"
- DEBUG_CPPFLAGS=
-- PROD_CFLAGS="-O"
-+ PROD_CFLAGS=
- PROD_CPPFLAGS=
- PROFILE_CFLAGS="-pg"
- PROFILE_CPPFLAGS=
-@@ -204,33 +204,33 @@
- esac
+--- hdf-4.2.16-2/config/gnu-fflags.orig 2023-06-27 17:28:51.000000000
+0200
++++ hdf-4.2.16-2/config/gnu-fflags 2024-12-18 19:48:11.835996622 +0100
+@@ -62,14 +62,14 @@
+ # value of CC may have changed above).
- case $F77_BASENAME in
+ case $F77_BASENAME in
- gfortran)
-+ *gfortran)
- FFLAGS="$FFLAGS"
++ *gfortran*)
+ if test $cc_vers_major -ge 10; then
+ FFLAGS="$FFLAGS -fallow-argument-mismatch"
+ else
+ FFLAGS="$FFLAGS"
+ fi
DEBUG_FFLAGS="-g"
- PROD_FFLAGS="-O"
-+ PROD_FFLAGS=
++ PROD_FFLAGS=""
PROFILE_FFLAGS="-pg"
;;
-- g77)
-+ *g77)
+ g77)
FFLAGS="$FFLAGS "
DEBUG_FFLAGS="-g"
- PROD_FFLAGS="-O3 -fomit-frame-pointer"
@@ -45,23 +36,23 @@
PROFILE_FFLAGS="-pg"
;;
-- f95)
-+ *f95)
+@@ -84,7 +84,7 @@ case $F77_BASENAME in
CFLAGS="$CFLAGS"
FFLAGS="$FFLAGS"
DEBUG_FFLAGS="-g"
- PROD_FFLAGS="-O"
-+ PROD_FFLAGS=
++ PROD_FFLAGS=""
PROFILE_FFLAGS="-pg"
;;
-- g95)
-+ *g95)
+@@ -92,7 +92,7 @@ case $F77_BASENAME in
CFLAGS="$CFLAGS"
FFLAGS="$FFLAGS -i4"
DEBUG_FFLAGS="-g"
- PROD_FFLAGS="-O"
-+ PROD_FFLAGS=
++ PROD_FFLAGS=""
PROFILE_FFLAGS="-pg"
;;
esac
+--- ../BUILD/hdf-4.2.16-2/config/gnu-fflags.orig 2024-12-18
20:41:47.971906652 +0100
++++ ../BUILD/hdf-4.2.16-2/config/gnu-fflags 2024-12-18 20:54:55.677639283
+0100
diff --git a/hdf-tirpc.patch b/hdf-tirpc.patch
deleted file mode 100644
index a89dcf3..0000000
--- a/hdf-tirpc.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- hdf-4.2.15/configure.ac.orig 2020-11-11 21:29:50.130673804 +0100
-+++ hdf-4.2.15/configure.ac 2020-11-11 22:31:12.350725506 +0100
-@@ -701,6 +701,7 @@
- if test -z "$HAVE_OLDRPC" ; then
- LIBS="$LIBS -ltirpc"
- CPPFLAGS="$SYSCPPFLAGS -I/usr/include/tirpc"
-+ unset ac_cv_header_rpc_rpc_h
- AC_CHECK_HEADER([rpc/rpc.h],[:], [unset HAVE_TIRPC])
- if test -z "$HAVE_TIRPC" ; then
- CPPFLAGS="$SYSCPPFLAGS"
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/hdf.git/commitdiff/16f96698a286774b7699c9f0d26a869fae43b021
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
