Merge remote-tracking branch 'origin/f22' into f21

brltty-5.2-man-fix.patch

@@ -0,0 +1,13 @@
+diff --git a/Documents/brltty.1.in b/Documents/brltty.1.in
+index 7ed1db0..6dc0851 100644
+--- a/Documents/brltty.1.in
++++ b/Documents/brltty.1.in
+@@ -16,7 +16,7 @@
+ .\"
+ .\" This software is maintained by Dave Mielke <dave@mielke.cc>.
+ .\"
+-3TH "BRLTTY" "1" "2014-11-06" "brltty 5.2" "BRLTTY User's Manual"
++.TH "BRLTTY" "1" "2014-11-06" "brltty 5.2" "BRLTTY User's Manual"
+ .SH NAME
+ brltty \- refreshable braille display driver for Linux/Unix
+ .SH SYNOPSIS

brltty.spec

@@ -17,7 +17,7 @@
 
 Name: brltty
 Version: %{pkg_version}
-Release: 1%{?dist}
+Release: 3%{?dist}
 License: GPLv2+
 Group: System Environment/Daemons
 URL: http://mielke.cc/brltty/
@@ -26,6 +26,7 @@ Source1: brltty.service
 Patch4: brltty-loadLibrary.patch
 # libspeechd.h moved in latest speech-dispatch (NOT sent upstream)
 Patch5: brltty-5.0-libspeechd.patch
+Patch6: brltty-5.2-man-fix.patch
 Summary: Braille display driver for Linux/Unix
 BuildRequires: byacc glibc-kernheaders bluez-libs-devel
 BuildRequires: systemd gettext
@@ -182,6 +183,7 @@ This package provides the OCaml binding for BrlAPI.
 %setup -q
 %patch4 -p1 -b .loadLibrary
 %patch5 -p1
+%patch6 -p1 -b .man-fix
 
 %if 0%{?with_python3}
 # Make a copy of the source tree for building the Python 3 module
@@ -392,6 +394,13 @@ fi
 %endif
 
 %changelog
+* Mon May 25 2015 Jaroslav Škarvada <jskarvad@redhat.com> - 5.2-3
+- Fixed manual page
+  Resolves: rhbz#1224661
+
+* Mon Jan 26 2015 David Tardon <dtardon@redhat.com> - 5.2-2
+- rebuild for ICU 54.1
+
 * Wed Nov 12 2014 Jon Ciesla <limburgher@gmail.com> - 5.2-1
 - 5.2, BZ 1163112.