Fixed brlapi multilib

This commit is contained in:
Jaroslav Škarvada 2021-05-13 19:52:44 +02:00
parent 97c8620483
commit ce8b3f67c1
3 changed files with 34 additions and 1 deletions

9
brlapi-config.h Normal file
View File

@ -0,0 +1,9 @@
#include <bits/wordsize.h>
#if __WORDSIZE == 32
#include "config-32.h"
#elif __WORDSIZE == 64
#include "config-64.h"
#else
#error "Unknown word size"
#endif

9
brlapi-forbuild.h Normal file
View File

@ -0,0 +1,9 @@
#include <bits/wordsize.h>
#if __WORDSIZE == 32
#include "forbuild-32.h"
#elif __WORDSIZE == 64
#include "forbuild-64.h"
#else
#error "Unknown word size"
#endif

View File

@ -33,11 +33,13 @@
Name: brltty Name: brltty
Version: %{pkg_version} Version: %{pkg_version}
Release: 4%{?dist} Release: 5%{?dist}
License: LGPLv2+ License: LGPLv2+
URL: http://brltty.app/ URL: http://brltty.app/
Source0: http://brltty.app/archive/%{name}-%{version}.tar.xz Source0: http://brltty.app/archive/%{name}-%{version}.tar.xz
Source1: brltty.service Source1: brltty.service
Source2: brlapi-config.h
Source3: brlapi-forbuild.h
Patch1: brltty-6.3-loadLibrary.patch Patch1: brltty-6.3-loadLibrary.patch
# libspeechd.h moved in latest speech-dispatch (NOT sent upstream) # libspeechd.h moved in latest speech-dispatch (NOT sent upstream)
Patch2: brltty-6.3-libspeechd.patch 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 # make brltty-config executable
chmod 755 ${RPM_BUILD_ROOT}%{_bindir}/brltty-config.sh 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 # handle locales
%find_lang %{name} %find_lang %{name}
cp -p %{name}.lang ../ cp -p %{name}.lang ../
@ -551,6 +563,9 @@ fi
%config(noreplace) %verify(not size md5 mtime) %{_sysconfdir}/brltty/Initramfs/cmdline %config(noreplace) %verify(not size md5 mtime) %{_sysconfdir}/brltty/Initramfs/cmdline
%changelog %changelog
* Thu May 13 2021 Jaroslav Škarvada <jskarvad@redhat.com> - 6.3-5
- Fixed brlapi multilib
* Fri Apr 16 2021 Gwyn Ciesla <gwync@protonmail.com> - 6.3-4 * Fri Apr 16 2021 Gwyn Ciesla <gwync@protonmail.com> - 6.3-4
- Upstream patch to support Python 3.10. - Upstream patch to support Python 3.10.