- fix broken deps inside makefiles

- rel 4

diff --git a/brltty.spec b/brltty.spec
index d9245feb033e010b0950daa575abcbaa99c3898a..daa4c680a5e90bbc3cd8b129a51432fb0123738f 100644 (file)
--- a/brltty.spec
+++ b/brltty.spec
@@ -27,13 +27,14 @@ Summary:    Braille display driver for Linux/Unix
 Summary(pl.UTF-8):     Sterownik do wyświetlaczy Braille'a
 Name:          brltty
 Version:       5.4
-Release:       3
+Release:       4
 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
 Patch1:                %{name}-speech-dispatcher.patch
 Patch2:                %{name}-python.patch
+Patch3:                make.patch
 URL:           http://mielke.cc/brltty/
 BuildRequires: alsa-lib-devel
 %{?with_at_spi:BuildRequires:  at-spi-devel}
@@ -60,6 +61,7 @@ BuildRequires:        pkgconfig
 %{?with_java:BuildRequires:    rpm-javaprov}
 %{?with_python:BuildRequires:  rpm-pythonprov}
 %{?with_speech_dispatcher:BuildRequires:       speech-dispatcher-devel >= 0.8}
+BuildRequires: systemd-devel
 BuildRequires: tar >= 1:1.22
 %{?with_tcl:BuildRequires:     tcl-devel >= 8.5}
 %if %{with x}
@@ -252,6 +254,7 @@ Biblioteka BrlAPI dla Tcl.
 %setup -q
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 %build
 %{__autoconf}

