Compare commits

..

4 commits

Author SHA1 Message Date
Gwyn Ciesla
404867c08d Revert "6.1"
This reverts commit 0ffa6042f8.
2020-05-12 10:28:14 -05:00
Gwyn Ciesla
5c62bb1012 Revert "OCaml 4.11.0 pre-release"
This reverts commit 3b8b97863a.
2020-05-12 10:27:50 -05:00
Gwyn Ciesla
a4d64ed5bf Revert "OCaml 4.11.0 pre-release attempt 2"
This reverts commit 087cf5365c.
2020-05-12 10:27:39 -05:00
Gwyn Ciesla
6785babd67 Revert "OCaml 4.11.0+dev2-2020-04-22 rebuild"
This reverts commit 5d7a90b4f8.
2020-05-12 10:27:26 -05:00
15 changed files with 158 additions and 553 deletions

View file

@ -1 +0,0 @@
1

13
.gitignore vendored
View file

@ -1 +1,12 @@
/brltty-*.tar.xz
brltty-4.2.tar.gz
/brltty-4.3.tar.gz
/brltty-4.5.tar.gz
/brltty-5.0.tar.xz
/brltty-5.1.tar.xz
/brltty-5.2.tar.xz
/brltty-5.3.tar.xz
/brltty-5.3.1.tar.xz
/brltty-5.4.tar.xz
/brltty-5.5.tar.xz
/brltty-5.6.tar.xz
/brltty-6.0.tar.xz

View file

@ -1,9 +0,0 @@
#include <bits/wordsize.h>
#if __WORDSIZE == 32
#include "config-32.h"
#elif __WORDSIZE == 64
#include "config-64.h"
#else
#error "Unknown word size"
#endif

View file

@ -1,9 +0,0 @@
#include <bits/wordsize.h>
#if __WORDSIZE == 32
#include "forbuild-32.h"
#elif __WORDSIZE == 64
#include "forbuild-64.h"
#else
#error "Unknown word size"
#endif

View file

@ -0,0 +1,13 @@
diff --git a/Drivers/Speech/SpeechDispatcher/speech.c b/Drivers/Speech/SpeechDispatcher/speech.c
index d73250a..df92708 100644
--- a/Drivers/Speech/SpeechDispatcher/speech.c
+++ b/Drivers/Speech/SpeechDispatcher/speech.c
@@ -34,7 +34,7 @@ typedef enum {
#include "spk_driver.h"
-#include <libspeechd.h>
+#include <speech-dispatcher/libspeechd.h>
static SPDConnection *connectionHandle = NULL;
static const char *moduleName;

View file

@ -0,0 +1,26 @@
diff --git a/Programs/midi_alsa.c b/Programs/midi_alsa.c
index 10a6afc..c52ee30 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 e04b1ea..82e12f1 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"

View file

@ -1,9 +1,9 @@
diff --git a/Bindings/Java/NativeComponent.java b/Bindings/Java/NativeComponent.java
index 2e6304a..cf6c9b0 100644
--- a/Bindings/Java/NativeComponent.java
+++ b/Bindings/Java/NativeComponent.java
@@ -23,7 +23,15 @@ public class NativeComponent extends Component {
private native static void initializeNativeData ();
diff --git a/Bindings/Java/NativeLibrary.java b/Bindings/Java/NativeLibrary.java
index 5780e34..8383821 100644
--- a/Bindings/Java/NativeLibrary.java
+++ b/Bindings/Java/NativeLibrary.java
@@ -26,7 +26,15 @@ public class NativeLibrary {
}
static {
- System.loadLibrary("brlapi_java");
@ -16,6 +16,6 @@ index 2e6304a..cf6c9b0 100644
+ throw new UnsatisfiedLinkError("brlapi_java library load failed");
+ }
+ }
initializeNativeData();
new NativeLibrary().initializeNativeData();
}
}

View file

@ -1,11 +0,0 @@
--- a/Drivers/Speech/SpeechDispatcher/speech.c~ 2025-05-25 03:58:25.000000000 -0500
+++ b/Drivers/Speech/SpeechDispatcher/speech.c 2025-07-07 08:58:19.519919859 -0500
@@ -36,7 +36,7 @@
#include "spk_driver.h"
-#include <libspeechd.h>
+#include <speech-dispatcher/libspeechd.h>
static SPDConnection *connectionHandle = NULL;
static unsigned int autospawn;

View file

