From 8537424083f32869bb03f11a92d3d6ea645e216a Mon Sep 17 00:00:00 2001 From: Than Ngo Date: Jan 30 2020 14:27:41 +0000 Subject: fix compile issue for multiple definition --- diff --git a/efax-0.9a-001114-multiple-definition.patch b/efax-0.9a-001114-multiple-definition.patch new file mode 100644 index 0000000..854c948 --- /dev/null +++ b/efax-0.9a-001114-multiple-definition.patch @@ -0,0 +1,24 @@ +diff -up efax-0.9a-001114/efaxlib.c.me efax-0.9a-001114/efaxlib.c +--- efax-0.9a-001114/efaxlib.c.me 2020-01-30 15:17:45.367168505 +0100 ++++ efax-0.9a-001114/efaxlib.c 2020-01-30 15:18:38.615050032 +0100 +@@ -25,6 +25,8 @@ extern t4tab btab [ ( 64 + 27 + 13 ) + 1 + + short short256 = 256 ; /* for endian-ness detection */ + ++uchar reversebits [ 256 ], normalbits [ 256 ] ; ++ + /* Make sure printf strings have only %d escapes and n or fewer + of them. Returns 0 if OK, 1 on error. */ + +diff -up efax-0.9a-001114/efaxlib.h.me efax-0.9a-001114/efaxlib.h +--- efax-0.9a-001114/efaxlib.h.me 2020-01-30 15:17:07.914550036 +0100 ++++ efax-0.9a-001114/efaxlib.h 2020-01-30 15:17:25.710843913 +0100 +@@ -208,7 +208,7 @@ int runor ( short *a, int na, short *b, + /* Bit reversal lookup tables (note that the `normalbits' array + is the one actually used for the bit reversal. */ + +-uchar reversebits [ 256 ], normalbits [ 256 ] ; ++extern uchar reversebits [ 256 ], normalbits [ 256 ] ; + + void initbittab(void) ; + diff --git a/efax.spec b/efax.spec index f1debb8..3be2a90 100644 --- a/efax.spec +++ b/efax.spec @@ -18,6 +18,7 @@ Patch9: efax-0.9-msg-va_list.patch Patch10: efax-0.9a-001114-crash.patch Patch11: efax-0.9-pdf.patch Patch12: efax-0.9a-001114-format-security.patch +Patch13: efax-0.9a-001114-multiple-definition.patch ExcludeArch: s390 s390x @@ -48,6 +49,7 @@ Class 1, 2 or 2.0 fax modem. %patch10 -p1 -b .crash %patch11 -p0 -b .pdf %patch12 -p1 -b .format-security +%patch13 -p1 -b .multiple-definition %build make %{?_smp_mflags} RPM_OPT_FLAGS="-ansi $RPM_OPT_FLAGS -fno-strict-aliasing" @@ -72,6 +74,9 @@ install -c -m 644 %{SOURCE1} %{buildroot}/etc/logrotate.d/efax %dir %{_localstatedir}/log/fax %changelog +* Thu Jan 30 2020 Than Ngo - 0.9a-32.001114 +- fix compile issue for multiple definition + * Tue Jan 28 2020 Fedora Release Engineering - 0.9a-32.001114 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild