[packages/libdsk] Rel 3

[arekm]

commit d21a0db62c2aa100606df50403c541d917c8d8d4
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date:   Mon Mar 9 23:33:57 2026 +0100

    Rel 3

 libdsk.spec               | 10 +++++++---
 sysmacros-major-fix.patch | 24 ++++++++++++++++++++++++
 2 files changed, 31 insertions(+), 3 deletions(-)
---
diff --git a/libdsk.spec b/libdsk.spec
index 5742330..4f71d20 100644
--- a/libdsk.spec
+++ b/libdsk.spec
@@ -8,14 +8,15 @@ Summary(pl.UTF-8):	Biblioteka libdsk
 Name:		libdsk
 # note: 1.4.x is stable, 1.5.x development version
 Version:	1.4.2
-Release:	2
+Release:	3
 License:	LGPL v2+
 Group:		Libraries
-Source0:	http://www.seasip.info/Unix/LibDsk/%{name}-%{version}.tar.gz
+Source0:	https://www.seasip.info/Unix/LibDsk/%{name}-%{version}.tar.gz
 # Source0-md5:	9e1128a423069528c90a647f69284792
 Patch0:		%{name}-am.patch
 Patch1:		%{name}-java.patch
-URL:		http://www.seasip.info/Unix/LibDsk/
+Patch2:		sysmacros-major-fix.patch
+URL:		https://www.seasip.info/Unix/LibDsk/
 BuildRequires:	autoconf >= 2.50
 BuildRequires:	automake
 BuildRequires:	bzip2-devel
@@ -80,6 +81,9 @@ Interfejs Javy do biblioteki libdsk.
 %setup -q
 %patch -P0 -p1
 %patch -P1 -p1
+# upstream ships CRLF in this file; normalize so strict %%patch can apply
+%{__sed} -i -e 's,\r$,,' lib/compress.c
+%patch -P2 -p1
 
 %{__sed} -i -e 's,/usr/local/share,%{_datadir},' man/libdskrc.5
 
diff --git a/sysmacros-major-fix.patch b/sysmacros-major-fix.patch
new file mode 100644
index 0000000..45799e6
--- /dev/null
+++ b/sysmacros-major-fix.patch
@@ -0,0 +1,24 @@
+--- libdsk-1.4.2/lib/compress.c	2010-10-26 08:55:11.000000000 +0200
++++ libdsk-1.4.2/lib/compress.c	2026-03-09 23:45:00.000000000 +0100
+@@ -27,6 +27,9 @@
+ #ifdef HAVE_SYS_STAT_H
+ #include <sys/stat.h>
+ #endif
++#ifdef MAJOR_IN_SYSMACROS
++#include <sys/sysmacros.h>
++#endif
+ 
+ #define TMPDIR "/tmp"
+ 
+--- libdsk-1.4.2/lib/drvlinux.c	2010-11-23 20:26:42.000000000 +0100
++++ libdsk-1.4.2/lib/drvlinux.c	2026-03-09 23:52:00.000000000 +0100
+@@ -40,6 +40,9 @@
+ #ifdef HAVE_SYS_STAT_H
+ #include <sys/stat.h>
+ #endif
++#ifdef MAJOR_IN_SYSMACROS
++#include <sys/sysmacros.h>
++#endif
+ 
+ #ifdef HAVE_UNISTD_H 
+ #include <unistd.h>
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/libdsk.git/commitdiff/d21a0db62c2aa100606df50403c541d917c8d8d4