@ -1,34 +1,30 @@
%define pkg_version 6.8
%define api_version 0.8.7
%define pkg_version 6.0
%define api_version 0.7.0
# minimal means brltty-minimal subpackage with minimal deps for
# braille support in Anaconda installer
# https://bugzilla.redhat.com/show_bug.cgi?id=1584679
%bcond minimal 1
# enable python3 by default
%bcond python3 1
%if 0%{?rhel} && 0%{?rhel} <= 7
# disable python3 by default
%bcond_with python3
%else
%bcond_without python3
%endif
%if 0%{?rhel} > 7 || 0%{?fedora} > 28
# disable python2 by default
%bcond python2 0
%bcond_with python2
%else
%bcond_without python2
%endif
%{!?tcl_version: %global tcl_version %(echo 'puts $tcl_version' | tclsh)}
%{!?tcl_sitearch: %global tcl_sitearch %{_prefix}/%{_lib}/tcl%{tcl_version}}
# with speech dispatcher iff on Fedora:
%bcond speech_dispatcher %{defined fedora}
%define with_speech_dispatcher 0%{?fedora}
# with espeak support iff on Fedora:
%bcond espeak %{defined fedora}
%define with_espeak 0%{?fedora}
# OCaml packages not built on i686 since OCaml 5 / Fedora 39.
%ifnarch %{ix86}
%bcond ocaml %{defined fedora}
%endif
%ifarch %{java_arches}
%bcond java %{defined fedora}
%endif
%global with_ocaml 1
# Filter private libraries
%global _privatelibs libbrltty.+\.so.*
@ -36,50 +32,27 @@
%global __requires_exclude ^(%{_privatelibs})$
Name: brltty
Version: 6.8
Release: 6%{?dist}
License: LGPL-2.0-or-later AND LGPL-2.1-or-later AND GPL-2.0-or-later
Version: %{pkg_version}
Release: 14%{?dist}
License: LGPLv2+
URL: http://brltty.app/
Source0: http://brltty.app/archive/%{name}-%{version}.tar.xz
Source1: brltty.service
Source2: brlapi-config.h
Source3: brlapi-forbuild.h
Source4: brltty.sysusers
Patch1: brltty-6.3-loadLibrary.patch
Patch1: brltty-6.0-loadLibrary.patch
# libspeechd.h moved in latest speech-dispatch (NOT sent upstream)
Patch2: brltty-6.8-libspeechd.patch
Patch2: brltty-5.0-libspeechd.patch
Patch3: brltty-6.0-alsa-1.1.9-fix.patch
Summary: Braille display driver for Linux/Unix
BuildRequires: byacc
BuildRequires: glibc-kernheaders
BuildRequires: gcc
BuildRequires: bluez-libs-devel
BuildRequires: systemd
BuildRequires: systemd-rpm-macros
BuildRequires: lua-devel
BuildRequires: gettext
BuildRequires: at-spi2-core-devel
BuildRequires: alsa-lib-devel
%if %{with espeak}
BuildRequires: byacc, glibc-kernheaders, bluez-libs-devel, systemd
BuildRequires: gettext, at-spi2-core-devel, alsa-lib-devel
%if %{with_espeak}
BuildRequires: espeak-devel
%endif
BuildRequires: espeak-ng-devel
BuildRequires: /usr/bin/2to3
BuildRequires: autoconf
BuildRequires: automake
BuildRequires: polkit-devel
BuildRequires: libicu-devel
BuildRequires: doxygen
BuildRequires: linuxdoc-tools
BuildRequires: ncurses-devel
%if %{with python2}
BuildRequires: python2-docutils
BuildRequires: python2-setuptools
%endif
%if %{with python3}
BuildRequires: python3-docutils
BuildRequires: python3-setuptools
%endif
Conflicts: brltty-minimal
Requires: brlapi%{?_isa} = %{api_version}-%{release}
# work around a bug in the install process:
Requires(post): coreutils
Requires(post): systemd
@ -92,12 +65,13 @@ access to the Linux/Unix console (when in text mode)
for a blind person using a refreshable braille display.
It drives the braille display and provides complete
screen review functionality.
%if %{with speech_dispatcher}
%if %{with_speech_dispatcher}
BRLTTY can also work with speech synthesizers; if you want to use it with
Speech Dispatcher, please install also package %{name}-speech-dispatcher.
%package speech-dispatcher
Summary: Speech Dispatcher driver for BRLTTY
License: LGPLv2+
BuildRequires: speech-dispatcher-devel
Requires: %{name}%{?_isa} = %{pkg_version}-%{release}
%description speech-dispatcher
@ -106,27 +80,32 @@ This package provides the Speech Dispatcher driver for BRLTTY.
%package docs
Summary: Documentation for BRLTTY
License: LGPLv2+
Requires: %{name} = %{pkg_version}-%{release}
BuildArch: noarch
%description docs
This package provides the documentation for BRLTTY.
%package xw
Summary: XWindow driver for BRLTTY
License: LGPLv2+
BuildRequires: libSM-devel libICE-devel libX11-devel libXaw-devel libXext-devel libXt-devel libXtst-devel
Requires: %{name}%{?_isa} = %{pkg_version}-%{release}
Requires: xorg-x11-fonts-misc
Requires: xorg-x11-fonts-misc, ucs-miscfixed-fonts
%description xw
This package provides the XWindow driver for BRLTTY.
%package at-spi2
Summary: AtSpi2 driver for BRLTTY
License: LGPLv2+
Requires: %{name}%{?_isa} = %{pkg_version}-%{release}
%description at-spi2
This package provides the AtSpi2 driver for BRLTTY.
%if %{with espeak}
%if %{with_espeak}
%package espeak
Summary: eSpeak driver for BRLTTY
License: LGPLv2+
Requires: %{name}%{?_isa} = %{pkg_version}-%{release}
%description espeak
This package provides the eSpeak driver for BRLTTY.
@ -134,8 +113,9 @@ This package provides the eSpeak driver for BRLTTY.
%package espeak-ng
Summary: eSpeak-NG driver for BRLTTY
License: LGPLv2+
Requires: %{name}%{?_isa} = %{pkg_version}-%{release}
%if %{without espeak}
%if ! %{with_espeak}
Obsoletes: brltty-espeak <= 5.6-5
%endif
%description espeak-ng
@ -143,8 +123,10 @@ This package provides the eSpeak-NG driver for BRLTTY.
%package -n brlapi
Version: %{api_version}
License: LGPLv2+
Summary: Application Programming Interface for BRLTTY
Requires(pre): glibc-common
Requires: %{name}%{?_isa} = %{pkg_version}-%{release}
Requires(pre): glibc-common, shadow-utils
Requires(post): coreutils, util-linux
%description -n brlapi
This package provides the run-time support for the Application
@ -155,6 +137,7 @@ a refreshable braille display.
%package -n brlapi-devel
Version: %{api_version}
License: LGPLv2+
Requires: brlapi%{?_isa} = %{api_version}-%{release}
Summary: Headers, static archive, and documentation for BrlAPI
@ -172,6 +155,7 @@ which directly accesses a refreshable braille display.
%package -n tcl-brlapi
Version: %{api_version}
License: LGPLv2+
Requires: brlapi%{?_isa} = %{api_version}-%{release}
BuildRequires: tcl-devel
Summary: Tcl binding for BrlAPI
@ -182,6 +166,7 @@ This package provides the Tcl binding for BrlAPI.
%package -n python2-brlapi
%{?python_provide:%python_provide python2-brlapi}
Version: %{api_version}
License: LGPLv2+
Requires: brlapi%{?_isa} = %{api_version}-%{release}
BuildRequires: Cython
BuildRequires: python2-devel
@ -195,6 +180,7 @@ This package provides the Python 2 binding for BrlAPI.
%package -n python3-brlapi
%{?python_provide:%python_provide python3-brlapi}
Version: %{api_version}
License: LGPLv2+
Requires: brlapi%{?_isa} = %{api_version}-%{release}
BuildRequires: python3-Cython
BuildRequires: python3-devel
@ -207,24 +193,22 @@ Summary: Python 3 binding for BrlAPI
This package provides the Python 3 binding for BrlAPI.
%endif
%if %{with java}
%package -n brlapi-java
Version: %{api_version}
License: LGPLv2+
Requires: brlapi%{?_isa} = %{api_version}-%{release}
BuildRequires: jpackage-utils
BuildRequires: java-devel
Summary: Java binding for BrlAPI
%description -n brlapi-java
This package provides the Java binding for BrlAPI.
%endif
%if %{with ocaml}
%if 0%{?with_ocaml}
%package -n ocaml-brlapi
Version: %{api_version}
License: LGPLv2+
Requires: brlapi%{?_isa} = %{api_version}-%{release}
BuildRequires: ocaml
BuildRequires: ocaml-findlib
BuildRequires: make
Summary: OCaml binding for BrlAPI
%description -n ocaml-brlapi
This package provides the OCaml binding for BrlAPI.
@ -237,15 +221,6 @@ Requires: dracut
%description dracut
This package provides brltty module for Dracut.
%if %{with minimal}
%package minimal
Summary: Stripped down brltty version for Anaconda installer
Conflicts: brltty
%description minimal
This package provides stripped down brltty version for Anaconda
installer.
%endif
%define version %{pkg_version}
%prep
@ -253,35 +228,28 @@ installer.
mv %{name}-%{version} python2
pushd python2
%autopatch -p1
%patch1 -p1 -b .loadLibrary
%patch2 -p1 -b .libspeechd
%patch3 -p1 -b .alsa-1.1.9-fix
# remove packaged binary file
rm -f Programs/brltty-ktb
# produce debuginfo for the OCaml interface
sed -i 's/@OCAMLC@/& -g/;s/@OCAMLOPT@/& -g/;s/@OCAMLMKLIB@/& -g/' \
Bindings/OCaml/Makefile.in
popd
# Make a copy of the source tree for building the Python 3 module
# Make it all time, we just gonna ignore python2 or python3 when not needed
cp -a python2 python3
%if %{with minimal}
cp -a python2 minimal
%endif
%build
# If MAKEFLAGS=-jN is set it would break local builds.
unset MAKEFLAGS
%if %{with java}
# Add the openjdk include directories to CPPFLAGS
for i in -I/usr/lib/jvm/java/include{,/linux}; do
java_inc="$java_inc $i"
done
export CPPFLAGS="$java_inc"
%endif
export LDFLAGS="%{?build_ldflags}"
export CFLAGS="%{optflags} -fno-strict-aliasing $LDFLAGS"
@ -292,41 +260,16 @@ export CXXFLAGS="%{optflags} -fno-strict-aliasing $LDFLAGS"
configure_opts=" \
--disable-stripping \
--without-curses \
%if %{with speech_dispatcher}
%if %{with_speech_dispatcher}
--with-speechd=%{_prefix} \
%endif
%if %{without espeak}
%if ! %{with_espeak}
--without-espeak \
%endif
%if %{with java}
--with-install-root=%{buildroot} \
--with-install-root=$RPM_BUILD_ROOT
JAVA_JAR_DIR=%{_jnidir} \
JAVA_JNI_DIR=%{_libdir}/brltty \
JAVA_JNI=yes"
%else
--with-install-root=%{buildroot}"
%endif
configure_opts_minimal=" \
--disable-stripping \
--without-curses \
--without-speechd \
--without-espeak \
--disable-icu \
--disable-polkit \
--disable-java-bindings \
--disable-ocaml-bindings \
--disable-python-bindings \
--disable-tcl-bindings \
--disable-speech-support \
--without-pcm-package \
--without-midi-package \
--with-install-root=%{buildroot} \
--with-configuration-file=brltty-minimal.conf \
--with-drivers-directory=%{_libdir}/brltty-minimal \
--with-tables-directory=%{_sysconfdir}/brltty-minimal \
--with-scripts-directory=%{_libexecdir}/brltty-minimal \
JAVA_JNI=no"
export PYTHONCOERCECLOCALE=0
@ -339,44 +282,21 @@ pushd python2
%configure $configure_opts PYTHON=%{__python2}
# Parallel build seems broken, thus disabling it
make
# documents
pushd Documents
make
popd
popd
PYTHONS="$PYTHONS python2"
%endif
%if %{with minimal}
# ... and then do it again for minimal
pushd minimal
./autogen
%configure $configure_opts_minimal
make
popd
%endif
%if %{with python3}
# ... and then do it again for the Python 3 module
pushd python3
./autogen
%configure $configure_opts PYTHON=%{__python3} CYTHON=%{_bindir}/cython
make
# documents
pushd Documents
make
popd
popd
PYTHONS="$PYTHONS python3"
%endif
for python in $PYTHONS
do pushd $python
find . -name '*.sgml' |
@ -403,8 +323,8 @@ for python in $PYTHONS
done
%install
%if %{with ocaml}
mkdir -p %{buildroot}%{_libdir}/ocaml/stublibs
%if 0%{?with_ocaml}
mkdir -p $RPM_BUILD_ROOT%{_libdir}/ocaml/stublibs
%endif
%if %{with python2}
@ -416,28 +336,6 @@ make install JAVA_JAR_DIR=%{_jnidir} \
popd
%endif
%if %{with minimal}
# minimal
pushd minimal
make install
# drop extra drivers
pushd %{buildroot}%{_libdir}/brltty-minimal
rm -f libbrlttybba.so libbrlttybxw.so libbrlttyxa2.so libbrlttysen.so \
libbrlttyses.so libbrlapi_java.so
popd
# rename brltty to brltty-minimal
mv %{buildroot}%{_bindir}/brltty %{buildroot}%{_bindir}/brltty-minimal
# install config
install -d -m 755 "%{buildroot}%{_sysconfdir}"
install -p -m 644 Documents/brltty.conf "%{buildroot}%{_sysconfdir}/brltty-minimal.conf"
popd
%endif
%if %{with python3}
# Python 3
pushd python3
@ -454,16 +352,11 @@ pushd python3
pushd python2
%endif
# install polkit rules
pushd Authorization/Polkit
make install
popd
install -d -m 755 "${RPM_BUILD_ROOT}%{_sysconfdir}" "$RPM_BUILD_ROOT%{_mandir}/man5"
install -m 644 Documents/brltty.conf "${RPM_BUILD_ROOT}%{_sysconfdir}"
echo ".so man1/brltty.1" > $RPM_BUILD_ROOT%{_mandir}/man5/brltty.conf.5
install -d -m 755 "%{buildroot}%{_sysconfdir}" "%{buildroot}%{_mandir}/man5"
install -p -m 644 Documents/brltty.conf "%{buildroot}%{_sysconfdir}"
echo ".so man1/brltty.1" > %{buildroot}%{_mandir}/man5/brltty.conf.5
install -Dpm 644 %{SOURCE1} %{buildroot}%{_unitdir}/brltty.service
install -Dpm 644 %{SOURCE1} $RPM_BUILD_ROOT%{_unitdir}/brltty.service
cp -p LICENSE* ../
@ -482,36 +375,26 @@ for i in Drivers/Speech/SpeechDispatcher/README \
mkdir -p ../${i%/*} && cp -rp $i ../$i || exit 1
done
# don't want static lib
rm -rf %{buildroot}/%{_libdir}/libbrlapi.a
# create /var/lib/brltty directory
mkdir -p %{buildroot}%{_localstatedir}/lib/brltty
# Don't want static lib
rm -rf $RPM_BUILD_ROOT/%{_libdir}/libbrlapi.a
# ghost brlapi.key
touch %{buildroot}%{_sysconfdir}/brlapi.key
chmod 0640 %{buildroot}%{_sysconfdir}/brlapi.key
touch ${RPM_BUILD_ROOT}%{_sysconfdir}/brlapi.key
# disable xbrlapi gdm autostart, there is already orca
rm -f %{buildroot}%{_datadir}/gdm/greeter/autostart/xbrlapi.desktop
rm -f ${RPM_BUILD_ROOT}%{_datadir}/gdm/greeter/autostart/xbrlapi.desktop
# make brltty-config executable
chmod 755 %{buildroot}%{_bindir}/brltty-config.sh
# fix multilib
pushd %{buildroot}%{_includedir}/brltty
for f in config forbuild
do
mv ./$f.h ./$f-$(getconf LONG_BIT).h
done
install -p -m 0644 %{SOURCE2} ./config.h
install -p -m 0644 %{SOURCE3} ./forbuild.h
popd
chmod 755 ${RPM_BUILD_ROOT}%{_bindir}/brltty-config
# handle locales
%find_lang %{name}
cp -p %{name}.lang ../
#Use python 3 for latex-access, BZ 1465657.
/usr/bin/2to3 -wn ${RPM_BUILD_ROOT}/etc/brltty/Contraction/latex-access.ctb
sed -i 's|/usr/bin/python|%{__python3}|g' ${RPM_BUILD_ROOT}/etc/brltty/Contraction/latex-access.ctb
# install dracut module
make install-dracut
@ -521,14 +404,6 @@ popd
rm -f doc/Initramfs/Dracut/README*
rmdir doc/Initramfs/Dracut doc/Initramfs
# Install group creation file
install -p -D -m 0644 %{SOURCE4} %{buildroot}%{_sysusersdir}/brltty.conf
%if %{without java}
find . -type d -name 'Java' | xargs rm -rf
find %{buildroot}%{_datadir} -type d -name 'Java' | xargs rm -rf
%endif
%post
%systemd_post brltty.service
@ -538,6 +413,8 @@ find %{buildroot}%{_datadir} -type d -name 'Java' | xargs rm -rf
%postun
%systemd_postun_with_restart brltty.service
%pre -n brlapi
getent group brlapi >/dev/null || groupadd -r brlapi >/dev/null
%post -n brlapi
if [ ! -e %{_sysconfdir}/brlapi.key ]; then
@ -550,48 +427,30 @@ fi
%ldconfig_postun -n brlapi
%files -f %{name}.lang
%dir %{_localstatedir}/lib/brltty
%config(noreplace) %{_sysconfdir}/brltty.conf
%{_sysconfdir}/brltty/
%exclude %{_sysconfdir}/brltty/Initramfs
%{_unitdir}/brltty.service
%{_bindir}/brltty
%{_bindir}/brltty-*
%exclude %{_bindir}/brltty-minimal
%{_libdir}/brltty/
%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/libbrlapi_java.so
%if %{with_speech_dispatcher}
%exclude %{_libdir}/brltty/libbrlttyssd.so
%endif
%license LICENSE-LGPL
%doc %{_mandir}/man[15]/brltty.*
%{_sysconfdir}/X11/Xsession.d/90xbrlapi
%{_sysconfdir}/X11/Xsession.d/60xbrlapi
#%%{_datadir}/metainfo/org.a11y.brltty.metainfo.xml
%{_datadir}/polkit-1/actions/org.a11y.brlapi.policy
%{_datadir}/polkit-1/rules.d/org.a11y.brlapi.rules
%if %{with minimal}
%files minimal -f %{name}.lang
%config(noreplace) %{_sysconfdir}/brltty-minimal.conf
%{_sysconfdir}/brltty-minimal/
%{_bindir}/brltty-minimal
%{_libdir}/brltty-minimal/
%license LICENSE-LGPL
%endif
%if %{with speech_dispatcher}
%if %{with_speech_dispatcher}
%files speech-dispatcher
%doc Drivers/Speech/SpeechDispatcher/README
%{_libdir}/brltty/libbrlttyssd.so
@ -600,7 +459,7 @@ fi
%files docs
%doc Documents/ChangeLog Documents/TODO
%doc Documents/Manual-BRLTTY/
#%doc doc/*
%doc doc/*
%files xw
%doc Drivers/Braille/XWindow/README
@ -609,7 +468,7 @@ fi
%files at-spi2
%{_libdir}/brltty/libbrlttyxa2.so
%if %{with espeak}
%if %{with_espeak}
%files espeak
%{_libdir}/brltty/libbrlttyses.so
%endif
@ -621,23 +480,19 @@ fi
%{_bindir}/vstp
%{_bindir}/eutp
%{_bindir}/xbrlapi
%dir %{_libdir}/brltty
%{_libdir}/brltty/libbrlttybba.so
%{_libdir}/libbrlapi.so.*
%ghost %verify(not group) %{_sysconfdir}/brlapi.key
%ghost %{_sysconfdir}/brlapi.key
%doc Drivers/Braille/XWindow/README
%doc Documents/Manual-BrlAPI/
%doc %{_mandir}/man1/xbrlapi.*
%doc %{_mandir}/man1/vstp.*
%doc %{_mandir}/man1/eutp.*
%{_sysusersdir}/brltty.conf
%{lua_libdir}/brlapi.so
%files -n brlapi-devel
%{_libdir}/libbrlapi.so
%{_includedir}/brltty
%{_includedir}/brlapi*.h
%{_libdir}/pkgconfig/brltty.pc
%doc %{_mandir}/man3/brlapi_*.3*
%doc Documents/BrlAPIref/BrlAPIref/
@ -656,13 +511,11 @@ fi
%{python3_sitearch}/Brlapi-%{api_version}-*.egg-info
%endif
%if %{with java}
%files -n brlapi-java
%{_libdir}/brltty/libbrlapi_java.so
%{_jnidir}/brlapi.jar
%endif
%if %{with ocaml}
%if 0%{?with_ocaml}
%files -n ocaml-brlapi
%{_libdir}/ocaml/brlapi/
%{_libdir}/ocaml/stublibs/
@ -675,278 +528,6 @@ fi
%config(noreplace) %verify(not size md5 mtime) %{_sysconfdir}/brltty/Initramfs/cmdline
%changelog
* Mon Oct 13 2025 Richard W.M. Jones <rjones@redhat.com> - 6.8-6
- OCaml 5.4.0 rebuild
* Wed Oct 08 2025 Dominik Mierzejewski <dominik@greysector.net> - 6.8-5
- own _libdir/brltty directory in brlapi
* Wed Aug 06 2025 František Zatloukal <fzatlouk@redhat.com> - 6.8-4
- Rebuilt for icu 77.1
* Wed Jul 23 2025 Fedora Release Engineering <releng@fedoraproject.org> - 6.8-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
* Fri Jul 11 2025 Jerry James <loganjerry@gmail.com> - 6.8-2
- Rebuild to fix OCaml dependencies
* Mon Jul 07 2025 Gwyn Ciesla <gwync@protonmail.com> - 6.8-1
- 6.8
* Mon Jun 02 2025 Python Maint <python-maint@redhat.com> - 6.7-11
- Rebuilt for Python 3.14
* Tue Feb 11 2025 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 6.7-10
- Drop call to %sysusers_create_compat
* Tue Feb 11 2025 Jaroslav Škarvada <jskarvad@redhat.com> - 6.7-9
- Built for tcl 9.0
Related: rhbz#2337691
* Mon Feb 3 2025 Jaroslav Škarvada <jskarvad@redhat.com> - 6.7-8
- Rebuilt for tcl/tk change
Related: rhbz#2337691
* Fri Jan 31 2025 Yaakov Selkowitz <yselkowi@redhat.com> - 6.7-7
- Fix exclusions from main package
* Thu Jan 16 2025 Fedora Release Engineering <releng@fedoraproject.org> - 6.7-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
* Tue Jan 14 2025 Gwyn Ciesla <gwync@protonmail.com> - 6.7-5
- Update to use tcl8 compat.
* Fri Jan 10 2025 Jerry James <loganjerry@gmail.com> - 6.7-4
- OCaml 5.3.0 rebuild for Fedora 42
* Tue Dec 10 2024 Jaroslav Škarvada <jskarvad@redhat.com> - 6.7-3
- Switched to upstream patch
Related: rhbz#2328699
* Mon Dec 9 2024 Jaroslav Škarvada <jskarvad@redhat.com> - 6.7-2
- Resolves: rhbz#2328699
* Tue Oct 15 2024 Gwyn Ciesla <gwync@protonmail.com> - 6.7-1
- 6.7
* Mon Aug 05 2024 Yaakov Selkowitz <yselkowi@redhat.com> - 6.6-20
- Use bcond consistently
- Disable java and ocaml bindings in RHEL
* Wed Jul 17 2024 Fedora Release Engineering <releng@fedoraproject.org> - 6.6-19
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
* Thu Jul 4 2024 Jaroslav Škarvada <jskarvad@redhat.com> - 6.6-18
- Dropped ucs-miscfixed-fonts requirement, xorg-x11-fonts-misc is enough
* Wed Jun 19 2024 Richard W.M. Jones <rjones@redhat.com> - 6.6-17
- OCaml 5.2.0 ppc64le fix
* Tue Jun 18 2024 Paolo Bonzini <pbonzini@redhat.com> - 6.6-16
- Remove unnecessary dependency from brlapi and brltty-docs to brltty
* Fri Jun 07 2024 Python Maint <python-maint@redhat.com> - 6.6-15
- Rebuilt for Python 3.13
* Wed May 29 2024 Richard W.M. Jones <rjones@redhat.com> - 6.6-14
- OCaml 5.2.0 for Fedora 41
* Wed Jan 31 2024 Pete Walter <pwalter@fedoraproject.org> - 6.6-13
- Rebuild for ICU 74
* Tue Jan 23 2024 Fedora Release Engineering <releng@fedoraproject.org> - 6.6-12
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Fri Jan 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 6.6-11
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Wed Jan 17 2024 Jaroslav Škarvada <jskarvad@redhat.com> - 6.6-10
- Added SPDX licenses found by ScanCode
- Dropped redundant license tags from subpackages
* Wed Dec 20 2023 Gwyn Ciesla <gwync@protonmail.com> - 6.6-9
- Migrate group creation to sysusers
* Mon Dec 18 2023 Richard W.M. Jones <rjones@redhat.com> - 6.6-8
- Bump release and rebuild
* Mon Dec 18 2023 Richard W.M. Jones <rjones@redhat.com> - 6.6-7
- OCaml 5.1.1 + s390x code gen fix for Fedora 40
* Tue Dec 12 2023 Richard W.M. Jones <rjones@redhat.com> - 6.6-6
- OCaml 5.1.1 rebuild for Fedora 40
* Thu Oct 05 2023 Richard W.M. Jones <rjones@redhat.com> - 6.6-5
- OCaml 5.1 rebuild for Fedora 40
* Tue Aug 15 2023 Adam Williamson <awilliam@redhat.com> - 6.6-4
- Fix the Cython 3 crash and build with Cython 3 again
* Mon Aug 14 2023 Adam Williamson <awilliam@redhat.com> - 6.6-3
- Build with Cython 0.29, it crashes when built with Cython 3 (#2231865)
* Tue Jul 25 2023 Gwyn Ciesla <gwync@protonmail.com> - 6.6-2
- Correct apiversioning
* Mon Jul 24 2023 Gwyn Ciesla <gwync@protonmail.com> - 6.6-1
- 6.6
* Wed Jul 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 6.5-20
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
* Thu Jul 13 2023 František Zatloukal <fzatlouk@redhat.com> - 6.5-19
- Rebuilt for ICU 73.2
* Wed Jul 12 2023 Richard W.M. Jones <rjones@redhat.com> - 6.5-18
- OCaml 5.0 rebuild for Fedora 39
* Wed Jul 12 2023 Frantisek Zatloukal <fzatlouk@redhat.com> - 6.5-17
- Add BR: gcc (ocaml no longer pulls it indirectly on i686)
* Tue Jul 11 2023 František Zatloukal <fzatlouk@redhat.com> - 6.5-15
- Rebuilt for ICU 73.2
* Mon Jul 10 2023 Jerry James <loganjerry@gmail.com> - 6.5-14
- OCaml 5.0.0 rebuild
- Produce debuginfo for the OCaml interface
* Tue Jun 27 2023 Gwyn Ciesla <gwync@protonmail.com> - 6.5-13
- Fix build with gettext-0.22 (yselkowitz)
* Tue Jun 13 2023 Python Maint <python-maint@redhat.com> - 6.5-12
- Rebuilt for Python 3.12
* Wed Mar 08 2023 Gwyn Ciesla <gwync@protonmail.com> - 6.5-11
- migrated to SPDX license
* Tue Jan 24 2023 Richard W.M. Jones <rjones@redhat.com> - 6.5-10
- Rebuild OCaml packages for F38
* Wed Jan 18 2023 Fedora Release Engineering <releng@fedoraproject.org> - 6.5-9
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
* Sat Dec 31 2022 Pete Walter <pwalter@fedoraproject.org> - 6.5-8
- Rebuild for ICU 72
* Mon Aug 01 2022 Gwyn Ciesla <gwync@protonmail.com> - 6.5-7
- Build Java only on supported platforms.
* Mon Aug 01 2022 Frantisek Zatloukal <fzatlouk@redhat.com> - 6.5-6
- Rebuilt for ICU 71.1
* Wed Jul 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 6.5-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
* Mon Jun 20 2022 Python Maint <python-maint@redhat.com> - 6.5-4
- Rebuilt for Python 3.11
* Sat Jun 18 2022 Richard W.M. Jones <rjones@redhat.com> - 6.5-3
- OCaml 4.14.0 rebuild
* Thu Jun 16 2022 Python Maint <python-maint@redhat.com> - 6.5-2
- Rebuilt for Python 3.11
* Tue Jun 14 2022 Jaroslav Škarvada <jskarvad@redhat.com> - 6.5-1
- New version
Resolves: rhbz#2095460
* Mon Jun 13 2022 Python Maint <python-maint@redhat.com> - 6.4-7
- Rebuilt for Python 3.11
* Sat Feb 05 2022 Jiri Vanek <jvanek@redhat.com> - 6.4-6
- Rebuilt for java-17-openjdk as system jdk
* Fri Feb 04 2022 Richard W.M. Jones <rjones@redhat.com> - 6.4-5
- OCaml 4.13.1 rebuild to remove package notes
* Thu Jan 20 2022 Jaroslav Škarvada <jskarvad@redhat.com> - 6.4-4
- Installed /var/lib/brltty directory
Related: rhbz#2042412
* Wed Jan 19 2022 Fedora Release Engineering <releng@fedoraproject.org> - 6.4-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
* Mon Oct 04 2021 Richard W.M. Jones <rjones@redhat.com> - 6.4-2
- OCaml 4.13.1 build
* Fri Sep 24 2021 Gwyn Ciesla <gwync@protonmail.com> - 6.4-1
- 6.4
* Wed Jul 21 2021 Fedora Release Engineering <releng@fedoraproject.org> - 6.3-10
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
* Fri Jun 04 2021 Python Maint <python-maint@redhat.com> - 6.3-9
- Rebuilt for Python 3.10
* Tue Jun 1 2021 Jaroslav Škarvada <jskarvad@redhat.com> - 6.3-8
- Fixed requirements for brltty-minimal
Related: rhbz#1584679
* Wed May 19 2021 Pete Walter <pwalter@fedoraproject.org> - 6.3-7
- Rebuild for ICU 69
* Wed May 19 2021 Jaroslav Škarvada <jskarvad@redhat.com> - 6.3-6
- Added brltty-minimal subpackage for braille support in Anaconda installer
Related: rhbz#1584679
* Thu May 13 2021 Jaroslav Škarvada <jskarvad@redhat.com> - 6.3-5
- Fixed brlapi multilib
* Fri Apr 16 2021 Gwyn Ciesla <gwync@protonmail.com> - 6.3-4
- Upstream patch to support Python 3.10.
* Tue Mar 02 2021 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 6.3-3
- Rebuilt for updated systemd-rpm-macros
See https://pagure.io/fesco/issue/2583.
* Mon Mar 1 13:12:00 GMT 2021 Richard W.M. Jones <rjones@redhat.com> - 6.3-2
- OCaml 4.12.0 build
* Mon Feb 1 2021 Jaroslav Škarvada <jskarvad@redhat.com> - 6.3-1
- New version
Resolves: rhbz#1910328
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 6.1-13
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
* Tue Oct 20 2020 Jaroslav Škarvada <jskarvad@redhat.com> - 6.1-12
- Fixed brlapi.key to pass the RPM verification
* Tue Sep 01 2020 Richard W.M. Jones <rjones@redhat.com> - 6.1-11
- OCaml 4.11.1 rebuild
* Fri Aug 21 2020 Richard W.M. Jones <rjones@redhat.com> - 6.1-10
- OCaml 4.11.0 rebuild
* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 6.1-9
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Thu Jul 16 2020 Jaroslav Škarvada <jskarvad@redhat.com> - 6.1-8
- Dropped explicit brlapi dependency (brltty) and relaxed brltty
dependency (brlapi)
Related: rhbz#1765611
* Fri Jul 10 2020 Jiri Vanek <jvanek@redhat.com> - 6.1-7
- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11
* Tue May 26 2020 Miro Hrončok <mhroncok@redhat.com> - 6.1-6
- Rebuilt for Python 3.9
* Wed May 20 2020 Jaroslav Škarvada <jskarvad@redhat.com> - 6.1-5
- Added missing missing -o option to the brltty man page
* Mon May 04 2020 Richard W.M. Jones <rjones@redhat.com> - 6.1-4
- OCaml 4.11.0+dev2-2020-04-22 rebuild
* Tue Apr 21 2020 Richard W.M. Jones <rjones@redhat.com> - 6.1-3
- OCaml 4.11.0 pre-release attempt 2
* Fri Apr 17 2020 Richard W.M. Jones <rjones@redhat.com> - 6.1-2
- OCaml 4.11.0 pre-release
* Mon Apr 06 2020 Gwyn Ciesla <gwync@protonmail.com> - 6.1-1
- 6.1
* Thu Apr 02 2020 Richard W.M. Jones <rjones@redhat.com> - 6.0-14
- Update all OCaml dependencies for RPM 4.16.

View file

@ -1,2 +0,0 @@
#Type Name ID GECOS Home directory Shell
g brlapi -

View file

@ -1,5 +0,0 @@
summary: Run all smoke tests
discover:
how: fmf
execute:
how: tmt

View file

@ -1 +1 @@
SHA512 (brltty-6.8.tar.xz) = 08540cdf09eaa1caabd8400cb6e589f99f5f2b8aaaf8c031e5165e9b0605858e90dc9dd72f2095347f4860714214ecf184e3675422df880f1bf06bb4cc6f42ee
SHA512 (brltty-6.0.tar.xz) = 07344fa902ad169967ca39d19b09dfea24e698011031dd63dce3eb997a4cb86622ee9427b216976b3ef60e5cbabb710a621621447c6bfa2313748fc1a1cf4b06

View file

@ -1,2 +0,0 @@
summary: Smoke test
test: ./run_tests.sh

View file

@ -1,4 +0,0 @@
#!/bin/bash
pushd sanity-test || exit
./runtest.sh
popd || exit

17
tests/tests.yml Normal file
View file

@ -0,0 +1,17 @@
- hosts: localhost
tags:
- classic
- container
roles:
- role: standard-test-beakerlib
tests:
- sanity-test
required_packages:
- ImageMagick
- Xvfb
- brltty
- nc
- orca
- psmisc
- xorg-x11-utils