diff --git a/make.patch b/make.patch
new file mode 100644 (file)
index 0000000..60c7cc2
--- /dev/null
+++ b/make.patch
@@ -0,0 +1,130 @@
+--- 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 @@
+ BRLTTY_TTB_OBJECTS = brltty-ttb.$O $(PROGRAM_OBJECTS) dataarea.$O $(TTB_OBJECTS) ttb_gnome.$O ttb_louis.$O
+ 
+ brltty-ttb$X: $(BRLTTY_TTB_OBJECTS) $(BUILD_API)
+-      $(CC) $(LDFLAGS) -o $@ $(BRLTTY_TTB_OBJECTS) $(API_REF) $(CURSES_LIBS) $(LDLIBS)
++      $(CC) $(LDFLAGS) -o $@ $(BRLTTY_TTB_OBJECTS) $(API_REF) $(CURSES_LIBS) $(LDLIBS) $(SERVICE_LIBS)
+ 
+ brltty-ttb.$O:
+       $(CC) $(CFLAGS) $(ICU_INCLUDES) -c $(SRC_DIR)/brltty-ttb.c
+@@ -484,7 +484,7 @@
+ BRLTTY_ATB_OBJECTS = brltty-atb.$O $(PROGRAM_OBJECTS) $(ATB_OBJECTS) dataarea.$O
+ 
+ brltty-atb$X: $(BRLTTY_ATB_OBJECTS)
+-      $(CC) $(LDFLAGS) -o $@ $(BRLTTY_ATB_OBJECTS) $(LDLIBS)
++      $(CC) $(LDFLAGS) -o $@ $(BRLTTY_ATB_OBJECTS) $(LDLIBS) $(SERVICE_LIBS)
+ 
+ brltty-atb.$O:
+       $(CC) $(CFLAGS) -c $(SRC_DIR)/brltty-atb.c
+@@ -507,7 +507,7 @@
+ BRLTTY_CTB_OBJECTS = brltty-ctb.$O $(PROGRAM_OBJECTS) $(PREFS_OBJECTS) dataarea.$O $(TTB_OBJECTS) ctb_compile.$O ctb_translate.$O
+ 
+ brltty-ctb$X: $(BRLTTY_CTB_OBJECTS)
+-      $(CC) $(LDFLAGS) -o $@ $(BRLTTY_CTB_OBJECTS) $(LDLIBS)
++      $(CC) $(LDFLAGS) -o $@ $(BRLTTY_CTB_OBJECTS) $(LDLIBS) $(SERVICE_LIBS)
+ 
+ brltty-ctb.$O:
+       $(CC) $(CFLAGS) -c $(SRC_DIR)/brltty-ctb.c
+@@ -545,7 +545,7 @@
+ BRLTTY_KTB_OBJECTS = brltty-ktb.$O $(PROGRAM_OBJECTS) $(KTB_OBJECTS) ktb_audit.$O ktb_keyboard.$O $(TTB_OBJECTS) dataarea.$O drivers.$O driver.$O brl_utils.$O brl_driver.$O brl_base.$O $(BRAILLE_DRIVER_OBJECTS) $(IO_OBJECTS) $(PREFS_OBJECTS) cmd.$O cmd_queue.$O hidkeys.$O report.$O cmd_brlapi.$O
+ 
+ brltty-ktb$X: $(BRLTTY_KTB_OBJECTS) $(BRAILLE_DRIVERS)
+-      $(CC) $(LDFLAGS) -o $@ $(BRLTTY_KTB_OBJECTS) $(BRAILLE_DRIVER_LIBRARIES) $(USB_LIBS) $(BLUETOOTH_LIBS) $(LDLIBS)
++      $(CC) $(LDFLAGS) -o $@ $(BRLTTY_KTB_OBJECTS) $(BRAILLE_DRIVER_LIBRARIES) $(USB_LIBS) $(BLUETOOTH_LIBS) $(LDLIBS) $(SERVICE_LIBS)
+ 
+ brltty-ktb.$O:
+       $(CC) $(CFLAGS) -c $(SRC_DIR)/brltty-ktb.c
+@@ -740,7 +740,7 @@
+ BRLTTY_LIBRARIES = $(BRAILLE_DRIVER_LIBRARIES) $(SPEECH_DRIVER_LIBRARIES) $(SCREEN_DRIVER_LIBRARIES) $(PCM_LIBS) $(MIDI_LIBS) $(USB_LIBS) $(BLUETOOTH_LIBS) $(LDLIBS)
+ 
+ brltty$X: $(BRLTTY_OBJECTS)
+-      $(CC) $(LDFLAGS) -o $@ $(BRLTTY_OBJECTS) $(BRLTTY_LIBRARIES)
++      $(CC) $(LDFLAGS) -o $@ $(BRLTTY_OBJECTS) $(BRLTTY_LIBRARIES) $(SERVICE_LIBS)
+ 
+ brltty.$O:
+       $(CC) $(CFLAGS) -c $(SRC_DIR)/brltty.c
+@@ -778,7 +778,7 @@
+ BRLTTY_TRTXT_OBJECTS = brltty-trtxt.$O $(PROGRAM_OBJECTS) $(TTB_OBJECTS) dataarea.$O
+ 
+ brltty-trtxt$X: $(BRLTTY_TRTXT_OBJECTS)
+-      $(CC) $(LDFLAGS) -o $@ $(BRLTTY_TRTXT_OBJECTS) $(LDLIBS)
++      $(CC) $(LDFLAGS) -o $@ $(BRLTTY_TRTXT_OBJECTS) $(LDLIBS) $(SERVICE_LIBS)
+ 
+ brltty-trtxt.$O:
+       $(CC) $(CFLAGS) -c $(SRC_DIR)/brltty-trtxt.c
+@@ -788,7 +788,7 @@
+ BRLTEST_OBJECTS = brltest.$O $(PROGRAM_OBJECTS) report.$O $(TTB_OBJECTS) $(KTB_OBJECTS) dataarea.$O cmd.$O cmd_queue.$O drivers.$O driver.$O $(BRAILLE_OBJECTS) $(PREFS_OBJECTS) hidkeys.$O learn.$O
+ 
+ brltest$X: $(BRLTEST_OBJECTS)
+-      $(CC) $(LDFLAGS) -o $@ $(BRLTEST_OBJECTS) $(BRAILLE_DRIVER_LIBRARIES) $(USB_LIBS) $(BLUETOOTH_LIBS) $(LDLIBS)
++      $(CC) $(LDFLAGS) -o $@ $(BRLTEST_OBJECTS) $(BRAILLE_DRIVER_LIBRARIES) $(USB_LIBS) $(BLUETOOTH_LIBS) $(LDLIBS) $(SERVICE_LIBS)
+ 
+ brltest.$O:
+       $(CC) $(CFLAGS) -c $(SRC_DIR)/brltest.c
+@@ -798,7 +798,7 @@
+ SPKTEST_OBJECTS = spktest.$O $(PROGRAM_OBJECTS) drivers.$O driver.$O $(SPEECH_OBJECTS) $(PREFS_OBJECTS)
+ 
+ spktest$X: $(SPKTEST_OBJECTS)
+-      $(CC) $(LDFLAGS) -o $@ $(SPKTEST_OBJECTS) $(SPEECH_DRIVER_LIBRARIES) $(LDLIBS)
++      $(CC) $(LDFLAGS) -o $@ $(SPKTEST_OBJECTS) $(SPEECH_DRIVER_LIBRARIES) $(LDLIBS) $(SERVICE_LIBS)
+ 
+ spktest.$O:
+       $(CC) $(CFLAGS) -c $(SRC_DIR)/spktest.c
+@@ -808,7 +808,7 @@
+ SCRTEST_OBJECTS = scrtest.$O $(PROGRAM_OBJECTS) drivers.$O driver.$O $(SCREEN_OBJECTS) report.$O
+ 
+ scrtest$X: $(SCRTEST_OBJECTS)
+-      $(CC) $(LDFLAGS) -o $@ $(SCRTEST_OBJECTS) $(SCREEN_DRIVER_LIBRARIES) $(LDLIBS)
++      $(CC) $(LDFLAGS) -o $@ $(SCRTEST_OBJECTS) $(SCREEN_DRIVER_LIBRARIES) $(LDLIBS) $(SERVICE_LIBS)
+ 
+ scrtest.$O:
+       $(CC) $(CFLAGS) -c $(SRC_DIR)/scrtest.c
+@@ -818,7 +818,7 @@
+ BRLTTY_TUNE_OBJECTS = brltty-tune.$O tune_utils.$O tune_build.$O $(PROGRAM_OBJECTS) $(PREFS_OBJECTS) $(TUNE_OBJECTS) io_misc.$O
+ 
+ brltty-tune$X: $(BRLTTY_TUNE_OBJECTS)
+-      $(CC) $(LDFLAGS) -o $@ $(BRLTTY_TUNE_OBJECTS) $(PCM_LIBS) $(MIDI_LIBS) $(LDLIBS)
++      $(CC) $(LDFLAGS) -o $@ $(BRLTTY_TUNE_OBJECTS) $(PCM_LIBS) $(MIDI_LIBS) $(LDLIBS) $(SERVICE_LIBS)
+ 
+ brltty-tune.$O:
+       $(CC) $(CFLAGS) -c $(SRC_DIR)/brltty-tune.c
+@@ -834,7 +834,7 @@
+ APITEST_OBJECTS = apitest.$O $(PROGRAM_OBJECTS) cmd.$O cmd_brlapi.$O $(TTB_OBJECTS) dataarea.$O
+ 
+ apitest$X: $(APITEST_OBJECTS) api
+-      $(CC) $(LDFLAGS) -o $@ $(APITEST_OBJECTS) $(API_LIBS) $(LDLIBS)
++      $(CC) $(LDFLAGS) -o $@ $(APITEST_OBJECTS) $(API_LIBS) $(LDLIBS) $(SERVICE_LIBS)
+ 
+ apitest.$O:
+       $(CC) $(CFLAGS) -c $(SRC_DIR)/apitest.c
+@@ -887,7 +887,7 @@
+ 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)
+ 
+ xbrlapi.$O:
+       $(CC) $(CFLAGS) $(XSV_INCLUDES) -c $(SRC_DIR)/xbrlapi.c
+@@ -898,7 +898,7 @@
+ TBL2HEX_OBJECTS = $(TBL2HEX_OBJECTS_FOR_BUILD:.$(O_FOR_BUILD)=.$B)
+ 
+ tbl2hex$(X_FOR_BUILD): $(TBL2HEX_OBJECTS)
+-      $(CC_FOR_BUILD) $(LDFLAGS_FOR_BUILD) -o $@ $(TBL2HEX_OBJECTS) $(LDLIBS_FOR_BUILD)
++      $(CC_FOR_BUILD) $(LDFLAGS_FOR_BUILD) -o $@ $(TBL2HEX_OBJECTS) $(LDLIBS_FOR_BUILD) $(SERVICE_LIBS)
+ 
+ ###############################################################################
+