[packages/h4h5tools] - updated to 2.2.5

[qboosh]

commit 065d940b4f3816dd4efba1b14f26a996b79766b7
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Wed Dec 18 06:20:30 2024 +0100

    - updated to 2.2.5

 h4h5tools-format.patch | 36 +++++++++---------------------------
 h4h5tools-shared.patch |  8 ++++----
 h4h5tools.spec         | 14 +++++++-------
 3 files changed, 20 insertions(+), 38 deletions(-)
---
diff --git a/h4h5tools.spec b/h4h5tools.spec
index b911411..d87445e 100644
--- a/h4h5tools.spec
+++ b/h4h5tools.spec
@@ -1,12 +1,12 @@
 Summary:	HDF 4.x to/from HDF5 conversion tools
 Summary(pl.UTF-8):	Narzędzia do konwersji pomiędzy HDF 4.x i HDF5
 Name:		h4h5tools
-Version:	2.2.4
+Version:	2.2.5
 Release:	1
 Group:		Applications/File
 License:	BSD-like, changed sources must be marked
 Source0:	https://support.hdfgroup.org/ftp/HDF5/releases/h4toh5/h4toh5-%{version}/src/%{name}-%{version}.tar.gz
-# Source0-md5:	a1f3dd2882d890f40454782fa50d077d
+# Source0-md5:	844eeedbf95b7f83c1a158b24561e3d7
 Patch0:		%{name}-config.patch
 Patch1:		%{name}-shared.patch
 Patch2:		%{name}-hdfeos.patch
@@ -20,7 +20,7 @@ BuildRequires:	hdf5-devel >= 1.6.10
 BuildRequires:	libjpeg-devel >= 6b
 BuildRequires:	libtool
 BuildRequires:	zlib-devel >= 1.1.3
-Obsoletes:	hdf5-hdf4
+Obsoletes:	hdf5-hdf4 < 1.1.4
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -80,10 +80,10 @@ oraz z HDF5 do HDF 4.x.
 
 %prep
 %setup -q
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
+%patch -P0 -p1
+%patch -P1 -p1
+%patch -P2 -p1
+%patch -P3 -p1
 
 %build
 %{__libtoolize}
diff --git a/h4h5tools-format.patch b/h4h5tools-format.patch
index 76ed91f..d78d02f 100644
--- a/h4h5tools-format.patch
+++ b/h4h5tools-format.patch
@@ -1,6 +1,6 @@
---- h4h5tools-2.2.1/utils/h5toh4/h5toh4.c.orig	2011-12-23 21:56:47.000000000 +0100
-+++ h4h5tools-2.2.1/utils/h5toh4/h5toh4.c	2012-12-24 11:44:20.413416898 +0100
-@@ -293,7 +293,7 @@
+--- h4h5tools-2.2.5/utils/h5toh4/h5toh4.c.orig	2020-03-10 15:33:18.000000000 +0100
++++ h4h5tools-2.2.5/utils/h5toh4/h5toh4.c	2024-12-18 06:17:54.922710383 +0100
+@@ -302,7 +302,7 @@ main(int argc, char *argv[])
    {
      (void) fprintf(stderr, err1, argc);
      PrintOptions_h5toh4();
@@ -9,7 +9,7 @@
      return EXIT_FAILURE;
    }
  
-@@ -305,7 +305,7 @@
+@@ -317,7 +317,7 @@ main(int argc, char *argv[])
      if ((token = gtoken(argv[i])) == TOK_ERR)
      {
        PrintOptions_h5toh4();
@@ -18,33 +18,15 @@
        return EXIT_FAILURE;
      }
  
-@@ -348,9 +348,9 @@
+@@ -359,9 +359,9 @@ main(int argc, char *argv[])
  
        case TOK_ERR:   /* command syntax error */
        default:
 -        (void) fprintf(stderr, err2);
 +        (void) fputs(err2, stderr);
- 				PrintOptions_h5toh4();
--    		(void) fprintf(stderr, err4);
-+    		(void) fputs(err4, stderr);
-     		return EXIT_FAILURE;
+         PrintOptions_h5toh4();
+-        (void) fprintf(stderr, err4);
++        (void) fputs(err4, stderr);
+         return EXIT_FAILURE;
      }
    }
-@@ -6435,7 +6435,7 @@
- 		case DFNT_INT32:
- 			ip =  (int32 *)value;
- 			for (i = 0; i < count; i++) {
--			    sprintf(tmp,"%ld,",ip[i]);
-+			    sprintf(tmp,"%ld,",(long)ip[i]);
- 			    thing = strcat(thing,tmp);
- 			}
- 			free(tmp);
-@@ -6485,7 +6485,7 @@
- 		case DFNT_UINT32:
- 			uip =  (uint32 *)value;
- 			for (i = 0; i < count; i++) {
--			    sprintf(tmp,"%ld,",uip[i]);
-+			    sprintf(tmp,"%ld,",(long)uip[i]);
- 			    thing = strcat(thing,tmp);
- 			}
- 			free(tmp);
diff --git a/h4h5tools-shared.patch b/h4h5tools-shared.patch
index 18c6cf7..fccf6e8 100644
--- a/h4h5tools-shared.patch
+++ b/h4h5tools-shared.patch
@@ -1,8 +1,8 @@
---- h4h5tools-2.2.1/lib/src/Makefile.am.orig	2012-12-23 20:33:44.221222353 +0100
-+++ h4h5tools-2.2.1/lib/src/Makefile.am	2012-12-23 20:35:53.314552995 +0100
-@@ -14,13 +14,14 @@
- #
+--- h4h5tools-2.2.5/lib/src/Makefile.am.orig	2024-12-17 22:44:14.370176774 +0100
++++ h4h5tools-2.2.5/lib/src/Makefile.am	2024-12-17 22:47:07.405906026 +0100
+@@ -13,13 +13,14 @@
  
+ AM_CPPFLAGS=-I$(top_builddir)/lib/src
  
 -lib_LIBRARIES = libh4toh5.a
 +lib_LTLIBRARIES = libh4toh5.la
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/h4h5tools.git/commitdiff/065d940b4f3816dd4efba1b14f26a996b79766b7