[packages/cdflib] - updated to 3.9.1
qboosh
qboosh at pld-linux.org
Sat Sep 27 19:08:58 CEST 2025
commit 52cfe418860e7bd8c3e6829de12965e0059b1e00
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Sat Sep 27 19:12:04 2025 +0200
- updated to 3.9.1
cdflib-no-common.patch | 40 ----------------------------------------
cdflib-opt.patch | 10 +++++-----
cdflib-shared.patch | 12 ++++++++++++
cdflib-soname.patch | 12 ++++++------
cdflib.spec | 21 +++++++++++----------
5 files changed, 34 insertions(+), 61 deletions(-)
---
diff --git a/cdflib.spec b/cdflib.spec
index fb9694c..81b1b7c 100644
--- a/cdflib.spec
+++ b/cdflib.spec
@@ -1,16 +1,16 @@
Summary: CDF (Common Data Format) software
Summary(pl.UTF-8): Oprogramowanie obsługujące CDF (Common Data Format)
Name: cdflib
-Version: 3.7.1
+Version: 3.9.1
Release: 1
License: freely usable, non-commercially distributable
Group: Libraries
# see https://cdf.gsfc.nasa.gov/html/sw_and_docs.html
-Source0: https://cdaweb.gsfc.nasa.gov/pub/software/cdf/dist/cdf37_1/linux/cdf37_1-dist-all.tar.gz
-# Source0-md5: 0f434ffbb7f6ffe39b2bb20c5a940aee
+Source0: https://cdaweb.gsfc.nasa.gov/pub/software/cdf/dist/cdf39_1/linux/cdf39_1-dist-all.tar.gz
+# Source0-md5: 353c9868e510ccc989bca457bc20e49b
Patch0: %{name}-opt.patch
Patch1: %{name}-soname.patch
-Patch2: %{name}-no-common.patch
+Patch2: %{name}-shared.patch
URL: https://cdf.gsfc.nasa.gov/cdf_home.html
BuildRequires: gcc-fortran >= 6:4.4.2
BuildRequires: ncurses-devel
@@ -60,22 +60,22 @@ Java API for CDF library.
API Javy do biblioteki CDF.
%prep
-%setup -q -n cdf37_1-dist
+%setup -q -n cdf39_1-dist
%patch -P0 -p1
%patch -P1 -p1
%patch -P2 -p1
# note: included zlib (src/lib/zlib) is modified (at last public symbol names)
+# don't override -Ox passed in rpmcflags
+%{__sed} -i -e 's/ -O3//' Makefile
+
%build
%{__make} all \
OS=linux \
ENV=gnu \
CC_linux_gnu="%{__cc}" \
LD_linux_gnu="%{__cc}" \
- LIBCDFa="../lib/libcdf.so" \
- LIBs1="-L../lib -lcdf -lm" \
- LIBs2="-L../lib -lcdf -lncurses -lm" \
UCOPTIONS="%{rpmcflags}"
%install
@@ -111,13 +111,13 @@ rm -rf $RPM_BUILD_ROOT
%attr(755,root,root) %{_bindir}/skeletoncdf
%attr(755,root,root) %{_bindir}/skeletontable
%attr(755,root,root) %{_libdir}/libcdf.so.%{version}
-%attr(755,root,root) %ghost %{_libdir}/libcdf.so.3
+%ghost %{_libdir}/libcdf.so.3
%{_libdir}/cdf
%{_datadir}/cdf
%files devel
%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libcdf.so
+%{_libdir}/libcdf.so
%dir %{_includedir}/cdf
# C
%{_includedir}/cdf/cdf.h
@@ -125,6 +125,7 @@ rm -rf $RPM_BUILD_ROOT
%{_includedir}/cdf/cdfdist.h
%{_includedir}/cdf/cdflib.h
%{_includedir}/cdf/cdflib64.h
+%{_includedir}/cdf/cdftools.h
# fortran
%{_includedir}/cdf/cdf.inc
diff --git a/cdflib-no-common.patch b/cdflib-no-common.patch
deleted file mode 100644
index e638f05..0000000
--- a/cdflib-no-common.patch
+++ /dev/null
@@ -1,40 +0,0 @@
---- cdf37_1-dist/src/include/cdfedit.h.orig 2019-01-24 20:17:20.000000000 +0100
-+++ cdf37_1-dist/src/include/cdfedit.h 2020-11-12 19:56:15.464712277 +0100
-@@ -260,6 +260,7 @@
- Logical browseOnly; /* TRUE if the CDF is being browsed. */
- Logical compressed; /* TRUE if the currently open CDF is
- compressed. */
-+Logical ziso8601;
- #else
- extern Logical report[3];
- extern Logical dumpStatistics;
-@@ -269,8 +270,8 @@
- extern char olhFile[];
- extern Logical browseOnly;
- extern Logical compressed;
-+extern Logical ziso8601;
- #endif
--Logical ziso8601;
-
- /******************************************************************************
- * Function prototypes.
---- cdf37_1-dist/src/include/cdfstats.h.orig 2019-01-24 18:58:21.000000000 +0100
-+++ cdf37_1-dist/src/include/cdfstats.h 2020-11-12 20:00:34.328044604 +0100
-@@ -102,6 +102,7 @@
- long fillvalAttrN;
- long formatAttrN;
- long majority;
-+Logical ziso8601;
- #else
- extern Logical updateValids;
- extern Logical updateScales;
-@@ -116,8 +117,8 @@
- extern long fillvalAttrN;
- extern long formatAttrN;
- extern long majority;
-+extern Logical ziso8601;
- #endif
--Logical ziso8601;
- /******************************************************************************
- * VarStruct.
- ******************************************************************************/
diff --git a/cdflib-opt.patch b/cdflib-opt.patch
index 7f7947b..1bf6479 100644
--- a/cdflib-opt.patch
+++ b/cdflib-opt.patch
@@ -1,15 +1,15 @@
---- cdf36_4-dist/Makefile.orig 2017-03-20 21:09:02.000000000 +0100
-+++ cdf36_4-dist/Makefile 2018-05-16 19:17:48.324239219 +0200
-@@ -824,7 +824,7 @@
+--- cdf39_1-dist/Makefile.orig 2024-09-25 17:55:00.000000000 +0200
++++ cdf39_1-dist/Makefile 2025-09-27 12:43:36.526449148 +0200
+@@ -969,7 +969,7 @@ all
"CURSES=$(AND.$(CURSES).$(CURSES_$(OS)_$(ENV)))" \
"CCx=$(CC_$(OS)_$(ENV))" \
- "MAKE=$(MAKE)" \
+ "LDx=$(LD_$(OS)_$(ENV))" \
-"COPTIONS=$(COPTIONS_$(OS)_$(ENV))" \
+"COPTIONS=$(UCOPTIONS) $(COPTIONS_$(OS)_$(ENV))" \
"COPTIONSld=$(COPTIONSld_$(OS)_$(ENV))" \
"SYSLIBS=$(SYSLIBSexe_$(OS)_$(ENV))" \
"CURSESLIB=$(CURSESLIB_$(OS)_$(ENV))" \
-@@ -837,7 +837,7 @@
+@@ -983,7 +983,7 @@ all
"SHARED=$(AND.$(SHARED).$(SHARED_$(OS)))" \
"FOPTIONS=$(FOPTIONS_$(OS)) $(FOPTIONS_$(OS)_$(ENV))" \
"FOPTIONSld=$(FOPTIONSld_$(OS)) $(FOPTIONSld_$(OS)_$(ENV))" \
diff --git a/cdflib-shared.patch b/cdflib-shared.patch
new file mode 100644
index 0000000..5f3b95e
--- /dev/null
+++ b/cdflib-shared.patch
@@ -0,0 +1,12 @@
+--- cdf39_1-dist/src/tools/Makefile.orig 2024-09-25 17:55:33.000000000 +0200
++++ cdf39_1-dist/src/tools/Makefile 2025-09-27 19:06:07.805444730 +0200
+@@ -62,8 +62,7 @@ else
+ ifeq ("$(WHICHOS)","Msys")
+ LIBCDFa=../lib/libcdf.dll
+ else
+-# All others use static library
+- LIBCDFa=../lib/libcdf.a
++ LIBCDFa=../lib/libcdf.so
+ endif
+ endif
+ endif
diff --git a/cdflib-soname.patch b/cdflib-soname.patch
index fb2d552..041ace3 100644
--- a/cdflib-soname.patch
+++ b/cdflib-soname.patch
@@ -1,6 +1,6 @@
---- cdf36_4-dist/src/lib/Makefile.orig 2017-01-04 21:58:09.000000000 +0100
-+++ cdf36_4-dist/src/lib/Makefile 2018-05-16 19:29:54.154230934 +0200
-@@ -125,8 +125,8 @@
+--- cdf39_1-dist/src/lib/Makefile.orig 2024-09-18 14:42:00.000000000 +0200
++++ cdf39_1-dist/src/lib/Makefile 2025-09-27 12:45:20.349220025 +0200
+@@ -113,8 +113,8 @@ libcdf.dylib \
libcdf.dll \
libcdf.sl: $(OBJs)
@if [ -f $@ ] ; then rm $@ ; else $(NULL) ; fi
@@ -8,9 +8,9 @@
- $(LD) $(LDFLAGS) -o $@ $(OBJs) $(SYSLIBS)
+ @echo $(LD) $(LDFLAGS) -o $@ $(OBJs) $(SYSLIBS) -Wl,-soname,libcdf.so.3
+ $(LD) $(LDFLAGS) -o $@ $(OBJs) $(SYSLIBS) -Wl,-soname,libcdf.so.3
- @if [ $(MACVERSION) -gt 0 ]; then \
- rm -f $(MACLIB)/$@; \
- cp $@ $(MACLIB)/libcdf.$(VERSION).dylib; \
+
+ libcdf.o: $(OBJs)
+ @echo $(CC) $(LDFLAGS) -o $@ $(OBJs) $(SYSLIBS)
--- cdf36_4-dist/Makefile.orig 2018-05-16 19:31:40.914229713 +0200
+++ cdf36_4-dist/Makefile 2018-05-16 19:31:55.137562887 +0200
@@ -994,9 +994,9 @@
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/cdflib.git/commitdiff/52cfe418860e7bd8c3e6829de12965e0059b1e00
More information about the pld-cvs-commit
mailing list