From 6785babd67ad9a3fbf6671a0335e7eb3d5c831cb Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Tue, 12 May 2020 10:27:26 -0500 Subject: [PATCH 1/4] Revert "OCaml 4.11.0+dev2-2020-04-22 rebuild" This reverts commit 5d7a90b4f835ae4650bc73834cc5987ca0a4f932. --- brltty.spec | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/brltty.spec b/brltty.spec index 940c5e9..86cc013 100644 --- a/brltty.spec +++ b/brltty.spec @@ -33,7 +33,7 @@ Name: brltty Version: %{pkg_version} -Release: 4%{?dist} +Release: 3%{?dist} License: LGPLv2+ URL: http://brltty.app/ Source0: http://brltty.app/archive/%{name}-%{version}.tar.xz @@ -526,9 +526,6 @@ fi %config(noreplace) %verify(not size md5 mtime) %{_sysconfdir}/brltty/Initramfs/cmdline %changelog -* Mon May 04 2020 Richard W.M. Jones - 6.1-4 -- OCaml 4.11.0+dev2-2020-04-22 rebuild - * Tue Apr 21 2020 Richard W.M. Jones - 6.1-3 - OCaml 4.11.0 pre-release attempt 2 From a4d64ed5bfd7a20f16a45b41ade5dbc3cdff94b0 Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Tue, 12 May 2020 10:27:39 -0500 Subject: [PATCH 2/4] Revert "OCaml 4.11.0 pre-release attempt 2" This reverts commit 087cf5365cc93e3fddf5a2047fbbb941d27f9e5a. --- brltty.spec | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/brltty.spec b/brltty.spec index 86cc013..ce16427 100644 --- a/brltty.spec +++ b/brltty.spec @@ -33,7 +33,7 @@ Name: brltty Version: %{pkg_version} -Release: 3%{?dist} +Release: 2%{?dist} License: LGPLv2+ URL: http://brltty.app/ Source0: http://brltty.app/archive/%{name}-%{version}.tar.xz @@ -526,9 +526,6 @@ fi %config(noreplace) %verify(not size md5 mtime) %{_sysconfdir}/brltty/Initramfs/cmdline %changelog -* Tue Apr 21 2020 Richard W.M. Jones - 6.1-3 -- OCaml 4.11.0 pre-release attempt 2 - * Fri Apr 17 2020 Richard W.M. Jones - 6.1-2 - OCaml 4.11.0 pre-release From 5c62bb10121ba7ca74ddf4d9ef05f051ee3e8c29 Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Tue, 12 May 2020 10:27:50 -0500 Subject: [PATCH 3/4] Revert "OCaml 4.11.0 pre-release" This reverts commit 3b8b97863a3b81962c7e0c8c35f6b8b8882fff2b. --- brltty.spec | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/brltty.spec b/brltty.spec index ce16427..623b71d 100644 --- a/brltty.spec +++ b/brltty.spec @@ -33,7 +33,7 @@ Name: brltty Version: %{pkg_version} -Release: 2%{?dist} +Release: 1%{?dist} License: LGPLv2+ URL: http://brltty.app/ Source0: http://brltty.app/archive/%{name}-%{version}.tar.xz @@ -526,9 +526,6 @@ fi %config(noreplace) %verify(not size md5 mtime) %{_sysconfdir}/brltty/Initramfs/cmdline %changelog -* Fri Apr 17 2020 Richard W.M. Jones - 6.1-2 -- OCaml 4.11.0 pre-release - * Mon Apr 06 2020 Gwyn Ciesla - 6.1-1 - 6.1 From 404867c08ddedaa53868b2cac17e085e099e1643 Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Tue, 12 May 2020 10:28:14 -0500 Subject: [PATCH 4/4] Revert "6.1" This reverts commit 0ffa6042f86e755cc1a0c5329a8b72be61355d7d. --- .gitignore | 1 - brltty-6.0-alsa-1.1.9-fix.patch | 26 ++++++++++++++++++++++++++ brltty.spec | 15 +++++++-------- sources | 2 +- 4 files changed, 34 insertions(+), 10 deletions(-) create mode 100644 brltty-6.0-alsa-1.1.9-fix.patch diff --git a/.gitignore b/.gitignore index 4ceffe7..e88afbe 100644 --- a/.gitignore +++ b/.gitignore @@ -10,4 +10,3 @@ brltty-4.2.tar.gz /brltty-5.5.tar.xz /brltty-5.6.tar.xz /brltty-6.0.tar.xz -/brltty-6.1.tar.xz diff --git a/brltty-6.0-alsa-1.1.9-fix.patch b/brltty-6.0-alsa-1.1.9-fix.patch new file mode 100644 index 0000000..ae61d9d --- /dev/null +++ b/brltty-6.0-alsa-1.1.9-fix.patch @@ -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 ++#include + + #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 ++#include + + #include "log.h" + #include "timing.h" diff --git a/brltty.spec b/brltty.spec index 623b71d..76c527c 100644 --- a/brltty.spec +++ b/brltty.spec @@ -1,5 +1,5 @@ -%define pkg_version 6.1 -%define api_version 0.8.0 +%define pkg_version 6.0 +%define api_version 0.7.0 %if 0%{?rhel} && 0%{?rhel} <= 7 # disable python3 by default @@ -33,7 +33,7 @@ Name: brltty Version: %{pkg_version} -Release: 1%{?dist} +Release: 14%{?dist} License: LGPLv2+ URL: http://brltty.app/ Source0: http://brltty.app/archive/%{name}-%{version}.tar.xz @@ -41,6 +41,7 @@ Source1: brltty.service Patch1: brltty-6.0-loadLibrary.patch # libspeechd.h moved in latest speech-dispatch (NOT sent upstream) 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, glibc-kernheaders, bluez-libs-devel, systemd BuildRequires: gettext, at-spi2-core-devel, alsa-lib-devel @@ -49,7 +50,7 @@ BuildRequires: espeak-devel %endif BuildRequires: espeak-ng-devel BuildRequires: /usr/bin/2to3 -BuildRequires: autoconf automake +BuildRequires: autoconf Requires: brlapi%{?_isa} = %{api_version}-%{release} # work around a bug in the install process: @@ -229,6 +230,7 @@ mv %{name}-%{version} python2 pushd python2 %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 @@ -443,7 +445,7 @@ fi %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 @@ -526,9 +528,6 @@ fi %config(noreplace) %verify(not size md5 mtime) %{_sysconfdir}/brltty/Initramfs/cmdline %changelog -* Mon Apr 06 2020 Gwyn Ciesla - 6.1-1 -- 6.1 - * Thu Apr 02 2020 Richard W.M. Jones - 6.0-14 - Update all OCaml dependencies for RPM 4.16. diff --git a/sources b/sources index eddbcfc..e67aba5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (brltty-6.1.tar.xz) = 030ef60ef7a9a60dc2fba2a64ea0a0868395eee6f2f86876b4e4111e804a05b44f798a154a69a8f5e0f6358130993c360a550f7decac0535450f9cf939231eaf +SHA512 (brltty-6.0.tar.xz) = 07344fa902ad169967ca39d19b09dfea24e698011031dd63dce3eb997a4cb86622ee9427b216976b3ef60e5cbabb710a621621447c6bfa2313748fc1a1cf4b06