BR: rpmbuild(macros) >= 1.710

[packages/brltty.git] / brltty.spec

diff --git a/brltty.spec b/brltty.spec
index 1b4fe3b8a938a065742c93a6c2a6d8936a498b33..2d1a8bf89b79af4c6241b350d5f5c0e2e49310ac 100644 (file)
--- a/brltty.spec
+++ b/brltty.spec
@@ -18,25 +18,26 @@
 %bcond_with    swift                   # Swift synthesizer driver [commercial, from Cepstral]
 %bcond_with    theta                   # Theta synthesizer driver [commercial, from Cepstral]
 %bcond_with    viavoice                # IBM ViaVoice synthesizer driver [commercial]
-%bcond_without at_spi                  # AtSpi screen driver
+%bcond_with    at_spi                  # AtSpi screen driver
 %bcond_without at_spi2                 # AtSpi2 screen driver
 #
-%define                brlapi_ver      0.6.2
+%define                brlapi_ver      0.6.3
 #
 %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.1
-Release:       5
+Version:       5.2
+Release:       8
 Group:         Daemons
 License:       GPL v2+ (brltty and drivers), LGPL v2.1+ (APIs)
 Source0:       http://mielke.cc/brltty/archive/%{name}-%{version}.tar.xz
-# Source0-md5: 938769dd1c3c3baf0d6dfafeb11581ec
+# Source0-md5: b484343461b5a45f95fedfb21d1ceca3
 Patch0:                %{name}-java.patch
 Patch1:                %{name}-speech-dispatcher.patch
 Patch2:                %{name}-python.patch
 URL:           http://mielke.cc/brltty/
+BuildRequires: rpmbuild(macros) >= 1.710
 BuildRequires: alsa-lib-devel
 %{?with_at_spi:BuildRequires:  at-spi-devel}
 BuildRequires: autoconf >= 2.62
@@ -274,7 +275,7 @@ CFLAGS="%{rpmcflags} -I/usr/include/ncurses"
 
 %if %{with python3}
 cd Bindings/Python
-%{__python3} setup.py build \
+%py3_build \
        -b build-3
 cd ../..
 %endif
@@ -293,6 +294,9 @@ rm -rf $RPM_BUILD_ROOT
 %{__make} -j1 install \
        OCAML_INSTALL_TARGET=install-without-findlib
 
+# findlib-specific, useless in rpm
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/ocaml/stublibs/dllbrlapi_stubs.so.owner
+
 %if %{with python3}
 cd Bindings/Python
 %{__python3} setup.py \
@@ -608,11 +612,10 @@ exit 0
 %files -f %{name}.lang
 %defattr(644,root,root,755)
 %doc Documents/{Manual-BRLTTY/English/BRLTTY*,ChangeLog,HISTORY,TODO}
-%doc doc/{Bindings,Bootdisks,Drivers,Patches,Tables,README,nsistrings.txt}
+%doc doc/{Bindings,Bootdisks,Drivers,Patches,Tables,README}
 %attr(755,root,root) %{_bindir}/brltty
 %attr(755,root,root) %{_bindir}/brltty-config
 %attr(755,root,root) %{_bindir}/brltty-ctb
-%attr(755,root,root) %{_bindir}/brltty-install
 %attr(755,root,root) %{_bindir}/brltty-trtxt
 %attr(755,root,root) %{_bindir}/brltty-ttb
 %attr(755,root,root) %{_bindir}/eutp
@@ -633,6 +636,7 @@ exit 0
 %attr(755,root,root) %{_libdir}/brltty/libbrlttybec.so
 %attr(755,root,root) %{_libdir}/brltty/libbrlttybeu.so
 %attr(755,root,root) %{_libdir}/brltty/libbrlttybfs.so
+%attr(755,root,root) %{_libdir}/brltty/libbrlttybhd.so
 %attr(755,root,root) %{_libdir}/brltty/libbrlttybhm.so
 %attr(755,root,root) %{_libdir}/brltty/libbrlttybht.so
 %attr(755,root,root) %{_libdir}/brltty/libbrlttybhw.so
@@ -724,7 +728,6 @@ exit 0
 %files -n ocaml-brlapi
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/ocaml/stublibs/dllbrlapi_stubs.so
-%{_libdir}/ocaml/stublibs/dllbrlapi_stubs.so.owner
 
 %files -n ocaml-brlapi-devel
 %defattr(644,root,root,755)