- updated to 6.0 (note: new libbrlapi soname)

- removed obsolete make patch
- adds liblouis and espeak_ng support

diff --git a/brltty.spec b/brltty.spec
index 0d990d8cd4327a6553e92b2abe44a2e67a0bea23..c0973f77d9c4485a0d323fac5a47f4e87b11b7e8 100644 (file)
--- a/brltty.spec
+++ b/brltty.spec
@@ -11,7 +11,9 @@
 %bcond_without x                       # X11-based utilities
 %bcond_without gpm                     # mouse tracking via GPM
 %bcond_without libbraille              # libbraille Braille driver
+%bcond_without liblouis                # liblouis in-line contracted Braille support
 %bcond_without espeak                  # eSpeak synthesizer driver
+%bcond_without espeak_ng               # eSpeak-NG synthesizer driver
 %bcond_without flite                   # Flite synthesizer driver
 %bcond_with    mikropuhe               # Mikropuhe synthesizer driver [commercial, Finnish]
 %bcond_without speech_dispatcher       # Speech Dispatcher synthesizer driver
@@ -21,17 +23,17 @@
 %bcond_with    at_spi                  # AtSpi screen driver
 %bcond_without at_spi2                 # AtSpi2 screen driver
 
-%define                brlapi_ver      0.6.6
+%define                brlapi_ver      0.7.0
 %include       /usr/lib/rpm/macros.java
 Summary:       Braille display driver for Linux/Unix
 Summary(pl.UTF-8):     Sterownik do wyświetlaczy Braille'a
 Name:          brltty
-Version:       5.5
-Release:       5
+Version:       6.0
+Release:       1
 License:       GPL v2+ (brltty and drivers), LGPL v2.1+ (APIs)
 Group:         Daemons
 Source0:       http://mielke.cc/brltty/archive/%{name}-%{version}.tar.xz
-# Source0-md5: cd2fb2158b9fc85b23c4225d1d067df6
+# Source0-md5: feca8c2f22b13a4c67b1366191033c0e
 Patch1:                %{name}-speech-dispatcher.patch
 Patch2:                %{name}-python.patch
 Patch3:                make.patch
@@ -42,25 +44,30 @@ BuildRequires:      alsa-lib-devel
 BuildRequires: autoconf >= 2.64
 BuildRequires: automake
 BuildRequires: bison
-BuildRequires: rpmbuild(macros) >= 1.710
 # just headers
 BuildRequires: bluez-libs-devel
 %{?with_at_spi2:BuildRequires: dbus-devel >= 1.0}
 %{?with_apidocs:BuildRequires: doxygen}
 %{?with_espeak:BuildRequires:  espeak-devel}
+%{?with_espeak_ng:BuildRequires:       espeak-ng-devel}
+BuildRequires: expat-devel
 %{?with_flite:BuildRequires:   flite-devel}
+BuildRequires: gettext-tools
 %{?with_gpm:BuildRequires:     gpm-devel}
 %{?with_java:BuildRequires:    jdk}
 %{?with_java:BuildRequires:    jpackage-utils}
 %{?with_libbraille:BuildRequires:      libbraille-devel}
 BuildRequires: libicu-devel
+%{?with_liblouis:BuildRequires:        liblouis-devel}
 BuildRequires: ncurses-devel
 %{?with_ocaml:BuildRequires:   ocaml}
 BuildRequires: pkgconfig
+BuildRequires: polkit-devel
 %{?with_python:BuildRequires:  python-Cython}
 %{?with_python3:BuildRequires: python3-Cython}
 %{?with_java:BuildRequires:    rpm-javaprov}
 %{?with_python:BuildRequires:  rpm-pythonprov}
+BuildRequires: rpmbuild(macros) >= 1.710
 %{?with_speech_dispatcher:BuildRequires:       speech-dispatcher-devel >= 0.8}
 BuildRequires: systemd-devel
 BuildRequires: tar >= 1:1.22
@@ -255,7 +262,7 @@ Biblioteka BrlAPI dla Tcl.
 %setup -q
 %patch1 -p1
 %patch2 -p1
