Compare commits

...
Sign in to create a new pull request.

2 commits

Author SHA1 Message Date
Yaakov Selkowitz
b1b54d1b7c Fix exclusions from main package
commit d38d4c4352 ("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.
2025-01-30 20:16:56 -05:00
Jerry James
052b732df1 OCaml 5.2.1 rebuild for Fedora 41 2025-01-29 21:13:14 -07:00

View file

@ -37,7 +37,7 @@
Name: brltty
Version: 6.6
Release: 20%{?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,12 @@ 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
* Mon Aug 05 2024 Yaakov Selkowitz <yselkowi@redhat.com> - 6.6-20
- Use bcond consistently
- Disable java and ocaml bindings in RHEL