- updated to 5.3 (brlapi 0.6.4)

- removed obsolete java patch
- added format patch (fixes build with -Werror=format-security)

diff --git a/brltty-format.patch b/brltty-format.patch
new file mode 100644 (file)
index 0000000..4e69240
--- /dev/null
+++ b/brltty-format.patch
@@ -0,0 +1,11 @@
+--- brltty-5.3/Programs/brltty-ttb.c.orig      2015-12-09 18:35:12.000000000 +0100
++++ brltty-5.3/Programs/brltty-ttb.c   2016-01-19 22:09:10.415700563 +0100
+@@ -114,7 +114,7 @@
+             }
+ 
+             STR_END;
+-            logMessage(LOG_WARNING, buffer);
++            logMessage(LOG_WARNING, "%s", buffer);
+           }
+         }
+       }

diff --git a/brltty-java.patch b/brltty-java.patch
deleted file mode 100644 (file)
index ddf63ba..0000000
--- a/brltty-java.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- brltty-4.5/Bindings/Java/bindings.m4.orig  2013-03-27 23:51:37.000000000 +0100
-+++ brltty-4.5/Bindings/Java/bindings.m4       2013-04-07 18:39:56.903678323 +0200
-@@ -63,7 +63,7 @@
-    JAVA_JNI_INC="${JAVA_ROOT}/include"
-    JAVA_JNI_HDR="jni.h"
-    JAVA_JNI_FLAGS=""
--   AC_CHECK_HEADER([${JAVA_JNI_HDR}], [], [AC_CHECK_FILE(["${JAVA_JNI_INC}/${JAVA_JNI_HDR}"], [JAVA_JNI_FLAGS="-I${JAVA_JNI_INC}"], [JAVA_OK=false])])
-+   AC_CHECK_HEADER([${JAVA_JNI_HDR}], [], [AC_CHECK_FILE(["${JAVA_JNI_INC}/${JAVA_JNI_HDR}"], [JAVA_JNI_FLAGS="-I${JAVA_JNI_INC} -I${JAVA_JNI_INC}/linux"], [JAVA_OK=false])])
-    AC_SUBST([JAVA_JNI_HDR])
-    AC_SUBST([JAVA_JNI_INC])
-    AC_SUBST([JAVA_JNI_FLAGS])

diff --git a/brltty.spec b/brltty.spec
index 3e5f19877bece6375f7691b3e9b79457f6f46423..4a6d78bdb7e333089c3cd5b9eb9481286a5d4be2 100644 (file)
--- a/brltty.spec
+++ b/brltty.spec
@@ -21,24 +21,24 @@
 %bcond_with    at_spi                  # AtSpi screen driver
 %bcond_without at_spi2                 # AtSpi2 screen driver
 
-%define                brlapi_ver      0.6.3
+%define                brlapi_ver      0.6.4
 %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.2
-Release:       10
+Version:       5.3
+Release:       1
 License:       GPL v2+ (brltty and drivers), LGPL v2.1+ (APIs)
 Group:         Daemons
 Source0:       http://mielke.cc/brltty/archive/%{name}-%{version}.tar.xz
-# Source0-md5: b484343461b5a45f95fedfb21d1ceca3
-Patch0:                %{name}-java.patch
+# Source0-md5: 19fbcb1fefc42cea81f560de0a1f539f
+Patch0:                %{name}-format.patch
 Patch1:                %{name}-speech-dispatcher.patch
 Patch2:                %{name}-python.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
@@ -621,10 +621,13 @@ exit 0
 %doc Documents/{Manual-BRLTTY/English/BRLTTY*,ChangeLog,HISTORY,TODO}
 %doc doc/{Bindings,Bootdisks,Drivers,Patches,Tables,README}
 %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-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}
@@ -635,6 +638,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