X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=brltty.spec;h=3ff0c182e9a9ccac921fe6ff2c213ee339e0185a;hb=b6429e31ffe141bdf1cc2e53ca2b38c5460ea337;hp=1b4fe3b8a938a065742c93a6c2a6d8936a498b33;hpb=421def5a5aab21ff37698d80d342abb79823d08e;p=packages%2Fbrltty.git diff --git a/brltty.spec b/brltty.spec index 1b4fe3b..3ff0c18 100644 --- a/brltty.spec +++ b/brltty.spec @@ -18,30 +18,30 @@ %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.5 %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 -Group: Daemons +Version: 5.4 +Release: 6 License: GPL v2+ (brltty and drivers), LGPL v2.1+ (APIs) +Group: Daemons Source0: http://mielke.cc/brltty/archive/%{name}-%{version}.tar.xz -# Source0-md5: 938769dd1c3c3baf0d6dfafeb11581ec -Patch0: %{name}-java.patch +# Source0-md5: cfedd365e6237d762ad8c35b4f6fb361 Patch1: %{name}-speech-dispatcher.patch Patch2: %{name}-python.patch +Patch3: make.patch URL: http://mielke.cc/brltty/ BuildRequires: alsa-lib-devel %{?with_at_spi:BuildRequires: at-spi-devel} -BuildRequires: autoconf >= 2.62 +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} @@ -61,6 +61,7 @@ BuildRequires: pkgconfig %{?with_java:BuildRequires: rpm-javaprov} %{?with_python:BuildRequires: rpm-pythonprov} %{?with_speech_dispatcher:BuildRequires: speech-dispatcher-devel >= 0.8} +BuildRequires: systemd-devel BuildRequires: tar >= 1:1.22 %{?with_tcl:BuildRequires: tcl-devel >= 8.5} %if %{with x} @@ -70,11 +71,11 @@ BuildRequires: xorg-lib-libXext-devel BuildRequires: xorg-lib-libXt-devel BuildRequires: xorg-lib-libXtst-devel %endif -BuildRequires: xz #%{?with_mikropuhe:BuildRequires: Mikropuhe-devel (-lmikropuhe )} #%{?with_swift:BuildRequires: Swift-devel (-lswift )} #%{?with_theta:BuildRequires: Theta-devel (-ltheta )} #%{?with_viavoice:BuildRequires: ViaVoice-devel (-libmeci50 )} +BuildRequires: xz BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description @@ -157,14 +158,17 @@ Ten pakiet zawiera statyczną wersję biblioteki BrlAPI. Summary: BrlAPI documentation Summary(pl.UTF-8): Documentacja BrlAPI Group: Documentation +%if "%{_rpmversion}" >= "5" +BuildArch: noarch +%endif %description -n brlapi-apidocs -Documentation for BrlAPI in HTML format generated from brltty -sources by doxygen. +Documentation for BrlAPI in HTML format generated from brltty sources +by doxygen. %description -n brlapi-apidocs -l pl.UTF-8 -Dokumentacja BrlAPI w formacie HTML generowane ze -źrodeł brltty przez doxygen. +Dokumentacja BrlAPI w formacie HTML generowane ze źrodeł brltty przez +doxygen. %package -n java-brlapi Summary: BrlAPI library for Java @@ -248,9 +252,9 @@ Biblioteka BrlAPI dla Tcl. %prep %setup -q -%patch0 -p1 %patch1 -p1 %patch2 -p1 +%patch3 -p1 %build %{__autoconf} @@ -272,20 +276,17 @@ CFLAGS="%{rpmcflags} -I/usr/include/ncurses" %{__make} -j1 -%if %{with python3} +%if %{with python} cd Bindings/Python -%{__python3} setup.py build \ - -b build-3 +%py_build cd ../.. %endif -directory="doc" -mkdir -p "$directory" -for file in `find . \( -path "./$directory" -o -path ./Documents \) -prune -o \( -name 'README*' -o -name '*.txt' -o -name '*.html' -o -name '*.sgml' -o \( -path "./Bootdisks/*" -type f -perm +ugo=x \) \) -print` -do - mkdir -p "$directory/${file%/*}" - cp -rp "$file" "$directory/$file" -done +%if %{with python3} +cd Bindings/Python +%py3_build +cd ../.. +%endif %install rm -rf $RPM_BUILD_ROOT @@ -293,15 +294,18 @@ 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 python} +cd Bindings/Python +%py_install +cd ../.. +%endif + %if %{with python3} cd Bindings/Python -%{__python3} setup.py \ - build \ - -b build-3 \ - install \ - --optimize=2 \ - --skip-build \ - --root=$RPM_BUILD_ROOT +%py3_install cd ../.. %endif @@ -608,13 +612,14 @@ 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} %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-ctb -%attr(755,root,root) %{_bindir}/brltty-install +%attr(755,root,root) %{_bindir}/brltty-ktb %attr(755,root,root) %{_bindir}/brltty-trtxt %attr(755,root,root) %{_bindir}/brltty-ttb +%attr(755,root,root) %{_bindir}/brltty-tune %attr(755,root,root) %{_bindir}/eutp %attr(755,root,root) %{_bindir}/vstp %{?with_x:%attr(755,root,root) %{_bindir}/xbrlapi} @@ -625,6 +630,7 @@ exit 0 %attr(755,root,root) %{_libdir}/brltty/libbrlttybba.so %attr(755,root,root) %{_libdir}/brltty/libbrlttybbc.so %attr(755,root,root) %{_libdir}/brltty/libbrlttybbd.so +%attr(755,root,root) %{_libdir}/brltty/libbrlttybbg.so %attr(755,root,root) %{_libdir}/brltty/libbrlttybbl.so %attr(755,root,root) %{_libdir}/brltty/libbrlttybbm.so %attr(755,root,root) %{_libdir}/brltty/libbrlttybbn.so @@ -633,6 +639,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 @@ -677,7 +684,7 @@ exit 0 %attr(755,root,root) %{_libdir}/brltty/libbrlttyxsc.so %{_sysconfdir}/brltty %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/brltty.conf -/usr/lib/tmpfiles.d/brltty.conf +%{systemdtmpfilesdir}/brltty.conf %dir /var/lib/BrlAPI %dir /var/run/brltty %{_mandir}/man1/brltty.1* @@ -724,7 +731,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)