import brltty-5.6-32.el8

SOURCES/brltty-5.6-alsa-1.1.9-fix.patch

@@ -0,0 +1,26 @@
+diff --git a/Programs/midi_alsa.c b/Programs/midi_alsa.c
+index 3afb55d..aeaae5a 100644
+--- a/Programs/midi_alsa.c
++++ b/Programs/midi_alsa.c
+@@ -18,7 +18,7 @@
+ 
+ #include "prologue.h"
+ 
+-#include <asoundlib.h>
++#include <alsa/asoundlib.h>
+ 
+ #include "log.h"
+ #include "parse.h"
+diff --git a/Programs/pcm_alsa.c b/Programs/pcm_alsa.c
+index 7618bdc..bb7c927 100644
+--- a/Programs/pcm_alsa.c
++++ b/Programs/pcm_alsa.c
+@@ -19,7 +19,7 @@
+ #include "prologue.h"
+ 
+ #define ALSA_PCM_NEW_HW_PARAMS_API
+-#include <asoundlib.h>
++#include <alsa/asoundlib.h>
+ 
+ #include "log.h"
+ #include "timing.h"

SPECS/brltty.spec

@@ -33,7 +33,7 @@
 
 Name: brltty
 Version: %{pkg_version}
-Release: 28%{?dist}
+Release: 32%{?dist}
 License: LGPLv2+
 URL: http://brltty.app/
 Source0: http://brltty.app/archive/%{name}-%{version}.tar.xz
@@ -47,6 +47,7 @@ Patch3: 0001-Add-support-for-eSpeak-NG.patch
 Patch4: brltty-5.6-libs-add-ldflags.patch
 Patch5: brltty-5.6-ocaml-add-flags.patch
 Patch6: brltty-5.6-add-dracut-support.patch
+Patch7: brltty-5.6-alsa-1.1.9-fix.patch
 Summary: Braille display driver for Linux/Unix
 BuildRequires: byacc, glibc-kernheaders, bluez-libs-devel, systemd
 BuildRequires: gettext, at-spi2-core-devel, alsa-lib-devel
@@ -57,7 +58,6 @@ BuildRequires: espeak-ng-devel
 BuildRequires: /usr/bin/2to3
 BuildRequires: autoconf
 
-Requires: brlapi%{?_isa} = %{api_version}-%{release}
 # work around a bug in the install process:
 Requires(post): coreutils
 Requires(post): systemd
@@ -130,7 +130,7 @@ This package provides the eSpeak-NG driver for BRLTTY.
 Version: %{api_version}
 License: LGPLv2+
 Summary: Application Programming Interface for BRLTTY
-Requires: %{name}%{?_isa} = %{pkg_version}-%{release}
+Recommends: %{name} = %{pkg_version}-%{release}
 Requires(pre): glibc-common, shadow-utils
 Requires(post): coreutils, util-linux
 %description -n brlapi
@@ -239,6 +239,7 @@ pushd python2
 %patch4 -p1 -b .libs-add-ldflags
 %patch5 -p1 -b .ocaml-add-flags
 %patch6 -p1 -b .add-dracut-support
+%patch7 -p1 -b .alsa-1.1.9-fix
 
 # remove packaged binary file
 rm -f Programs/brltty-ktb
@@ -388,6 +389,7 @@ rm -rf $RPM_BUILD_ROOT/%{_libdir}/libbrlapi.a
 
 # ghost brlapi.key
 touch ${RPM_BUILD_ROOT}%{_sysconfdir}/brlapi.key
+chmod 0640 ${RPM_BUILD_ROOT}%{_sysconfdir}/brlapi.key
 
 # disable xbrlapi gdm autostart, there is already orca
 rm -f ${RPM_BUILD_ROOT}%{_datadir}/gdm/greeter/autostart/xbrlapi.desktop
@@ -412,6 +414,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
 
@@ -490,7 +502,7 @@ fi
 %{_bindir}/xbrlapi
 %{_libdir}/brltty/libbrlttybba.so
 %{_libdir}/libbrlapi.so.*
-%ghost %{_sysconfdir}/brlapi.key
+%ghost %verify(not group) %{_sysconfdir}/brlapi.key
 %doc Drivers/Braille/XWindow/README
 %doc Documents/Manual-BrlAPI/
 %doc %{_mandir}/man1/xbrlapi.*
@@ -536,6 +548,24 @@ fi
 %config(noreplace) %verify(not size md5 mtime) %{_sysconfdir}/brltty/Initramfs/cmdline
 
 %changelog
+* Wed Oct 21 2020 Jaroslav Škarvada <jskarvad@redhat.com> - 5.6-32
+- Fixed brlapi.key to pass the RPM verification
+  Resolves: rhbz#1889636
+
+* Mon Oct 19 2020 Jaroslav Škarvada <jskarvad@redhat.com> - 5.6-31
+- Added workaround for brlapi-devel multilib conflict
+  Resolves: rhbz#1849675
+
+* Fri Jul 10 2020 Artem Egorenkov <aegorenk@redhat.com> - 5.6-30
+- brltty requires brlapi deleted (duplication of automatically determined dependency)
+- isa macro deleted for brlapi requires brltty
+- brlapi recommends brltty
+  Resolves: rhbz#1765611
+
+* Wed Jul  8 2020 Artem Egorenkov <aegorenk@redhat.com> - 5.6-29
+- Fixed build with alsa-1.1.9
+  Resolves: rhbz#1854905
+
 * Tue Dec 11 2018 Jaroslav Škarvada <jskarvad@redhat.com> - 5.6-28
 - Do not package documentation for dracut module twice
   Related: rhbz#1655345