[brltty] New version

[Jaroslav Škarvada]

commit eb7213d786c4fc082957c6eac771344bb650140f
Author: Jaroslav Škarvada <jskarvad at redhat.com>
Date:   Thu Feb 20 11:19:36 2014 +0100

    New version
    
      Resolves: rhbz#1067337
    - Dropped man-fix patch (upstreamed)
    - De-fuzzified libspeechd patch
    - Handled locales
    - Switched to xz compressed sources

 .gitignore                  |    1 +
 brltty-4.5-libspeechd.patch |   11 -
 brltty-4.5-man-fix.patch    |  642 -------------------------------------------
 brltty-5.0-libspeechd.patch |   13 +
 brltty.spec                 |   31 ++-
 sources                     |    2 +-
 6 files changed, 37 insertions(+), 663 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index bb6c82c..bd839ba 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 brltty-4.2.tar.gz
 /brltty-4.3.tar.gz
 /brltty-4.5.tar.gz
+/brltty-5.0.tar.xz
diff --git a/brltty-5.0-libspeechd.patch b/brltty-5.0-libspeechd.patch
new file mode 100644
index 0000000..06909e0
--- /dev/null
+++ b/brltty-5.0-libspeechd.patch
@@ -0,0 +1,13 @@
+diff --git a/Drivers/Speech/SpeechDispatcher/speech.c b/Drivers/Speech/SpeechDispatcher/speech.c
+index d73250a..df92708 100644
+--- a/Drivers/Speech/SpeechDispatcher/speech.c
++++ b/Drivers/Speech/SpeechDispatcher/speech.c
+@@ -34,7 +34,7 @@ typedef enum {
+ 
+ #include "spk_driver.h"
+ 
+-#include <libspeechd.h>
++#include <speech-dispatcher/libspeechd.h>
+ 
+ static SPDConnection *connectionHandle = NULL;
+ static const char *moduleName;
diff --git a/brltty.spec b/brltty.spec
index c2fda03..f251b74 100644
--- a/brltty.spec
+++ b/brltty.spec
@@ -1,5 +1,5 @@
-%define pkg_version 4.5
-%define api_version 0.6.0
+%define pkg_version 5.0
+%define api_version 0.6.1
 
 %global with_python3 1
 
@@ -19,17 +19,15 @@
 
 Name: brltty
 Version: %{pkg_version}
-Release: 10%{?dist}
+Release: 1%{?dist}
 License: GPLv2+
 Group: System Environment/Daemons
 URL: http://mielke.cc/brltty/
-Source0: http://mielke.cc/brltty/releases/%{name}-%{version}.tar.gz
+Source0: http://mielke.cc/brltty/releases/%{name}-%{version}.tar.xz
 Source1: brltty.service
-# patch sent upstream
-Patch3: brltty-4.5-man-fix.patch
 Patch4: brltty-loadLibrary.patch
 # libspeechd.h moved in latest speech-dispatch (NOT sent upstream)
-Patch5: brltty-4.5-libspeechd.patch
+Patch5: brltty-5.0-libspeechd.patch
 Summary: Braille display driver for Linux/Unix
 BuildRequires: byacc glibc-kernheaders bluez-libs-devel
 BuildRequires: systemd
@@ -184,7 +182,6 @@ This package provides the OCaml binding for BrlAPI.
 
 %prep
 %setup -q
-%patch3 -p1 -b .man-fix
 %patch4 -p1 -b .loadLibrary
 %patch5 -p1
 
@@ -290,6 +287,12 @@ rm -rf $RPM_BUILD_ROOT/%{_libdir}/libbrlapi.a
 # ghost brlapi.key
 touch ${RPM_BUILD_ROOT}%{_sysconfdir}/brlapi.key
 
+# disable xbrlapi gdm autostart, there is already orca
+rm -f ${RPM_BUILD_ROOT}%{_datadir}/gdm/greeter/autostart/xbrlapi.desktop
+
+# handle locales
+%find_lang %{name}
+
 %post
 %systemd_post brltty.service
 
@@ -312,7 +315,7 @@ fi
 
 %postun -n brlapi -p /sbin/ldconfig
 
-%files
+%files -f %{name}.lang
 %config(noreplace) %{_sysconfdir}/brltty.conf
 %{_sysconfdir}/brltty/
 %{_unitdir}/brltty.service
@@ -349,6 +352,7 @@ fi
 
 %files -n brlapi
 %{_bindir}/vstp
+%{_bindir}/eutp
 %{_bindir}/xbrlapi
 %{_libdir}/brltty/libbrlttybba.so
 %{_libdir}/libbrlapi.so.*
@@ -357,6 +361,7 @@ fi
 %doc Documents/Manual-BrlAPI/
 %doc %{_mandir}/man1/xbrlapi.*
 %doc %{_mandir}/man1/vstp.*
+%doc %{_mandir}/man1/eutp.*
 
 %files -n brlapi-devel
 %{_libdir}/libbrlapi.so
@@ -389,6 +394,14 @@ fi
 %endif
 
 %changelog
+* Thu Feb 20 2014 Jaroslav Škarvada <jskarvad at redhat.com> - 5.0-1
+- New version
+  Resolves: rhbz#1067337
+- Dropped man-fix patch (upstreamed)
+- De-fuzzified libspeechd patch
+- Handled locales
+- Switched to xz compressed sources
+
 * Thu Feb 13 2014 Jon Ciesla <limburgher at gmail.com> - 4.5-10
 - libicu rebuild.
 - Add python-setuptools BR.
diff --git a/sources b/sources
index 3678a86..679ad12 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-7b52fa7746fed41ed344a1f75ce55951  brltty-4.5.tar.gz
+44c71a973424658557b931f703017481  brltty-5.0.tar.xz