- up to 5.5

diff --git a/brltty-speech-dispatcher.patch b/brltty-speech-dispatcher.patch
index 3b2f9494ad9e0b8ae05a3951cfe62192d0dac588..43958ce241578d7c41905e14df810b81a1f94b12 100644 (file)
--- a/brltty-speech-dispatcher.patch
+++ b/brltty-speech-dispatcher.patch
@@ -1,14 +1,16 @@
 --- brltty-4.5/configure.ac.orig       2013-03-27 23:54:58.000000000 +0100
 +++ brltty-4.5/configure.ac    2013-04-07 19:04:31.636980920 +0200
 @@ -1516,7 +1516,7 @@
-    BRLTTY_SPEECH_DRIVER([fv], [Festival])
-    BRLTTY_SPEECH_DRIVER([gs], [GenericSay])
-    BRLTTY_IF_PACKAGE([Mikropuhe], [mikropuhe], [mpwrfile.h], [BRLTTY_IF_PTHREADS([BRLTTY_SPEECH_DRIVER([mp], [Mikropuhe], [-L$(MPLINUX_ROOT) -lmplinux])])])
--   BRLTTY_IF_PACKAGE([speech-dispatcher], [speechd], [include/libspeechd.h], [BRLTTY_SPEECH_DRIVER([sd], [SpeechDispatcher], [-L$(SPEECHD_ROOT)/lib -lspeechd])])
-+   BRLTTY_IF_PACKAGE([speech-dispatcher], [speechd], [include/speech-dispatcher/libspeechd.h], [BRLTTY_SPEECH_DRIVER([sd], [SpeechDispatcher], [-lspeechd])])
-    BRLTTY_IF_PACKAGE([Swift], [swift], [include/swift.h], [BRLTTY_SPEECH_DRIVER([sw], [Swift], [-L$(SWIFT_ROOT)/lib -lswift -lm])])
-    BRLTTY_IF_PACKAGE([Theta], [theta], [include/theta.h], [BRLTTY_SPEECH_DRIVER([th], [Theta], [-L$(THETA_ROOT)/lib -ltheta])])
-    BRLTTY_IF_PACKAGE([ViaVoice], [viavoice], [include/eci.h], [BRLTTY_SPEECH_DRIVER([vv], [ViaVoice], [-L$(VIAVOICE_ROOT)/lib -libmeci50])])
+       ])
+    ])
+ 
+-   BRLTTY_IF_PACKAGE([speech-dispatcher], [speechd], [include/libspeechd.h], [dnl
++   BRLTTY_IF_PACKAGE([speech-dispatcher], [speechd], [include/speech-dispatcher/libspeechd.h], [dnl
+       BRLTTY_SPEECH_DRIVER([sd], [SpeechDispatcher])
+    ], [include], [lib], [speechd])
+ 
+    BRLTTY_IF_PACKAGE([Swift], [swift], [include/swift.h], [dnl
+       BRLTTY_SPEECH_DRIVER([sw], [Swift], [-L$(SWIFT_ROOT)/lib -lswift -lm])
 #--- brltty-4.5/Drivers/Speech/SpeechDispatcher/Makefile.in.orig       2013-03-27 23:51:36.000000000 +0100
 #+++ brltty-4.5/Drivers/Speech/SpeechDispatcher/Makefile.in    2013-04-07 19:41:55.110267490 +0200
 #@@ -25,5 +25,5 @@

diff --git a/brltty.spec b/brltty.spec
index 3ff0c182e9a9ccac921fe6ff2c213ee339e0185a..e2d3a707f7752ec8ba1f3d13129a19e93e9c9cc7 100644 (file)
--- a/brltty.spec
+++ b/brltty.spec
@@ -21,17 +21,17 @@
 %bcond_with    at_spi                  # AtSpi screen driver
 %bcond_without at_spi2                 # AtSpi2 screen driver
 
-%define                brlapi_ver      0.6.5
+%define                brlapi_ver      0.6.6
 %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.4
-Release:       6
+Version:       5.5
+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: cfedd365e6237d762ad8c35b4f6fb361
+# Source0-md5: cd2fb2158b9fc85b23c4225d1d067df6
 Patch1:                %{name}-speech-dispatcher.patch
 Patch2:                %{name}-python.patch
 Patch3:                make.patch
@@ -315,10 +315,10 @@ cd ../..
        %{__mv} $RPM_BUILD_ROOT%{_prefix}/{lib,%{_lib}}/java/libbrlapi_java.so
 %endif
 
-install Documents/brltty.conf $RPM_BUILD_ROOT%{_sysconfdir}
+cp -p Documents/brltty.conf $RPM_BUILD_ROOT%{_sysconfdir}
 
-install -d $RPM_BUILD_ROOT/usr/lib/tmpfiles.d
-cat >$RPM_BUILD_ROOT/usr/lib/tmpfiles.d/brltty.conf <<EOF
+install -d $RPM_BUILD_ROOT%{systemdtmpfilesdir}
+cat >$RPM_BUILD_ROOT%{systemdtmpfilesdir}/brltty.conf <<EOF
 d /var/run/brltty 0755 root root -
 EOF
 
@@ -695,7 +695,10 @@ exit 0
 %if %{with x}
 # gdm autostart - subpackage?
 #%{_datadir}/gdm/greeter/autostart/xbrlapi.desktop
+/etc/X11/Xsession.d/60xbrlapi
+%{_datadir}/metainfo/org.a11y.brltty.metainfo.xml
 %endif
+%{_datadir}/polkit-1/actions/org.a11y.brlapi.policy
 
 %files -n brlapi
 %defattr(644,root,root,755)

diff --git a/make.patch b/make.patch
index 60c7cc22eedc9b2857d8ebabf75aaea0b187222a..c8e1f79575e7e089b4dbc2e3e5ca08599b3dab43 100644 (file)
--- a/make.patch
+++ b/make.patch
@@ -1,14 +1,3 @@
---- brltty-5.4/config.mk.in~   2016-06-24 05:41:56.000000000 +0200
-+++ brltty-5.4/config.mk.in    2017-03-12 14:56:46.801064145 +0100
-@@ -235,7 +235,7 @@
- ASYNC_OBJECTS = async_handle.$O async_data.$O async_wait.$O async_alarm.$O async_task.$O async_io.$O async_event.$O async_signal.$O thread.$O
- BASE_OBJECTS = log.$O addresses.$O file.$O device.$O parse.$O variables.$O datafile.$O unicode.$O $(CHARSET_OBJECTS) timing.$O $(ASYNC_OBJECTS) queue.$O lock.$O $(DYNLD_OBJECTS) $(PORTS_OBJECTS) $(SYSTEM_OBJECTS)
- OPTIONS_OBJECTS = options.$O $(PARAMS_OBJECTS)
--PROGRAM_OBJECTS = program.$O $(PGMPATH_OBJECTS) $(SERVICE_OBJECTS) $(SERVICE_LIBS) pid.$O $(OPTIONS_OBJECTS) $(BASE_OBJECTS)
-+PROGRAM_OBJECTS = program.$O $(PGMPATH_OBJECTS) $(SERVICE_OBJECTS) pid.$O $(OPTIONS_OBJECTS) $(BASE_OBJECTS)
- 
- CC = @CC@
- CPPFLAGS = -I$(BLD_DIR) -I$(SRC_DIR) -I$(BLD_TOP:/=)/$(PGM_DIR) -I$(SRC_TOP:/=)/$(PGM_DIR) -I$(SRC_TOP:/=)/$(HDR_DIR) -I$(BLD_TOP:/=) -I$(SRC_TOP:/=) @CPPFLAGS@ @DEFS@
 --- brltty-5.4/Programs/Makefile.in~   2016-06-24 05:41:56.000000000 +0200
 +++ brltty-5.4/Programs/Makefile.in    2017-03-12 15:13:12.796662034 +0100
 @@ -458,7 +458,7 @@
@@ -114,8 +103,8 @@
  XBRLAPI_OBJECTS = xbrlapi.$O $(PROGRAM_OBJECTS)
  
  xbrlapi$X: $(XBRLAPI_OBJECTS) api
--      $(CC) $(LDFLAGS) -o $@ $(XBRLAPI_OBJECTS) $(API_LIBS) $(XKB_LIBS) $(XSV_LIBS) $(LDLIBS)
-+      $(CC) $(LDFLAGS) -o $@ $(XBRLAPI_OBJECTS) $(API_LIBS) $(XKB_LIBS) $(XSV_LIBS) $(LDLIBS) $(SERVICE_LIBS)
+-      $(CC) $(LDFLAGS) -o $@ $(XBRLAPI_OBJECTS) $(API_LIBS) $(XKB_LIBS) $(X11_LIBS) $(LDLIBS)
++      $(CC) $(LDFLAGS) -o $@ $(XBRLAPI_OBJECTS) $(API_LIBS) $(XKB_LIBS) $(X11_LIBS) $(LDLIBS) $(SERVICE_LIBS)
  
  xbrlapi.$O:
        $(CC) $(CFLAGS) $(XSV_INCLUDES) -c $(SRC_DIR)/xbrlapi.c