From 9031ea208c3add86c4dc4935d97d774e93795da0 Mon Sep 17 00:00:00 2001
From: Silvan Calarco <silvan.calarco@mambasoft.it>
Date: Sat, 6 Jan 2024 00:17:18 +0100
Subject: [PATCH] rebuilt with gcc 10 patch and debug package [release
 1.1.15-2mamba;Tue Dec 08 2020]

---
 jfsutils-1.1.15-gcc-10.0.patch  | 12 ++++++++++++
 jfsutils-1.1.15-sysmacros.patch | 15 +++++++++++++++
 jfsutils.spec                   | 21 +++++++++++++++++----
 3 files changed, 44 insertions(+), 4 deletions(-)
 create mode 100644 jfsutils-1.1.15-gcc-10.0.patch
 create mode 100644 jfsutils-1.1.15-sysmacros.patch

diff --git a/jfsutils-1.1.15-gcc-10.0.patch b/jfsutils-1.1.15-gcc-10.0.patch
new file mode 100644
index 0000000..2018bb8
--- /dev/null
+++ b/jfsutils-1.1.15-gcc-10.0.patch
@@ -0,0 +1,12 @@
+diff -Naur old/libfs/devices.h new/libfs/devices.h
+--- old/libfs/devices.h	2005-11-23 07:43:55.000000000 +1100
++++ new/libfs/devices.h	2013-01-06 11:30:25.381538024 +1100
+@@ -40,6 +40,8 @@
+ #define ERROR_INVALID_PARAMETER	87
+ #define ERROR_DISK_FULL		112
+ 
++#include <inttypes.h>
++
+ struct stat;
+ 
+ int ujfs_get_dev_size(FILE *, int64_t * size);
diff --git a/jfsutils-1.1.15-sysmacros.patch b/jfsutils-1.1.15-sysmacros.patch
new file mode 100644
index 0000000..82f9d63
--- /dev/null
+++ b/jfsutils-1.1.15-sysmacros.patch
@@ -0,0 +1,15 @@
+https://bugs.gentoo.org/580056
+
+--- a/libfs/devices.c
++++ b/libfs/devices.c
+@@ -30,6 +30,10 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ 
++#if HAVE_SYS_SYSMACROS_H
++#include <sys/sysmacros.h>
++#endif
++
+ #ifdef HAVE_SYS_MOUNT_H
+ #ifdef HAVE_SYS_PARAM_H
+ #include <sys/param.h>
diff --git a/jfsutils.spec b/jfsutils.spec
index 4769075..5687872 100644
--- a/jfsutils.spec
+++ b/jfsutils.spec
@@ -1,6 +1,6 @@
 Name:          jfsutils
 Version:       1.1.15
-Release:       1mamba
+Release:       2mamba
 Summary:       IBM JFS utility programs
 Group:         System/Kernel and Hardware
 Vendor:        openmamba
@@ -9,10 +9,13 @@ Packager:      Aleph0 <aleph0@openmamba.org>
 URL:           http://jfs.sourceforge.net/
 Source:        http://jfs.sourceforge.net/project/pub/jfsutils-%{version}.tar.gz
 Patch0:        jfsutils-1.1.15-glibc-2.17.patch
+Patch1:        jfsutils-1.1.15-gcc-10.0.patch
+Patch2:        jfsutils-1.1.15-sysmacros.patch
 License:       GPL
 ## AUTOBUILDREQ-BEGIN
 BuildRequires: glibc-devel
-BuildRequires: libe2fs-devel
+BuildRequires: ldconfig
+BuildRequires: libuuid-devel
 ## AUTOBUILDREQ-END
 BuildRoot:     %{_tmppath}/%{name}-%{version}-root
 
@@ -26,12 +29,18 @@ jfs_mkfs    - create a JFS formatted partition.
 jfs_tune    - adjust tunable parameters of the JFS file system.
 jfs_debugfs - shell-type JFS file system editor.
 
+%debug_package
+
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
+%patch2 -p1
 
 %build
-%configure
+%configure \
+   CFLAGS="%{optflags} -fcommon"
+
 %make
 
 %install
@@ -45,9 +54,13 @@ jfs_debugfs - shell-type JFS file system editor.
 %defattr(-,root,root)
 %{_sbindir}/*
 %{_mandir}/man8/*
-%doc AUTHORS COPYING ChangeLog NEWS README
+%doc AUTHORS COPYING
+#ChangeLog NEWS README
 
 %changelog
+* Tue Dec 08 2020 Silvan Calarco <silvan.calarco@mambasoft.it> 1.1.15-2mamba
+- rebuilt with gcc 10 patch and debug package
+
 * Mon May 27 2013 Automatic Build System <autodist@mambasoft.it> 1.1.15-1mamba
 - automatic version update by autodist