commit c6996a992d65e22d499b1177db1d37350de67b3a
Author: Jakub Bogusz <qbo...@pld-linux.org>
Date: Sun Dec 22 07:48:55 2024 +0100
- updated to 3.0
hdf-eos-cc.patch | 36 ------------------------------------
hdf-eos-link.patch | 17 +++++------------
hdf-eos.spec | 40 +++++++++++++---------------------------
hdf-eos2-config.patch | 20 ++++++++++++++++++++
4 files changed, 38 insertions(+), 75 deletions(-)
---
diff --git a/hdf-eos.spec b/hdf-eos.spec
index dcee232..8ac750c 100644
--- a/hdf-eos.spec
+++ b/hdf-eos.spec
@@ -1,21 +1,18 @@
#
# Conditional build:
%bcond_without szip # SZIP support (must match hdf build bcond)
-%bcond_without tests # don't perform "make check"
+%bcond_without tests # unit tests
#
Summary: HDF-EOS 2 library
Summary(pl.UTF-8): Biblioteka HDF-EOS 2
Name: hdf-eos
-Version: 2.20.1.00
+Version: 3.0
Release: 1
License: MIT-like
Group: Libraries
-Source0:
https://observer.gsfc.nasa.gov/ftp/edhs/hdfeos/latest_release/HDF-EOS2.20v1.00.tar.Z
-# Source0-md5: 4697174a9296aa3d921915b75b3362d1
-# needed for auto* rebuild
-Source1:
https://observer.gsfc.nasa.gov/ftp/edhs/hdfeos/latest_release/HDF-EOS2.20v1.00_TestDriver.tar.Z
-# Source1-md5: c15028e666f0f7c794edba529af8e158
-Patch0: %{name}-cc.patch
+Source0:
https://git.earthdata.nasa.gov/projects/DAS/repos/hdfeos/raw/hdf-eos2-%{version}-src.tar.gz?at=3128a738021501c821549955f6c78348e5f33850#/hdf-eos2-%{version}-src.tar.gz
+# Source0-md5: 1b8660bac298c0ae6c2c56e76fbe8623
+Patch0: hdf-eos2-config.patch
Patch1: %{name}-link.patch
Patch2: stack-overuse.patch
URL: http://hdfeos.org/software/library.php#HDF-EOS2
@@ -24,9 +21,10 @@ BuildRequires: automake
BuildRequires: hdf-devel >= 4.2.13
BuildRequires: libjpeg-devel
BuildRequires: libtool
-%{?with_szip:BuildRequires: szip-devel}
+%{?with_szip:BuildRequires: libaec-szip-devel >= 1.0}
BuildRequires: zlib-devel >= 1.2.11
Requires: hdf >= 4.2.13
+%{?with_szip:Requires: libaec-szip >= 1.0}
Requires: zlib >= 1.2.11
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -57,7 +55,7 @@ Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
Requires: hdf-devel >= 4.2.13
Requires: libjpeg-devel
-%{?with_szip:Requires: szip-devel}
+%{?with_szip:Requires: libaec-szip-devel >= 1.0}
Requires: zlib-devel >= 1.2.11
%description devel
@@ -79,10 +77,10 @@ Static HDF-EOS 2 library.
Statyczna biblioteka HDF-EOS 2.
%prep
-%setup -q -n hdfeos -b1
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
+%setup -q -n hdf-eos2-%{version}
+%patch -P0 -p1
+%patch -P1 -p1
+%patch -P2 -p1
%build
%{__libtoolize}
@@ -93,9 +91,7 @@ Statyczna biblioteka HDF-EOS 2.
# as hdf 4 extension, use the same include dir as hdf 4
%configure \
--includedir=%{_includedir}/hdf \
- --enable-install-include \
--enable-shared \
- --with-hdf4=%{_includedir}/hdf, \
%{?with_szip:--with-szlib}
%{__make}
@@ -116,7 +112,7 @@ rm -rf $RPM_BUILD_ROOT
%files
%defattr(644,root,root,755)
-%doc doc/{HDFEOS-DEFINITION.TXT,README}
+%doc doc/README
%attr(755,root,root) %{_libdir}/libGctp.so.*.*.*
%attr(755,root,root) %ghost %{_libdir}/libGctp.so.0
%attr(755,root,root) %{_libdir}/libhdfeos.so.*.*.*
@@ -128,17 +124,7 @@ rm -rf $RPM_BUILD_ROOT
%attr(755,root,root) %{_libdir}/libhdfeos.so
%{_libdir}/libGctp.la
%{_libdir}/libhdfeos.la
-%{_includedir}/hdf/HDFEOSVersion.h
-%{_includedir}/hdf/HE2_config.h
%{_includedir}/hdf/HdfEosDef.h
-%{_includedir}/hdf/bcea.h
-%{_includedir}/hdf/cfortHdf.h
-%{_includedir}/hdf/cproj.h
-%{_includedir}/hdf/cproj_prototypes.h
-%{_includedir}/hdf/ease.h
-%{_includedir}/hdf/gctp_prototypes.h
-%{_includedir}/hdf/isin.h
-%{_includedir}/hdf/proj.h
%files static
%defattr(644,root,root,755)
diff --git a/hdf-eos-cc.patch b/hdf-eos-cc.patch
deleted file mode 100644
index 5cb32fa..0000000
--- a/hdf-eos-cc.patch
+++ /dev/null
@@ -1,36 +0,0 @@
---- hdfeos/configure.ac.orig 2012-12-22 19:37:24.849760302 +0100
-+++ hdfeos/configure.ac 2012-12-22 21:44:13.192935055 +0100
-@@ -327,23 +327,6 @@
-
- AC_PROG_AWK
-
-- AC_MSG_CHECKING([for h4cc])
-- PURE_CC=""
-- if ($CC -show &> /dev/null); then
-- dnl Since CC can be "h4cc -Df2cFortran", arguments should be removed
-- PURE_CC=`echo "$CC" | $AWK '{ split($1, array, " ") ; printf array[[1]]
}'`
-- AC_MSG_RESULT([$PURE_CC])
-- else
-- AC_MSG_RESULT([$CC])
-- AC_MSG_ERROR([CC is not h4cc])
-- fi
--
-- SZIP_CC=szip_cc
-- cat $PURE_CC | $AWK '{ if ( $0 ~ /^LDFLAGS=\"(.*)/ ) { print substr($0,
1, 9) " -L'$szlib_lib' " substr($0, 10) } else { print } } ' > $SZIP_CC
-- chmod 755 $SZIP_CC
-- saved_CC="$CC"
-- CC=./$SZIP_CC
--
- AC_MSG_CHECKING([for szlib encoder])
-
- AC_CACHE_VAL([he2_cv_szlib_functional],
-@@ -373,9 +356,6 @@
- }
- ], [he2_cv_szlib_can_encode=yes], [he2_cv_szlib_can_encode=no],)])
-
-- CC="$saved_CC"
-- rm -f $SZIP_CC
--
- if test ${he2_cv_szlib_functional} = "no"; then
- he2_cv_szlib_can_encode=broken
- else
diff --git a/hdf-eos-link.patch b/hdf-eos-link.patch
index 4c83014..715e02d 100644
--- a/hdf-eos-link.patch
+++ b/hdf-eos-link.patch
@@ -1,15 +1,8 @@
---- hdfeos/src/Makefile.am.orig 2008-02-19 19:43:18.000000000 +0100
-+++ hdfeos/src/Makefile.am 2012-12-22 22:11:30.172900935 +0100
-@@ -5,11 +5,9 @@
+--- hdf-eos2-3.0/src/Makefile.am.orig 2021-05-18 13:55:16.000000000 +0200
++++ hdf-eos2-3.0/src/Makefile.am 2024-12-18 06:15:13.644674061 +0100
+@@ -25,4 +25,5 @@ AM_CPPFLAGS=-I$(top_srcdir)/include/
+ ## Library source files
- INCLUDES=-I$(top_srcdir)/include/
-
--# Set LDFLAGS to alow the HDF-EOS library to use extern variables from HDF4
--LDFLAGS=-Wl,-single_module
--
- # Build HDF-EOS2
- lib_LTLIBRARIES=libhdfeos.la
+ libhdfeos_la_SOURCES=EHapi.c GDapi.c PTapi.c SWapi.c
+libhdfeos_la_LIBADD=$(top_builddir)/gctp/src/libGctp.la
- # Source files for library
- libhdfeos_la_SOURCES=EHapi.c GDapi.c PTapi.c SWapi.c
diff --git a/hdf-eos2-config.patch b/hdf-eos2-config.patch
new file mode 100644
index 0000000..3f61ec2
--- /dev/null
+++ b/hdf-eos2-config.patch
@@ -0,0 +1,20 @@
+--- hdf-eos2-3.0/src/GDapi.c.orig 2021-05-18 13:55:16.000000000 +0200
++++ hdf-eos2-3.0/src/GDapi.c 2024-12-21 21:37:45.646176303 +0100
+@@ -87,6 +87,7 @@ Dec 10 2013 Abe Taaheri Increased N
+ respectively.
+ Jul 09, 2020 Peter Smith Updated szlib code exclusions
+
******************************************************************************/
++#include "HE2_config.h"
+ #include "stdio.h"
+ #include "mfhdf.h"
+ #include "hcomp.h"
+--- hdf-eos2-3.0/src/SWapi.c.orig 2024-12-21 21:38:01.889421639 +0100
++++ hdf-eos2-3.0/src/SWapi.c 2024-12-21 21:35:57.930093184 +0100
+@@ -74,6 +74,7 @@ Jul 09, 2020 Peter Smith Updated szl
+
******************************************************************************/
+ #include <stdio.h>
+ #include <stdlib.h>
++#include "HE2_config.h"
+ #include "mfhdf.h"
+ #include "hcomp.h"
+ #include "HdfEosDef.h"
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/hdf-eos.git/commitdiff/c6996a992d65e22d499b1177db1d37350de67b3a
_______________________________________________
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
