diff --git a/mtools-prototypes.diff b/mtools-prototypes.diff deleted file mode 100644 index a77670d..0000000 --- a/mtools-prototypes.diff +++ /dev/null @@ -1,63 +0,0 @@ -Index: mtools-4.0.31/mformat.c -=================================================================== ---- mtools-4.0.31.orig/mformat.c -+++ mtools-4.0.31/mformat.c -@@ -19,6 +19,7 @@ - */ - - #define DONT_NEED_WAIT -+#define DONT_NEED_IN - - #include "sysincludes.h" - #include "msdos.h" -@@ -44,7 +45,7 @@ - - #ifdef OS_linux - #include "linux/hdreg.h" --#include "linux/fs.h" -+#include "sys/mount.h" - - #endif - -Index: mtools-4.0.31/mpartition.c -=================================================================== ---- mtools-4.0.31.orig/mpartition.c -+++ mtools-4.0.31/mpartition.c -@@ -17,6 +17,7 @@ - * mformat.c - */ - #define DONT_NEED_WAIT -+#define DONT_NEED_IN - - #include "sysincludes.h" - #include "msdos.h" -@@ -33,7 +34,7 @@ - - #ifdef OS_linux - #include "linux/hdreg.h" --#include "linux/fs.h" -+#include "sys/mount.h" - #endif - - static void set_offset(hsc *h, unsigned long offset, -Index: mtools-4.0.31/sysincludes.h -=================================================================== ---- mtools-4.0.31.orig/sysincludes.h -+++ mtools-4.0.31/sysincludes.h -@@ -382,12 +382,16 @@ extern int errno; - #endif - - #ifdef HAVE_NETINET_TCP_H -+#ifndef DONT_NEED_IN - #include - #endif -+#endif - - #ifdef HAVE_ARPA_INET_H -+#ifndef DONT_NEED_IN - #include - #endif -+#endif - - #ifdef HAVE_NETDB_H - #include diff --git a/mtools.changes b/mtools.changes index 6b48666..0216416 100644 --- a/mtools.changes +++ b/mtools.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Tue Jun 14 10:28:38 UTC 2022 - pgajdos@suse.com + +- fix build +- deleted patches + - mtools-prototypes.diff (upstreamed) + ------------------------------------------------------------------- Fri Jun 10 20:35:16 UTC 2022 - Andreas Stieger diff --git a/mtools.spec b/mtools.spec index 130a745..55d92c1 100644 --- a/mtools.spec +++ b/mtools.spec @@ -28,7 +28,6 @@ Source1: https://ftp.gnu.org/gnu/mtools/%{name}-%{version}.tar.bz2.sig # https://savannah.gnu.org/project/memberlist-gpgkeys.php?group=mtools Source2: %{name}.keyring Patch0: %{name}-conf.diff -Patch5: %{name}-prototypes.diff BuildRequires: makeinfo BuildRequires: texinfo Requires: glibc-locale-base @@ -53,7 +52,6 @@ mounting it. This subpackage contains the documentation for it. %prep %setup -q %patch0 -%patch5 -p1 %build %configure \