From 9d0f9734e40aea43637f75129fb5f9bde95fa871 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Tue, 20 Oct 2020 06:09:05 +0000 Subject: [PATCH] import brltty-5.6-31.el8 --- SPECS/brltty.spec | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/SPECS/brltty.spec b/SPECS/brltty.spec index 647ab27..3317ee9 100644 --- a/SPECS/brltty.spec +++ b/SPECS/brltty.spec @@ -33,7 +33,7 @@ Name: brltty Version: %{pkg_version} -Release: 30%{?dist} +Release: 31%{?dist} License: LGPLv2+ URL: http://brltty.app/ Source0: http://brltty.app/archive/%{name}-%{version}.tar.xz @@ -413,6 +413,16 @@ popd rm -f doc/Initramfs/Dracut/README* rmdir doc/Initramfs/Dracut doc/Initramfs +# workaround for multilib conflict (rhbz#1849675) +for f in config.h forbuild.h +do + sed -i 's|^\s*#define\s\+DRIVERS_DIRECTORY\s\+.*$|#if defined (__i386__)\ +#define DRIVERS_DIRECTORY "/usr/lib/brltty"\ +#else\ +#define DRIVERS_DIRECTORY "/usr/lib64/brltty"\ +#endif|' ${RPM_BUILD_ROOT}%{_includedir}/brltty/$f +done + %post %systemd_post brltty.service @@ -537,6 +547,10 @@ fi %config(noreplace) %verify(not size md5 mtime) %{_sysconfdir}/brltty/Initramfs/cmdline %changelog +* Mon Oct 19 2020 Jaroslav Škarvada - 5.6-31 +- Added workaround for brlapi-devel multilib conflict + Resolves: rhbz#1849675 + * Fri Jul 10 2020 Artem Egorenkov - 5.6-30 - brltty requires brlapi deleted (duplication of automatically determined dependency) - isa macro deleted for brlapi requires brltty