SPECS/brltty.spec

@@ -33,7 +33,7 @@
 
 Name: brltty
 Version: %{pkg_version}
-Release: 30%{?dist}
+Release: 32%{?dist}
 License: LGPLv2+
 URL: http://brltty.app/
 Source0: http://brltty.app/archive/%{name}-%{version}.tar.xz
@@ -389,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
@@ -413,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
 
@@ -491,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.*
@@ -537,6 +548,14 @@ 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