From 052b732df15e9dd54a159af43ac7c5b526c2ebca Mon Sep 17 00:00:00 2001
From: Jerry James <loganjerry@gmail.com>
Date: Wed, 29 Jan 2025 21:13:14 -0700
Subject: [PATCH 1/2] OCaml 5.2.1 rebuild for Fedora 41

---
 brltty.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/brltty.spec b/brltty.spec
index 236192b..4b9b018 100644
--- a/brltty.spec
+++ b/brltty.spec
@@ -37,7 +37,7 @@
 
 Name: brltty
 Version: 6.6
-Release: 20%{?dist}
+Release: 21%{?dist}
 License: LGPL-2.0-or-later AND LGPL-2.1-or-later AND GPL-2.0-or-later
 URL: http://brltty.app/
 Source0: http://brltty.app/archive/%{name}-%{version}.tar.xz
@@ -677,6 +677,9 @@ fi
 %config(noreplace) %verify(not size md5 mtime) %{_sysconfdir}/brltty/Initramfs/cmdline
 
 %changelog
+* Wed Jan 29 2025 Jerry James <loganjerry@gmail.com> - 6.6-21
+- OCaml 5.2.1 rebuild for Fedora 41
+
 * Mon Aug 05 2024 Yaakov Selkowitz <yselkowi@redhat.com> - 6.6-20
 - Use bcond consistently
 - Disable java and ocaml bindings in RHEL

From b1b54d1b7c908e2b520863a26f2e932c9c6068e6 Mon Sep 17 00:00:00 2001
From: Yaakov Selkowitz <yselkowi@redhat.com>
Date: Thu, 30 Jan 2025 19:52:38 -0500
Subject: [PATCH 2/2] Fix exclusions from main package

commit d38d4c43521ffdf921f3696e6ce10a2cac048543 ("Use bcond consistently")
included a few substitutions of:

- %if %{!JAVA}
+ %if %{without java}

However, while that was the *intended* meaning of the original syntax, it
should have been `%if ! %{JAVA}` to have that effect.  Instead, it was
evaluated the same as `%if %{JAVA}`, so the modules that were supposed to
be excluded from the main package (as they are in subpackages) were still
being excluded (except on i686 once Java was dropped thereon, but nobody
noticed because that's just multilib nowadays).  Fixing the syntax though
broke the intention, causing the opposite effect.

This fixes the exclusions to work as originally intended.
---
 brltty.spec | 25 +++++++++++++++++--------
 1 file changed, 17 insertions(+), 8 deletions(-)

diff --git a/brltty.spec b/brltty.spec
index 4b9b018..581ebef 100644
--- a/brltty.spec
+++ b/brltty.spec
@@ -37,7 +37,7 @@
 
 Name: brltty
 Version: 6.6
-Release: 21%{?dist}
+Release: 22%{?dist}
 License: LGPL-2.0-or-later AND LGPL-2.1-or-later AND GPL-2.0-or-later
 URL: http://brltty.app/
 Source0: http://brltty.app/archive/%{name}-%{version}.tar.xz
@@ -568,17 +568,23 @@ fi
 %{_bindir}/brltty-*
 %exclude %{_bindir}/brltty-minimal
 %{_libdir}/brltty/
-%if %{without java}
-%exclude %{_libdir}/brltty/libbrlttybba.so
-%exclude %{_libdir}/brltty/libbrlttybxw.so
-%exclude %{_libdir}/brltty/libbrlttyxa2.so
-%exclude %{_libdir}/brltty/libbrlttysen.so
-%exclude %{_libdir}/brltty/libbrlttyses.so
+%if %{with java}
 %exclude %{_libdir}/brltty/libbrlapi_java.so
+%endif
+# brlapi subpackage
+%exclude %{_libdir}/brltty/libbrlttybba.so
+# xw subpackage
+%exclude %{_libdir}/brltty/libbrlttybxw.so
+# at-spi2 subpackage
+%exclude %{_libdir}/brltty/libbrlttyxa2.so
+# espeak-ng subpackage
+%exclude %{_libdir}/brltty/libbrlttysen.so
+%if %{with espeak}
+%exclude %{_libdir}/brltty/libbrlttyses.so
+%endif
 %if %{with speech_dispatcher}
 %exclude %{_libdir}/brltty/libbrlttyssd.so
 %endif
-%endif
 %license LICENSE-LGPL
 %doc %{_mandir}/man[15]/brltty.*
 %{_sysconfdir}/X11/Xsession.d/90xbrlapi
@@ -677,6 +683,9 @@ fi
 %config(noreplace) %verify(not size md5 mtime) %{_sysconfdir}/brltty/Initramfs/cmdline
 
 %changelog
+* Fri Jan 31 2025 Yaakov Selkowitz <yselkowi@redhat.com> - 6.6-22
+- Fix exclusions from main package
+
 * Wed Jan 29 2025 Jerry James <loganjerry@gmail.com> - 6.6-21
 - OCaml 5.2.1 rebuild for Fedora 41