- added x32 patch (fixes build with arch tags like -gnux32 or -gnueabi); release 2

diff --git a/mtools-x32.patch b/mtools-x32.patch
new file mode 100644 (file)
index 0000000..e222a81
--- /dev/null
+++ b/mtools-x32.patch
@@ -0,0 +1,11 @@
+--- mtools-4.0.30/configure.in.orig    2021-06-19 07:13:34.056342392 +0200
++++ mtools-4.0.30/configure.in 2021-06-19 07:39:16.083031942 +0200
+@@ -288,7 +288,7 @@
+ CF_SYS_ERRLIST
+ 
+ [
+-host_os0=`echo $host_os | sed 's/-/_/g'`
++host_os0=`echo $host_os | sed 's/-gnu[a-z0-9]\+$/-gnu/; s/-/_/g'`
+ host_os1=`echo $host_os0 | sed 's/\./_/g'`
+ host_os2=`echo $host_os0 | sed 's/^\([^.]*\)\..*$/\1/g'`
+ host_os3=`echo $host_os2 | sed 's/^\([^0-9]*\)[0-9]*$/\1/g'`

diff --git a/mtools.spec b/mtools.spec
index 2225d310b03cbe03a4b3b53509cc60dab79833f0..bf5423a7a47dcec4e3fced3be1d2bb1187c33857 100644 (file)
--- a/mtools.spec
+++ b/mtools.spec
@@ -7,7 +7,7 @@ Summary(pt_BR.UTF-8):   Programas para acessar discos DOS sem montá-los
 Summary(tr.UTF-8):     Bağlama (mount) yapmadan DOS disklerine erişim sağlar
 Name:          mtools
 Version:       4.0.30
-Release:       1
+Release:       2
 License:       GPL v3+
 Group:         Applications/File
 Source0:       https://ftp.gnu.org/gnu/mtools/%{name}-%{version}.tar.lz
@@ -18,6 +18,7 @@ Source2:      http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/%{name}-non-english-ma
 Patch0:                %{name}-info.patch
 Patch1:                %{name}-no_libnsl_and_libbsd.patch
 Patch2:                %{name}-pmake.patch
+Patch3:                %{name}-x32.patch
 URL:           http://www.gnu.org/software/mtools/
 BuildRequires: autoconf
 BuildRequires: automake
@@ -94,6 +95,7 @@ Daemon para acesso remoto a um drive de disquete.
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 %build
 cp /usr/share/automake/config.sub .