From ce8b3f67c132ca22450c2995ccbac7ddfbfa6304 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Thu, 13 May 2021 19:52:44 +0200 Subject: [PATCH] Fixed brlapi multilib --- brlapi-config.h | 9 +++++++++ brlapi-forbuild.h | 9 +++++++++ brltty.spec | 17 ++++++++++++++++- 3 files changed, 34 insertions(+), 1 deletion(-) create mode 100644 brlapi-config.h create mode 100644 brlapi-forbuild.h diff --git a/brlapi-config.h b/brlapi-config.h new file mode 100644 index 0000000..c369b45 --- /dev/null +++ b/brlapi-config.h @@ -0,0 +1,9 @@ +#include + +#if __WORDSIZE == 32 +#include "config-32.h" +#elif __WORDSIZE == 64 +#include "config-64.h" +#else +#error "Unknown word size" +#endif diff --git a/brlapi-forbuild.h b/brlapi-forbuild.h new file mode 100644 index 0000000..4f5093e --- /dev/null +++ b/brlapi-forbuild.h @@ -0,0 +1,9 @@ +#include + +#if __WORDSIZE == 32 +#include "forbuild-32.h" +#elif __WORDSIZE == 64 +#include "forbuild-64.h" +#else +#error "Unknown word size" +#endif diff --git a/brltty.spec b/brltty.spec index 1b7c6bf..6de80e7 100644 --- a/brltty.spec +++ b/brltty.spec @@ -33,11 +33,13 @@ Name: brltty Version: %{pkg_version} -Release: 4%{?dist} +Release: 5%{?dist} License: LGPLv2+ URL: http://brltty.app/ Source0: http://brltty.app/archive/%{name}-%{version}.tar.xz Source1: brltty.service +Source2: brlapi-config.h +Source3: brlapi-forbuild.h Patch1: brltty-6.3-loadLibrary.patch # libspeechd.h moved in latest speech-dispatch (NOT sent upstream) Patch2: brltty-6.3-libspeechd.patch @@ -413,6 +415,16 @@ rm -f ${RPM_BUILD_ROOT}%{_datadir}/gdm/greeter/autostart/xbrlapi.desktop # make brltty-config executable chmod 755 ${RPM_BUILD_ROOT}%{_bindir}/brltty-config.sh +# fix multilib +pushd ${RPM_BUILD_ROOT}%{_includedir}/brltty +for f in config forbuild +do + mv ./$f.h ./$f-$(getconf LONG_BIT).h +done +install -p -m 0644 %{SOURCE2} ./config.h +install -p -m 0644 %{SOURCE3} ./forbuild.h +popd + # handle locales %find_lang %{name} cp -p %{name}.lang ../ @@ -551,6 +563,9 @@ fi %config(noreplace) %verify(not size md5 mtime) %{_sysconfdir}/brltty/Initramfs/cmdline %changelog +* Thu May 13 2021 Jaroslav Škarvada - 6.3-5 +- Fixed brlapi multilib + * Fri Apr 16 2021 Gwyn Ciesla - 6.3-4 - Upstream patch to support Python 3.10.