update code

This commit is contained in:
zhuchunyi 2019-11-06 19:03:39 +08:00
parent 35eb3a1c52
commit d9f091cc28

View File

@ -3,10 +3,12 @@
%{!?tcl_version: %global tcl_version %(echo 'puts $tcl_version' | tclsh)} %{!?tcl_version: %global tcl_version %(echo 'puts $tcl_version' | tclsh)}
%{!?tcl_sitearch: %global tcl_sitearch %{_prefix}/%{_lib}/tcl%{tcl_version}} %{!?tcl_sitearch: %global tcl_sitearch %{_prefix}/%{_lib}/tcl%{tcl_version}}
%bcond_with espeak
%bcond_with speech
Name: brltty Name: brltty
Version: 5.6 Version: 5.6
Release: 29 Release: 30
Summary: Braille display driver for Linux/Unix Summary: Braille display driver for Linux/Unix
License: LGPLv2+ License: LGPLv2+
URL: http://brltty.app/ URL: http://brltty.app/
@ -16,15 +18,30 @@ Source1: brltty.service
#patch0~2 from fedora #patch0~2 from fedora
Patch0: brltty-loadLibrary.patch Patch0: brltty-loadLibrary.patch
%if %{with speech}
Patch1: brltty-5.0-libspeechd.patch Patch1: brltty-5.0-libspeechd.patch
%endif
%if %{with espeak}
Patch2: 0001-Add-support-for-eSpeak-NG.patch Patch2: 0001-Add-support-for-eSpeak-NG.patch
%endif
#patch3~4 from upstream #patch3~4 from upstream
Patch3: brltty-5.6-libs-add-ldflags.patch Patch3: brltty-5.6-libs-add-ldflags.patch
Patch4: brltty-5.6-libs-add-ldflags2.patch Patch4: brltty-5.6-libs-add-ldflags2.patch
BuildRequires: byacc glibc-kernheaders bluez-libs-devel systemd gettext at-spi2-core-devel alsa-lib-devel BuildRequires: byacc glibc-kernheaders bluez-libs-devel systemd gettext
BuildRequires: python3-devel autoconf espeak-ng-devel speech-dispatcher-devel BuildRequires: python3-devel autoconf at-spi2-core-devel alsa-lib-devel
%if %{with espeak}
BuildRequires: espeak-ng-devel
%endif
%if %{with speech}
BuildRequires: speech-dispatcher-devel
%endif
Requires(pre): glibc-common, shadow-utils Requires(pre): glibc-common, shadow-utils
@ -36,8 +53,9 @@ Requires(postun): systemd
Provides: brlapi Provides: brlapi
Obsoletes: brlapi Obsoletes: brlapi
%if %{without espeak}
Obsoletes: brltty-espeak <= 5.6-5 Obsoletes: brltty-espeak <= 5.6-5
%endif
%description %description
BRLTTY is a background process (daemon) which provides BRLTTY is a background process (daemon) which provides
@ -125,8 +143,12 @@ PYTHONS=
./autogen ./autogen
%configure --disable-relocatable-install --with-install-root="${RPM_BUILD_ROOT}" --disable-stripping --without-curses \ %configure --disable-relocatable-install --with-install-root="${RPM_BUILD_ROOT}" --disable-stripping --without-curses \
--without-espeak JAVA_JAR_DIR=%{_jnidir} JAVA_JNI_DIR=%{_libdir}/brltty JAVA_JNI=yes \ JAVA_JAR_DIR=%{_jnidir} JAVA_JNI_DIR=%{_libdir}/brltty JAVA_JNI=yes \
CYTHON=%{_bindir}/cython PYTHON=%{__python3} CYTHON=%{_bindir}/cython PYTHON=%{__python3} \
%if %{without espeak}
--without-espeak
%endif
%make_build %make_build
@ -254,6 +276,12 @@ fi
%changelog %changelog
* Wed Oct 30 2019 caomeng <caomeng5@huawei.com> - 5.6-30
- Type:NA
- ID:NA
- SUG:NA
- DESC:add bcondwith espeak and speech
* Wed Sep 18 2019 openEuler Buildteam <buildteam@openeuler.org> - 5.6-29 * Wed Sep 18 2019 openEuler Buildteam <buildteam@openeuler.org> - 5.6-29
- Type:bugfix - Type:bugfix
- Id:NA - Id:NA