diff --git a/brltty-4.0-udev.patch b/brltty-4.0-udev.patch deleted file mode 100644 index 529fd39..0000000 --- a/brltty-4.0-udev.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Nru brltty-4.0.orig/Hotplug/udev.rules brltty-4.0/Hotplug/udev.rules ---- brltty-4.0.orig/Hotplug/udev.rules 2009-05-15 05:59:36.000000000 +0200 -+++ brltty-4.0/Hotplug/udev.rules 2009-09-16 22:11:46.151921537 +0200 -@@ -93,7 +93,7 @@ - - LABEL="brltty_add" - SYMLINK+="brltty/$env{BRLTTY_DRIVER}-$env{BRLTTY_DEVICE}" --RUN+="/bin/brltty -E -P$env{BRLTTY_PID_FILE}" -+RUN+="/usr/bin/brltty -E -P$env{BRLTTY_PID_FILE}" - GOTO="brltty_end" - - LABEL="brltty_remove" diff --git a/brltty-5.1-udev.patch b/brltty-5.1-udev.patch new file mode 100644 index 0000000..4b28012 --- /dev/null +++ b/brltty-5.1-udev.patch @@ -0,0 +1,11 @@ +--- brltty-5.1/Autostart/Udev/udev.rules.orig 2014-10-09 11:42:04.640051441 +0200 ++++ brltty-5.1/Autostart/Udev/udev.rules 2014-10-09 11:42:23.536055482 +0200 +@@ -329,7 +329,7 @@ + + LABEL="brltty_add" + SYMLINK+="brltty/$env{BRLTTY_BRAILLE_DRIVER}-$env{BRLTTY_BRAILLE_DEVICE}" +-RUN+="/bin/brltty -E -P$env{BRLTTY_PID_FILE}" ++RUN+="/usr/bin/brltty -E -P$env{BRLTTY_PID_FILE}" + GOTO="brltty_end" + + LABEL="brltty_remove" diff --git a/brltty.spec b/brltty.spec index d9634a7..bd60113 100644 --- a/brltty.spec +++ b/brltty.spec @@ -1,5 +1,5 @@ Name: brltty -Version: 4.5 +Version: 5.1 Release: 1mamba Summary: A background process which provides access to the Linux/Unix console for a blind person Group: Applications/Accessibility @@ -7,8 +7,9 @@ Vendor: openmamba Distribution: openmamba Packager: Silvan Calarco URL: http://mielke.cc/brltty/ -Source: http://mielke.cc/brltty/releases/brltty-%{version}.tar.gz -Patch0: %{name}-4.0-udev.patch +Source: http://mielke.cc/brltty/archive/brltty-%{version}.tar.xz +#Source: http://mielke.cc/brltty/releases/brltty-%{version}.tar.gz +Patch0: %{name}-5.1-udev.patch License: GPL ## AUTOBUILDREQ-BEGIN BuildRequires: glibc-devel @@ -26,7 +27,7 @@ BuildRequires: libXtst-devel ## AUTOBUILDREQ-END BuildRequires: java_cup BuildRequires: ocaml -BuildRequires: libtk85-devel +BuildRequires: libtk-devel Requires(pre): %{_bindir}/mcookie Requires: java_cup BuildRoot: %{_tmppath}/%{name}-%{version}-root @@ -34,6 +35,14 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-root %description BRLTTY is a background process (daemon) which provides access to the Linux/Unix console (when in text mode) for a blind person using a refreshable braille display. It drives the braille display, and provides complete screen review functionality. Some speech capability has also been incorporated. +%package devel +Group: Development/Libraries +Summary: Development files for %{name} +Requires: %{name} = %{?epoch:%epoch:}%{version}-%{release} + +%description devel +This package contains libraries and header files for developing applications that use %{name}. + %prep %setup -q %patch0 -p1 @@ -47,23 +56,25 @@ BRLTTY is a background process (daemon) which provides access to the Linux/Unix [ "%{buildroot}" != / ] && rm -rf "%{buildroot}" %makeinstall INSTALL_ROOT=%{buildroot} install -D Documents/brltty.conf %{buildroot}%{_sysconfdir}/brltty/brltty.conf -install -D Hotplug/udev.rules %{buildroot}%{_sysconfdir}/udev/rules.d/90-brltty.rules +install -D Autostart/Udev/udev.rules %{buildroot}/lib/udev/rules.d/90-brltty.rules rm -f %{buildroot}%{_bindir}/brltty-install +%find_lang %{name} + %clean [ "%{buildroot}" != / ] && rm -rf "%{buildroot}" %post +/sbin/ldconfig [ -e /etc/brlapi.key ] || mcookie > /etc/brlapi.key exit 0 -%files +%files -f %{name}.lang %defattr(-,root,root) %dir %{_sysconfdir}/brltty %{_sysconfdir}/brltty/brl*.kti %{_sysconfdir}/brltty/kbd-*.kti -%{_sysconfdir}/udev/rules.d/90-brltty.rules %config(noreplace) %{_sysconfdir}/brltty/brltty.conf #%config(noreplace) %{_sysconfdir}/brltty/brltty-pm.conf %{_sysconfdir}/brltty/*.atb @@ -74,37 +85,50 @@ exit 0 %{_sysconfdir}/brltty/*.tti %{_sysconfdir}/brltty/*.txt %{_bindir}/brltty -%{_bindir}/brltty-config %{_bindir}/brltty-ctb %{_bindir}/brltty-trtxt %{_bindir}/brltty-ttb +%{_bindir}/eutp %{_bindir}/vstp %{_bindir}/xbrlapi +/lib/udev/rules.d/90-brltty.rules +%{_libdir}/brltty/libbrltty*.so +%{_libdir}/libbrlapi.so.* +%dir %{_libdir}/brlapi-* +%{_libdir}/brlapi-*/libbrlapi_tcl.so +%{_libdir}/brlapi-*/pkgIndex.tcl +%dir %{_libdir}/ocaml/brlapi +%{_libdir}/ocaml/brlapi/brlapi.* +%{_libdir}/ocaml/brlapi/libbrlapi_stubs.a +%{_libdir}/ocaml/brlapi/META +%{_libdir}/ocaml/brlapi/dllbrlapi_stubs.so +%{_datadir}/gdm/greeter/autostart/xbrlapi.desktop +%{python_sitearch}/Brlapi-*.egg-info +%{python_sitearch}/brlapi.so +%{_mandir}/man1/brltty.1* +%{_mandir}/man1/eutp.1* +%{_mandir}/man1/vstp.1* +%{_mandir}/man1/xbrlapi.1* + +%files devel +%defattr(-,root,root) +%{_bindir}/brltty-config %{_includedir}/brlapi.h %{_includedir}/brlapi_constants.h %{_includedir}/brlapi_keycodes.h %{_includedir}/brlapi_protocol.h %dir %{_includedir}/brltty %{_includedir}/brltty/*.h -%{_libdir}/brltty/libbrltty*.so -%{_libdir}/libbrlapi.so.* +%{_includedir}/brlapi_brldefs.h %{_libdir}/libbrlapi.so %{_libdir}/libbrlapi.a -%{_libdir}/brlapi-*/libbrlapi_tcl.so -%{_libdir}/brlapi-*/pkgIndex.tcl -%{_libdir}/ocaml/brlapi/brlapi.* -%{_libdir}/ocaml/brlapi/libbrlapi_stubs.a -%{_libdir}/ocaml/brlapi/META -%{_libdir}/ocaml/brlapi/dllbrlapi_stubs.so -%{python_sitearch}/Brlapi-*.egg-info -%{python_sitearch}/brlapi.so -%{_mandir}/man1/brltty.1.gz -%{_mandir}/man1/vstp.1.gz -%{_mandir}/man1/xbrlapi.1.gz -%{_mandir}/man3/brlapi_*3.gz +%{_mandir}/man3/brlapi_*3* %doc README %changelog +* Thu Oct 02 2014 Silvan Calarco 5.1-1mamba +- update to 5.1 + * Mon Jun 17 2013 Automatic Build System 4.5-1mamba - automatic version update by autodist