[brltty: 2/2] Merge branch 'master' of ssh://pkgs.fedoraproject.org/brltty

[Jon Ciesla]

commit 81241b8a90f2f6d27b721ed82a9c849e53139f1f
Merge: f1f8f1e d49f04c
Author: Jon Ciesla <limburgher at gmail.com>
Date:   Mon May 13 09:41:55 2013 -0500

    Merge branch 'master' of ssh://pkgs.fedoraproject.org/brltty
    
    Conflicts:
    	brltty.spec

 brltty.spec |   62 +++++++++++++++++++++++++++++++++++-----------------------
 1 files changed, 37 insertions(+), 25 deletions(-)
---
diff --cc brltty.spec
index f11f44d,8989769..d461eef
--- a/brltty.spec
+++ b/brltty.spec
@@@ -1,8 -1,14 +1,14 @@@
  %define pkg_version 4.5
  %define api_version 0.6.0
  
+ %global with_python3 1
+ 
+ %if 0%{?rhel}
+ %global with_python3 0
+ %endif
+ 
 -%{!?tcl_version: %define tcl_version %(echo 'puts $tcl_version' | tclsh)}
 -%{!?tcl_sitearch: %define tcl_sitearch %{_prefix}/%{_lib}/tcl%{tcl_version}}
 +%{!?tcl_version: %global tcl_version %(echo 'puts $tcl_version' | tclsh)}
- %{!?tcl_sitearch: %global tcl_sitearch %{_libdir}/tcl%{tcl_version}}
++%{!?tcl_sitearch: %global tcl_sitearch %{_prefix}/%{_lib}/tcl%{tcl_version}}
  
  # with speech dispatcher iff on Fedora:
  %define with_speech_dispatcher 0%{?fedora}
@@@ -49,6 -50,6 +55,15 @@@ Requires: %{name} = %{pkg_version}-%{re
  This package provides the Speech Dispatcher driver for BRLTTY.
  %endif
  
++%package docs
++Summary: Documentation for BRLTTY
++Group: System Environment/Daemons
++License: GPLv2+
++Requires: %{name} = %{pkg_version}-%{release}
++BuildArch: noarch
++%description docs
++This package provides the documentation for BRLTTY.
++
  %package xw
  Summary: XWindow driver for BRLTTY
  Group: System Environment/Daemons
@@@ -247,33 -254,25 +270,13 @@@ mv Documents/BrlAPIref/{html,BrlAPIref
  rm -rf $RPM_BUILD_ROOT/%{_libdir}/libbrlapi.a
  
  %post
 -devices="/dev/vcsa /dev/vcsa0 /dev/vcc/a"
 -install=true
 -for device in ${devices}
 -do
 -   if [ -c "${device}" ]
 -   then
 -      install=false
 -      break
 -   fi
 -done
 -if $install
 -then
 -   device="$(set -- ${devices} && echo "${1}")"
 -   mkdir -p "${device%/*}"
 -   mknod -m o= "${device}" c 7 128
 -   chmod 660 "${device}"
 -   chown root.tty "${device}"
 -fi
 -exit 0
 +%systemd_post brltty.service
- devices="/dev/vcsa /dev/vcsa0 /dev/vcc/a"
- install=true
- for device in ${devices}
- do
-    if [ -c "${device}" ]
-    then
-       install=false
-       break
-    fi
- done
- if $install
- then
-    device="$(set -- ${devices} && echo "${1}")"
-    mkdir -p "${device%/*}"
-    mknod -m o= "${device}" c 7 128
-    chmod 660 "${device}"
-    chown root.tty "${device}"
- fi
- exit 0
- 
 +
 +%preun
 +%systemd_preun brltty.service
 +
 +%postun
 +%systemd_postun_with_restart brltty.service
  
  %post   -n brlapi -p /sbin/ldconfig
  %postun -n brlapi -p /sbin/ldconfig
@@@ -293,9 -291,9 +296,6 @@@
  %endif
  %exclude %{_libdir}/brltty/libbrlttyxas.so
  %doc LICENSE-GPL LICENSE-LGPL
--%doc Documents/ChangeLog Documents/TODO
--%doc Documents/Manual-BRLTTY/
--%doc doc/*
  %doc %{_mandir}/man[15]/brltty.*
  
  %if %{with_speech_dispatcher}
@@@ -304,6 -302,6 +304,11 @@@
  %{_libdir}/brltty/libbrlttyssd.so
  %endif
  
++%files docs
++%doc Documents/ChangeLog Documents/TODO
++%doc Documents/Manual-BRLTTY/
++%doc doc/*
++
  %files xw
  %doc Drivers/Braille/XWindow/README
  %{_libdir}/brltty/libbrlttybxw.so
@@@ -350,8 -350,8 +357,13 @@@
  %endif
  
  %changelog
- * Tue Apr 30 2013 Jon Ciesla <limburgher at gmail.com> - 4.5-5
++* Fri May 10 2013 Jon Ciesla <limburgher at gmail.com> - 4.5-5
 +- Add systemd unit file, BZ 916628.
++- Drop spurious post scripts.
++- Move eveything but man pages and license files top -docs.
++
+ * Thu May  9 2013 Jaroslav Škarvada <jskarvad at redhat.com> - 4.5-4
+ - Conditionally build python3
  
  * Tue Apr 30 2013 Jon Ciesla <limburgher at gmail.com> - 4.5-3
  - Add bluetooth support, BZ 916628.