22557112 avahi should migrate from pygtk2 to pygobject3
authorJiri Sasek <Jiri.Sasek@Oracle.COM>
Thu, 21 Jan 2016 07:53:27 -0800
changeset 5334 30ec36f36c89
parent 5333 37b6c3cf767d
child 5335 5761566a80a8
22557112 avahi should migrate from pygtk2 to pygobject3
components/avahi/Makefile
components/avahi/avahi.p5m
components/avahi/patches/08-man-page.patch
--- a/components/avahi/Makefile	Tue Jan 19 04:31:39 2016 -0800
+++ b/components/avahi/Makefile	Thu Jan 21 07:53:27 2016 -0800
@@ -56,6 +56,7 @@
 CONFIGURE_OPTIONS	+=	--localstatedir=/var/avahi
 CONFIGURE_OPTIONS	+=	--with-distro=none
 CONFIGURE_OPTIONS	+=	--disable-gtk3
+CONFIGURE_OPTIONS	+=	--disable-pygtk
 CONFIGURE_OPTIONS	+=	--disable-qt3
 CONFIGURE_OPTIONS	+=	--disable-qt4
 CONFIGURE_OPTIONS	+=	--disable-mono
--- a/components/avahi/avahi.p5m	Tue Jan 19 04:31:39 2016 -0800
+++ b/components/avahi/avahi.p5m	Thu Jan 21 07:53:27 2016 -0800
@@ -34,8 +34,6 @@
 # pkglint has a problem to find the appropriate modules when python executable has no .py
 <transform file path=usr/bin/avahi-bookmarks -> default pkg.depend.bypass-generate .*>
 <transform file path=usr/bin/avahi-bookmarks -> default pkg.linted.userland.action001.3 true>
-<transform file path=usr/bin/avahi-discover -> default pkg.depend.bypass-generate .*>
-<transform file path=usr/bin/avahi-discover -> default pkg.linted.userland.action001.3 true>
 
 # package attribs
 set name=pkg.fmri \
@@ -77,9 +75,8 @@
 link path=usr/bin/avahi-browse-domains target=avahi-browse
 # LSARC/2007/464/ -> rename avahi-daemon to avahi-daemon-bridge-dsd
 #file path=usr/bin/avahi-daemon
-file path=usr/bin/avahi-discover
 # not delivered by Desktop
-#file path=usr/bin/avahi-discover-standalone
+file path=usr/bin/avahi-discover-standalone
 # not delivered by Desktop
 #file path=usr/bin/avahi-dnsconfd
 file path=usr/bin/avahi-publish
@@ -188,8 +185,6 @@
 file path=usr/lib/python2.7/vendor-packages/64/avahi/ServiceTypeDatabase.pyc
 file path=usr/lib/python2.7/vendor-packages/64/avahi/__init__.py
 file path=usr/lib/python2.7/vendor-packages/64/avahi/__init__.pyc
-file path=usr/lib/python2.7/vendor-packages/64/avahi_discover/__init__.py
-file path=usr/lib/python2.7/vendor-packages/64/avahi_discover/__init__.pyc
 #
 
 # LSARC/2007/464/ -> rename avahi-daemon to avahi-daemon-bridge-dsd
@@ -197,7 +192,6 @@
 #
 
 #
-file path=usr/share/applications/avahi-discover.desktop
 file path=usr/share/applications/bssh.desktop
 file path=usr/share/applications/bvnc.desktop
 #
@@ -259,7 +253,6 @@
 file man/avahi-browse.1 path=usr/share/man/man1/avahi-browse.1
 file man/avahi-daemon-bridge-dsd.1 \
     path=usr/share/man/man1/avahi-daemon-bridge-dsd.1
-file man/avahi-discover.1 path=usr/share/man/man1/avahi-discover.1
 link path=usr/share/man/man1/avahi-publish-address.1 target=avahi-publish.1
 link path=usr/share/man/man1/avahi-publish-service.1 target=avahi-publish.1
 file man/avahi-publish.1 path=usr/share/man/man1/avahi-publish.1
--- a/components/avahi/patches/08-man-page.patch	Tue Jan 19 04:31:39 2016 -0800
+++ b/components/avahi/patches/08-man-page.patch	Thu Jan 21 07:53:27 2016 -0800
@@ -207,23 +207,6 @@
 +\fBavahi-publish(1)\f1, \fBavahi-resolve(1)\f1
  .SH COMMENTS
  This man page was written using \fBxml2man(1)\f1 by Oliver Kurth.
---- /usr/tmp/clean/avahi-0.6.19/man/avahi-discover.1	Wed May  9 15:45:43 2007
-+++ avahi-0.6.19/man/avahi-discover.1	Wed Jun 13 15:42:13 2007
[email protected]@ -5,12 +5,10 @@
- \fBavahi-discover
- \f1
- .SH DESCRIPTION
--Show a real-time graphical browse list for mDNS/DNS-SD network services running on the local LAN using the Avahi daemon.
-+Show a real-time graphical browse list for mDNS/DNS-SD network services running on the local LAN using the Avahi daemon. The daemon is not the standard Avahi daemon but a proxy to a Bonjour daemon.
- .SH OPTIONS
- avahi-discover takes no command line arguments at the moment.
--.SH AUTHORS
--The Avahi Developers <avahi (at) lists (dot) freedesktop (dot) org>; Avahi is available from \fBhttp://avahi.org/\f1
- .SH SEE ALSO
--\fBavahi-daemon(8)\f1, \fBavahi-browse(1)\f1
-+\fBavahi-browse(1)\f1
- .SH COMMENTS
- This man page was written using \fBxml2man(1)\f1 by Oliver Kurth.
 --- /usr/tmp/clean/avahi-0.6.19/man/avahi-publish.1	Wed May  9 15:45:43 2007
 +++ avahi-0.6.19/man/avahi-publish.1	Wed Jun 13 15:44:27 2007
 @@ -11,7 +11,7 @@