-%patch3 -p1
+#patch3 -p1
 %patch4 -p1
 
 %build
@@ -266,11 +273,14 @@ CFLAGS="%{rpmcflags} -I/usr/include/ncurses"
        --with-install-root="$RPM_BUILD_ROOT" \
        %{!?with_libbraille:--without-libbraille} \
        %{!?with_espeak:--without-espeak} \
+       %{!?with_espeak_ng:--without-espeak_ng} \
        %{!?with_flite:--without-flite} \
        %{!?with_speech_dispatcher:--without-speechd} \
        %{!?with_ocaml:--disable-caml-bindings} \
        %{!?with_gpm:--disable-gpm} \
        %{!?with_java:--disable-java-bindings} \
+       %{!?with_liblouis:--disable-liblouis} \
+       --enable-lisp-bindings \
        %{!?with_python:--disable-python-bindings} \
        %{!?with_tcl:--disable-tcl-bindings} \
        %{!?with_x:--disable-x} \
@@ -293,7 +303,7 @@ cd ../..
 %install
 rm -rf $RPM_BUILD_ROOT
 
-%{__make} -j1 install \
+%{__make} -j1 install install-appstream \
        OCAML_INSTALL_TARGET=install-without-findlib
 
 # findlib-specific, useless in rpm
@@ -324,8 +334,9 @@ cat >$RPM_BUILD_ROOT%{systemdtmpfilesdir}/brltty.conf <<EOF
 d /var/run/brltty 0755 root root -
 EOF
 
-# no sign in source wheter it is zh_CN or zh_TW so just remove it
-%{__rm} -r $RPM_BUILD_ROOT%{_localedir}/zh
+# no sign in source wheter it is zh_CN or zh_TW
+# but seems to contain Traditional Chinese characters
+%{__mv} $RPM_BUILD_ROOT%{_localedir}/{zh,zh_TW}
 
 %find_lang %{name}
 
@@ -617,8 +628,12 @@ exit 0
 %attr(755,root,root) %{_bindir}/brltty
 %attr(755,root,root) %{_bindir}/brltty-atb
 %attr(755,root,root) %{_bindir}/brltty-config
+%attr(755,root,root) %{_bindir}/brltty-cldr
 %attr(755,root,root) %{_bindir}/brltty-ctb
 %attr(755,root,root) %{_bindir}/brltty-ktb
+%attr(755,root,root) %{_bindir}/brltty-lscmds
+%attr(755,root,root) %{_bindir}/brltty-lsinc
+%attr(755,root,root) %{_bindir}/brltty-morse
 %attr(755,root,root) %{_bindir}/brltty-trtxt
 %attr(755,root,root) %{_bindir}/brltty-ttb
 %attr(755,root,root) %{_bindir}/brltty-tune
@@ -645,6 +660,7 @@ exit 0
 %attr(755,root,root) %{_libdir}/brltty/libbrlttybhm.so
 %attr(755,root,root) %{_libdir}/brltty/libbrlttybht.so
 %attr(755,root,root) %{_libdir}/brltty/libbrlttybhw.so
+%attr(755,root,root) %{_libdir}/brltty/libbrlttybic.so
 %attr(755,root,root) %{_libdir}/brltty/libbrlttybir.so
 %{?with_libbraille:%attr(755,root,root) %{_libdir}/brltty/libbrlttyblb.so}
 %attr(755,root,root) %{_libdir}/brltty/libbrlttyblt.so
@@ -669,6 +685,7 @@ exit 0
 %attr(755,root,root) %{_libdir}/brltty/libbrlttysal.so
 %attr(755,root,root) %{_libdir}/brltty/libbrlttysbl.so
 %attr(755,root,root) %{_libdir}/brltty/libbrlttyscb.so
+%{?with_espeak_ng:%attr(755,root,root) %{_libdir}/brltty/libbrlttysen.so}
 %{?with_espeak:%attr(755,root,root) %{_libdir}/brltty/libbrlttyses.so}
 %{?with_flite:%attr(755,root,root) %{_libdir}/brltty/libbrlttysfl.so}
 %attr(755,root,root) %{_libdir}/brltty/libbrlttysfv.so
