Bjørn Lie
2d72c795f9
- Reinstate avahi-0.6.31-systemd-order.patch (boo#1194561). This can probably go away if/when gh#lathiat/avahi#118 is fixed. - Drop avahi-0.6.32-suppress-resolv-conf-warning.patch: we should no longer need this given the above patch. - Add several patches from git: 0001-man-fix-reference-to-avahi-autoipd.action-8-in-avahi.patch 0005-avahi-dnsconfd.service-Drop-Also-avahi-daemon.socket.patch 0006-man-add-missing-bshell.1-symlink.patch 0007-Ship-avahi-discover-1-bssh-1-and-bvnc-1-also-for-GTK.patch 0009-fix-bytestring-decoding-for-proper-display.patch 0010-avahi_dns_packet_consume_uint32-fix-potential-undefi.patch - Build manpages with xmltoman. Currently needed for bssh. - Minor spec file clean-up. - Require python-rpm-macros for all builds (boo#1194744 boo#1194745). OBS-URL: https://build.opensuse.org/request/show/947263 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/avahi?expand=0&rev=195
53 lines
1.0 KiB
Diff
53 lines
1.0 KiB
Diff
From 751be804e891aec5701a059144e2f5cbfc981b36 Mon Sep 17 00:00:00 2001
|
|
From: Andreas Henriksson <andreas@fatal.se>
|
|
Date: Thu, 24 Aug 2017 17:52:19 +0200
|
|
Subject: [PATCH 07/10] Ship avahi-discover(1), bssh(1) and bvnc(1) also for
|
|
GTK3
|
|
|
|
These manpages went missing when you disabled gtk2 builds....
|
|
---
|
|
man/Makefile.am | 9 +++++----
|
|
1 file changed, 5 insertions(+), 4 deletions(-)
|
|
|
|
diff --git a/man/Makefile.am b/man/Makefile.am
|
|
index 77a27bd..289b942 100644
|
|
--- a/man/Makefile.am
|
|
+++ b/man/Makefile.am
|
|
@@ -56,7 +56,7 @@ man_MANS += \
|
|
avahi-publish.1 \
|
|
avahi-set-host-name.1
|
|
|
|
-if HAVE_GTK
|
|
+if HAVE_GTK2OR3
|
|
man_MANS += \
|
|
bssh.1
|
|
endif
|
|
@@ -64,12 +64,13 @@ endif
|
|
if HAVE_PYTHON
|
|
man_MANS += \
|
|
avahi-bookmarks.1
|
|
-if HAVE_GTK
|
|
+endif
|
|
+
|
|
+if HAVE_PYGOBJECT
|
|
man_MANS += \
|
|
avahi-discover.1
|
|
endif
|
|
endif
|
|
-endif
|
|
|
|
if ENABLE_AUTOIPD
|
|
if HAVE_LIBDAEMON
|
|
@@ -134,7 +135,7 @@ EXTRA_DIST = \
|
|
if HAVE_DBUS
|
|
|
|
BSSH_LN =
|
|
-if HAVE_GTK
|
|
+if HAVE_GTK2OR3
|
|
if HAVE_GLIB
|
|
BSSH_LN += $(LN_S) bssh.1 bvnc.1 &&
|
|
BSSH_LN += $(LN_S) bssh.1 bshell.1 &&
|
|
--
|
|
2.34.1
|
|
|