@@ -705,7 +722,7 @@ exit 0
 %files -n brlapi
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libbrlapi.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libbrlapi.so.0.6
+%attr(755,root,root) %ghost %{_libdir}/libbrlapi.so.0.7
 
 %files -n brlapi-devel
 %defattr(644,root,root,755)

diff --git a/make.patch b/make.patch
deleted file mode 100644 (file)
index c8e1f79..0000000
--- a/make.patch
+++ /dev/null
@@ -1,119 +0,0 @@
---- brltty-5.4/Programs/Makefile.in~   2016-06-24 05:41:56.000000000 +0200
-+++ brltty-5.4/Programs/Makefile.in    2017-03-12 15:13:12.796662034 +0100
-@@ -458,7 +458,7 @@
- BRLTTY_TTB_OBJECTS = brltty-ttb.$O $(PROGRAM_OBJECTS) dataarea.$O $(TTB_OBJECTS) ttb_gnome.$O ttb_louis.$O
- 
- brltty-ttb$X: $(BRLTTY_TTB_OBJECTS) $(BUILD_API)
--      $(CC) $(LDFLAGS) -o $@ $(BRLTTY_TTB_OBJECTS) $(API_REF) $(CURSES_LIBS) $(LDLIBS)
-+      $(CC) $(LDFLAGS) -o $@ $(BRLTTY_TTB_OBJECTS) $(API_REF) $(CURSES_LIBS) $(LDLIBS) $(SERVICE_LIBS)
- 
- brltty-ttb.$O:
-       $(CC) $(CFLAGS) $(ICU_INCLUDES) -c $(SRC_DIR)/brltty-ttb.c
-@@ -484,7 +484,7 @@
- BRLTTY_ATB_OBJECTS = brltty-atb.$O $(PROGRAM_OBJECTS) $(ATB_OBJECTS) dataarea.$O
- 
- brltty-atb$X: $(BRLTTY_ATB_OBJECTS)
--      $(CC) $(LDFLAGS) -o $@ $(BRLTTY_ATB_OBJECTS) $(LDLIBS)
-+      $(CC) $(LDFLAGS) -o $@ $(BRLTTY_ATB_OBJECTS) $(LDLIBS) $(SERVICE_LIBS)
- 
- brltty-atb.$O:
-       $(CC) $(CFLAGS) -c $(SRC_DIR)/brltty-atb.c
-@@ -507,7 +507,7 @@
- BRLTTY_CTB_OBJECTS = brltty-ctb.$O $(PROGRAM_OBJECTS) $(PREFS_OBJECTS) dataarea.$O $(TTB_OBJECTS) ctb_compile.$O ctb_translate.$O
- 
- brltty-ctb$X: $(BRLTTY_CTB_OBJECTS)
--      $(CC) $(LDFLAGS) -o $@ $(BRLTTY_CTB_OBJECTS) $(LDLIBS)
-+      $(CC) $(LDFLAGS) -o $@ $(BRLTTY_CTB_OBJECTS) $(LDLIBS) $(SERVICE_LIBS)
- 
- brltty-ctb.$O:
-       $(CC) $(CFLAGS) -c $(SRC_DIR)/brltty-ctb.c
-@@ -545,7 +545,7 @@
- BRLTTY_KTB_OBJECTS = brltty-ktb.$O $(PROGRAM_OBJECTS) $(KTB_OBJECTS) ktb_audit.$O ktb_keyboard.$O $(TTB_OBJECTS) dataarea.$O drivers.$O driver.$O brl_utils.$O brl_driver.$O brl_base.$O $(BRAILLE_DRIVER_OBJECTS) $(IO_OBJECTS) $(PREFS_OBJECTS) cmd.$O cmd_queue.$O hidkeys.$O report.$O cmd_brlapi.$O
- 
- brltty-ktb$X: $(BRLTTY_KTB_OBJECTS) $(BRAILLE_DRIVERS)
--      $(CC) $(LDFLAGS) -o $@ $(BRLTTY_KTB_OBJECTS) $(BRAILLE_DRIVER_LIBRARIES) $(USB_LIBS) $(BLUETOOTH_LIBS) $(LDLIBS)
-+      $(CC) $(LDFLAGS) -o $@ $(BRLTTY_KTB_OBJECTS) $(BRAILLE_DRIVER_LIBRARIES) $(USB_LIBS) $(BLUETOOTH_LIBS) $(LDLIBS) $(SERVICE_LIBS)
- 
- brltty-ktb.$O:
-       $(CC) $(CFLAGS) -c $(SRC_DIR)/brltty-ktb.c
-@@ -740,7 +740,7 @@
- BRLTTY_LIBRARIES = $(BRAILLE_DRIVER_LIBRARIES) $(SPEECH_DRIVER_LIBRARIES) $(SCREEN_DRIVER_LIBRARIES) $(PCM_LIBS) $(MIDI_LIBS) $(USB_LIBS) $(BLUETOOTH_LIBS) $(LDLIBS)
- 
- brltty$X: $(BRLTTY_OBJECTS)
--      $(CC) $(LDFLAGS) -o $@ $(BRLTTY_OBJECTS) $(BRLTTY_LIBRARIES)
-+      $(CC) $(LDFLAGS) -o $@ $(BRLTTY_OBJECTS) $(BRLTTY_LIBRARIES) $(SERVICE_LIBS)
- 
- brltty.$O:
-       $(CC) $(CFLAGS) -c $(SRC_DIR)/brltty.c
-@@ -778,7 +778,7 @@
- BRLTTY_TRTXT_OBJECTS = brltty-trtxt.$O $(PROGRAM_OBJECTS) $(TTB_OBJECTS) dataarea.$O
- 
- brltty-trtxt$X: $(BRLTTY_TRTXT_OBJECTS)
--      $(CC) $(LDFLAGS) -o $@ $(BRLTTY_TRTXT_OBJECTS) $(LDLIBS)
-+      $(CC) $(LDFLAGS) -o $@ $(BRLTTY_TRTXT_OBJECTS) $(LDLIBS) $(SERVICE_LIBS)
- 
- brltty-trtxt.$O:
-       $(CC) $(CFLAGS) -c $(SRC_DIR)/brltty-trtxt.c
-@@ -788,7 +788,7 @@
- BRLTEST_OBJECTS = brltest.$O $(PROGRAM_OBJECTS) report.$O $(TTB_OBJECTS) $(KTB_OBJECTS) dataarea.$O cmd.$O cmd_queue.$O drivers.$O driver.$O $(BRAILLE_OBJECTS) $(PREFS_OBJECTS) hidkeys.$O learn.$O
- 
- brltest$X: $(BRLTEST_OBJECTS)
--      $(CC) $(LDFLAGS) -o $@ $(BRLTEST_OBJECTS) $(BRAILLE_DRIVER_LIBRARIES) $(USB_LIBS) $(BLUETOOTH_LIBS) $(LDLIBS)
-+      $(CC) $(LDFLAGS) -o $@ $(BRLTEST_OBJECTS) $(BRAILLE_DRIVER_LIBRARIES) $(USB_LIBS) $(BLUETOOTH_LIBS) $(LDLIBS) $(SERVICE_LIBS)
- 
- brltest.$O:
-       $(CC) $(CFLAGS) -c $(SRC_DIR)/brltest.c
-@@ -798,7 +798,7 @@
- SPKTEST_OBJECTS = spktest.$O $(PROGRAM_OBJECTS) drivers.$O driver.$O $(SPEECH_OBJECTS) $(PREFS_OBJECTS)
- 
- spktest$X: $(SPKTEST_OBJECTS)
--      $(CC) $(LDFLAGS) -o $@ $(SPKTEST_OBJECTS) $(SPEECH_DRIVER_LIBRARIES) $(LDLIBS)
-+      $(CC) $(LDFLAGS) -o $@ $(SPKTEST_OBJECTS) $(SPEECH_DRIVER_LIBRARIES) $(LDLIBS) $(SERVICE_LIBS)
- 
- spktest.$O:
-       $(CC) $(CFLAGS) -c $(SRC_DIR)/spktest.c
-@@ -808,7 +808,7 @@
- SCRTEST_OBJECTS = scrtest.$O $(PROGRAM_OBJECTS) drivers.$O driver.$O $(SCREEN_OBJECTS) report.$O
- 
- scrtest$X: $(SCRTEST_OBJECTS)
--      $(CC) $(LDFLAGS) -o $@ $(SCRTEST_OBJECTS) $(SCREEN_DRIVER_LIBRARIES) $(LDLIBS)
-+      $(CC) $(LDFLAGS) -o $@ $(SCRTEST_OBJECTS) $(SCREEN_DRIVER_LIBRARIES) $(LDLIBS) $(SERVICE_LIBS)
- 
- scrtest.$O:
-       $(CC) $(CFLAGS) -c $(SRC_DIR)/scrtest.c
-@@ -818,7 +818,7 @@
- BRLTTY_TUNE_OBJECTS = brltty-tune.$O tune_utils.$O tune_build.$O $(PROGRAM_OBJECTS) $(PREFS_OBJECTS) $(TUNE_OBJECTS) io_misc.$O
- 
- brltty-tune$X: $(BRLTTY_TUNE_OBJECTS)
--      $(CC) $(LDFLAGS) -o $@ $(BRLTTY_TUNE_OBJECTS) $(PCM_LIBS) $(MIDI_LIBS) $(LDLIBS)
-+      $(CC) $(LDFLAGS) -o $@ $(BRLTTY_TUNE_OBJECTS) $(PCM_LIBS) $(MIDI_LIBS) $(LDLIBS) $(SERVICE_LIBS)
- 
- brltty-tune.$O:
-       $(CC) $(CFLAGS) -c $(SRC_DIR)/brltty-tune.c
-@@ -834,7 +834,7 @@
- APITEST_OBJECTS = apitest.$O $(PROGRAM_OBJECTS) cmd.$O cmd_brlapi.$O $(TTB_OBJECTS) dataarea.$O
- 
- apitest$X: $(APITEST_OBJECTS) api
--      $(CC) $(LDFLAGS) -o $@ $(APITEST_OBJECTS) $(API_LIBS) $(LDLIBS)
-+      $(CC) $(LDFLAGS) -o $@ $(APITEST_OBJECTS) $(API_LIBS) $(LDLIBS) $(SERVICE_LIBS)
- 
- apitest.$O:
-       $(CC) $(CFLAGS) -c $(SRC_DIR)/apitest.c
-@@ -887,7 +887,7 @@
- XBRLAPI_OBJECTS = xbrlapi.$O $(PROGRAM_OBJECTS)
- 
- xbrlapi$X: $(XBRLAPI_OBJECTS) api
--      $(CC) $(LDFLAGS) -o $@ $(XBRLAPI_OBJECTS) $(API_LIBS) $(XKB_LIBS) $(X11_LIBS) $(LDLIBS)
-+      $(CC) $(LDFLAGS) -o $@ $(XBRLAPI_OBJECTS) $(API_LIBS) $(XKB_LIBS) $(X11_LIBS) $(LDLIBS) $(SERVICE_LIBS)
- 
- xbrlapi.$O:
-       $(CC) $(CFLAGS) $(XSV_INCLUDES) -c $(SRC_DIR)/xbrlapi.c
-@@ -898,7 +898,7 @@
- TBL2HEX_OBJECTS = $(TBL2HEX_OBJECTS_FOR_BUILD:.$(O_FOR_BUILD)=.$B)
- 
- tbl2hex$(X_FOR_BUILD): $(TBL2HEX_OBJECTS)
--      $(CC_FOR_BUILD) $(LDFLAGS_FOR_BUILD) -o $@ $(TBL2HEX_OBJECTS) $(LDLIBS_FOR_BUILD)
-+      $(CC_FOR_BUILD) $(LDFLAGS_FOR_BUILD) -o $@ $(TBL2HEX_OBJECTS) $(LDLIBS_FOR_BUILD) $(SERVICE_LIBS)
- 
- ###############################################################################
-