diff --git a/avahi-0.6.32.tar.gz b/avahi-0.6.32.tar.gz deleted file mode 100644 index fef5459..0000000 --- a/avahi-0.6.32.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d54991185d514a0aba54ebeb408d7575b60f5818a772e28fa0e18b98bc1db454 -size 1297169 diff --git a/avahi-0.7.tar.gz b/avahi-0.7.tar.gz new file mode 100644 index 0000000..9eaa07c --- /dev/null +++ b/avahi-0.7.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:57a99b5dfe7fdae794e3d1ee7a62973a368e91e414bd0dfa5d84434de5b14804 +size 1333400 diff --git a/avahi-empty-share-dir.patch b/avahi-empty-share-dir.patch deleted file mode 100644 index cfb3a22..0000000 --- a/avahi-empty-share-dir.patch +++ /dev/null @@ -1,12 +0,0 @@ -Index: service-type-database/Makefile.am -=================================================================== ---- service-type-database/Makefile.am.orig -+++ service-type-database/Makefile.am -@@ -19,7 +19,6 @@ - - pkglibdatadir=$(libdir)/avahi - --pkgdata_DATA=service-types - pkglibdata_DATA= - - if HAVE_PYTHON diff --git a/avahi-gir-fixup.patch b/avahi-gir-fixup.patch deleted file mode 100644 index d5a877f..0000000 --- a/avahi-gir-fixup.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: avahi-0.6.30/avahi-gobject/AvahiCore-0.6.gir -=================================================================== ---- avahi-0.6.30.orig/avahi-gobject/AvahiCore-0.6.gir -+++ avahi-0.6.30/avahi-gobject/AvahiCore-0.6.gir -@@ -3,7 +3,7 @@ - xmlns="http://www.gtk.org/introspection/core/1.0" - xmlns:c="http://www.gtk.org/introspection/c/1.0" - xmlns:glib="http://www.gtk.org/introspection/glib/1.0"> -- -+ - - - diff --git a/avahi-glib2.spec b/avahi-glib2.spec index 9f05afb..b8f933f 100644 --- a/avahi-glib2.spec +++ b/avahi-glib2.spec @@ -1,7 +1,7 @@ # # spec file for package avahi-glib2 # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -28,12 +28,12 @@ Name: avahi-glib2 # For build all at once, set all to 1. # If you set build_core to 0, you cannot set more than one other option to 1. %define build_core 0 -# NOTE: build_glib2 also controls build of gobject, gtk2, gtk3 and pygtk code. +# NOTE: build_glib2 also controls build of gobject, gtk2, gtk3 code. %define build_glib2 1 %define build_mono 0 %define build_qt3 0 %define build_qt4 0 -Version: 0.6.32 +Version: 0.7 Release: 0 # FIXME: on upgrade, ensure to verify if -DGTK_DISABLE_DEPRECATED=1 can remain in avahi=ui/Makefile.am (GtkStock deprecated with GTK+ 3.9.10). %if !%build_glib2 && !%build_mono && !%build_qt3 && !%build_qt4 @@ -42,7 +42,6 @@ Release: 0 %endif %define avahi_client_soname 3 %define avahi_common_soname 3 -# If avahi_core_soname changes, make sure to update avahi-gir-fixup.patch %define avahi_core_soname 7 %define avahi_ui_soname 0 %define avahi_glib_soname 1 @@ -55,9 +54,9 @@ Release: 0 %endif Url: http://www.avahi.org/ Summary: D-BUS Service for Zeroconf and Bonjour -License: LGPL-2.1+ +License: LGPL-2.1-or-later Group: System/Daemons -Source: https://github.com/lathiat/avahi/releases/download/v%{version}/%{_name}-%{version}.tar.gz +Source: http://avahi.org/download/%{_name}-%{version}.tar.gz # From http://packages.debian.org/sid/avahi-daemon http://ftp.debian.org/debian/pool/main/a/avahi/avahi_0.6.31-1.debian.tar.gz Source1: avahi-daemon-check-dns.sh Source3: avahi.firewall @@ -78,16 +77,8 @@ Source102: baselibs.conf Patch0: avahi-gacdir.patch # PATCH-FIX-UPSTREAM avahi-desktop.patch bnc254654 Avahi#365 -- sbrabec@suse.cz Patch1: avahi-desktop.patch -# PATCH-FIX-UPSTREAM avahi-empty-share-dir.patch jpr@novell.com -- mailed maintainer -Patch3: avahi-empty-share-dir.patch # PATCH-FEATURE-OPENSUSE avahi-daemon-check-dns-suse.patch bnc431704 sbrabec@suse.cz -- Port Debian avahi-daemon-check-dns.sh to SUSE, see also http://avahi.org/wiki/AvahiAndUnicastDotLocal Patch4: avahi-daemon-check-dns-suse.patch -# PATCH-FIX-UPSTREAM avahi-gir-fixup.patch dimstar@opensnse.org -- Use complete shared library name in gir file for dependency -Patch12: avahi-gir-fixup.patch -# PATCH-FIX-OPENSUSE avahi-move-everything-to-run.patch rmilasan@suse.com -- Move everything to /run directory (socket and pid files) -Patch15: avahi-move-everything-to-run.patch -# PATCH-FIX-UPSTREAM avahi-outdated-URL.patch boo#914298 dimstar@opensuse.org -- Replace reference to no longer existing address with a more generic explanation URL -Patch17: avahi-outdated-URL.patch # PATCH-FIX-UPSTREAM avahi-0.6.31-invalid-packet.patch boo#947140 mgorse@suse.com -- don't spam logs for Windows 10 multicast packets Patch18: avahi-0.6.31-invalid-packet.patch # PATCH-FIX-UPSTREAM avahi-0.6.32-suppress-resolv-conf-warning.patch bsc#982317 mgorse@suse.com -- only warn on missing resolv.conf if it is being used. @@ -120,7 +111,6 @@ PreReq: sysvinit(network) %else PreReq: sysconfig %endif -%{?systemd_requires} Recommends: %{_name}-lang BuildRequires: dbus-1-devel BuildRequires: doxygen @@ -151,6 +141,7 @@ BuildRequires: gtk3-devel BuildRequires: libavahi-devel BuildRequires: python-gtk-devel BuildRequires: update-desktop-files +BuildRequires: pkgconfig(pygobject-3.0) %endif %if %build_qt3 BuildRequires: libavahi-devel @@ -763,11 +754,7 @@ sed "s:@sbindir@:%{_sbindir}:g" <%{S:11} >avahi-autoipd/avahi-autoipd.if-down translation-update-upstream %patch0 %patch1 -p1 -%patch3 %patch4 -%patch12 -p1 -%patch15 -p1 -%patch17 -p1 %patch18 -p1 %patch19 -p1 @@ -810,15 +797,15 @@ intltoolize -f --enable-gobject\ --enable-gtk\ --enable-gtk3\ - --enable-pygtk\ + --enable-pygobject\ %else --disable-glib\ --disable-gobject\ + --disable-pygobject\ %if ! %build_mono --disable-gtk\ %endif --disable-gtk3\ - --disable-pygtk\ %endif %if %build_qt3 --enable-qt3\ @@ -1076,7 +1063,8 @@ chown -R avahi-autoipd:avahi-autoipd %{_localstatedir}/lib/avahi-autoipd %files %defattr(-,root,root) -%doc LICENSE docs/* +%license LICENSE +%doc docs/* %dir %{_libdir}/avahi/ # Note: This file is intentionally packaged here. It is needed for python-avahi and avahi-utils: %{_libdir}/avahi/service-types.db diff --git a/avahi-mono.spec b/avahi-mono.spec index 9c4a388..dfc3abd 100644 --- a/avahi-mono.spec +++ b/avahi-mono.spec @@ -1,7 +1,7 @@ # # spec file for package avahi-mono # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -28,12 +28,12 @@ Name: avahi-mono # For build all at once, set all to 1. # If you set build_core to 0, you cannot set more than one other option to 1. %define build_core 0 -# NOTE: build_glib2 also controls build of gobject, gtk2, gtk3 and pygtk code. +# NOTE: build_glib2 also controls build of gobject, gtk2, gtk3 code. %define build_glib2 0 %define build_mono 1 %define build_qt3 0 %define build_qt4 0 -Version: 0.6.32 +Version: 0.7 Release: 0 # FIXME: on upgrade, ensure to verify if -DGTK_DISABLE_DEPRECATED=1 can remain in avahi=ui/Makefile.am (GtkStock deprecated with GTK+ 3.9.10). %if !%build_glib2 && !%build_mono && !%build_qt3 && !%build_qt4 @@ -42,7 +42,6 @@ Release: 0 %endif %define avahi_client_soname 3 %define avahi_common_soname 3 -# If avahi_core_soname changes, make sure to update avahi-gir-fixup.patch %define avahi_core_soname 7 %define avahi_ui_soname 0 %define avahi_glib_soname 1 @@ -55,9 +54,9 @@ Release: 0 %endif Url: http://www.avahi.org/ Summary: Mono Bindings for avahi, the D-BUS Service for Zeroconf and Bonjour -License: LGPL-2.1+ +License: LGPL-2.1-or-later Group: Development/Languages/Mono -Source: https://github.com/lathiat/avahi/releases/download/v%{version}/%{_name}-%{version}.tar.gz +Source: http://avahi.org/download/%{_name}-%{version}.tar.gz # From http://packages.debian.org/sid/avahi-daemon http://ftp.debian.org/debian/pool/main/a/avahi/avahi_0.6.31-1.debian.tar.gz Source1: avahi-daemon-check-dns.sh Source3: avahi.firewall @@ -78,16 +77,8 @@ Source102: baselibs.conf Patch0: avahi-gacdir.patch # PATCH-FIX-UPSTREAM avahi-desktop.patch bnc254654 Avahi#365 -- sbrabec@suse.cz Patch1: avahi-desktop.patch -# PATCH-FIX-UPSTREAM avahi-empty-share-dir.patch jpr@novell.com -- mailed maintainer -Patch3: avahi-empty-share-dir.patch # PATCH-FEATURE-OPENSUSE avahi-daemon-check-dns-suse.patch bnc431704 sbrabec@suse.cz -- Port Debian avahi-daemon-check-dns.sh to SUSE, see also http://avahi.org/wiki/AvahiAndUnicastDotLocal Patch4: avahi-daemon-check-dns-suse.patch -# PATCH-FIX-UPSTREAM avahi-gir-fixup.patch dimstar@opensnse.org -- Use complete shared library name in gir file for dependency -Patch12: avahi-gir-fixup.patch -# PATCH-FIX-OPENSUSE avahi-move-everything-to-run.patch rmilasan@suse.com -- Move everything to /run directory (socket and pid files) -Patch15: avahi-move-everything-to-run.patch -# PATCH-FIX-UPSTREAM avahi-outdated-URL.patch boo#914298 dimstar@opensuse.org -- Replace reference to no longer existing address with a more generic explanation URL -Patch17: avahi-outdated-URL.patch # PATCH-FIX-UPSTREAM avahi-0.6.31-invalid-packet.patch boo#947140 mgorse@suse.com -- don't spam logs for Windows 10 multicast packets Patch18: avahi-0.6.31-invalid-packet.patch # PATCH-FIX-UPSTREAM avahi-0.6.32-suppress-resolv-conf-warning.patch bsc#982317 mgorse@suse.com -- only warn on missing resolv.conf if it is being used. @@ -120,7 +111,6 @@ PreReq: sysvinit(network) %else PreReq: sysconfig %endif -%{?systemd_requires} Recommends: %{_name}-lang BuildRequires: dbus-1-devel BuildRequires: doxygen @@ -151,6 +141,7 @@ BuildRequires: gtk3-devel BuildRequires: libavahi-devel BuildRequires: python-gtk-devel BuildRequires: update-desktop-files +BuildRequires: pkgconfig(pygobject-3.0) %endif %if %build_qt3 BuildRequires: libavahi-devel @@ -728,7 +719,7 @@ correct mDNS reflection across LAN segments. %package -n avahi-mono Summary: Mono Bindings for avahi, the D-BUS Service for Zeroconf and Bonjour -License: LGPL-2.1+ +License: LGPL-2.1-or-later Group: Development/Languages/Mono Requires: gtk-sharp2 Requires: libavahi-client3 >= %{version} @@ -763,11 +754,7 @@ sed "s:@sbindir@:%{_sbindir}:g" <%{S:11} >avahi-autoipd/avahi-autoipd.if-down translation-update-upstream %patch0 %patch1 -p1 -%patch3 %patch4 -%patch12 -p1 -%patch15 -p1 -%patch17 -p1 %patch18 -p1 %patch19 -p1 @@ -810,15 +797,15 @@ intltoolize -f --enable-gobject\ --enable-gtk\ --enable-gtk3\ - --enable-pygtk\ + --enable-pygobject\ %else --disable-glib\ --disable-gobject\ + --disable-pygobject\ %if ! %build_mono --disable-gtk\ %endif --disable-gtk3\ - --disable-pygtk\ %endif %if %build_qt3 --enable-qt3\ @@ -1076,7 +1063,8 @@ chown -R avahi-autoipd:avahi-autoipd %{_localstatedir}/lib/avahi-autoipd %files %defattr(-,root,root) -%doc LICENSE docs/* +%license LICENSE +%doc docs/* %dir %{_libdir}/avahi/ # Note: This file is intentionally packaged here. It is needed for python-avahi and avahi-utils: %{_libdir}/avahi/service-types.db diff --git a/avahi-move-everything-to-run.patch b/avahi-move-everything-to-run.patch deleted file mode 100644 index 7a15669..0000000 --- a/avahi-move-everything-to-run.patch +++ /dev/null @@ -1,26 +0,0 @@ -Index: avahi-0.6.31/configure -=================================================================== ---- avahi-0.6.31.orig/configure -+++ avahi-0.6.31/configure -@@ -22710,7 +22710,7 @@ _ACEOF - # - # Avahi runtime dir - # --avahi_runtime_dir="${localstatedir}/run" -+avahi_runtime_dir="/run" - avahi_socket="${avahi_runtime_dir}/avahi-daemon/socket" - - -Index: avahi-0.6.31/configure.ac -=================================================================== ---- avahi-0.6.31.orig/configure.ac -+++ avahi-0.6.31/configure.ac -@@ -956,7 +956,7 @@ AC_DEFINE_UNQUOTED(AVAHI_AUTOIPD_GROUP," - # - # Avahi runtime dir - # --avahi_runtime_dir="${localstatedir}/run" -+avahi_runtime_dir="/run" - avahi_socket="${avahi_runtime_dir}/avahi-daemon/socket" - AC_SUBST(avahi_runtime_dir) - AC_SUBST(avahi_socket) diff --git a/avahi-outdated-URL.patch b/avahi-outdated-URL.patch deleted file mode 100644 index 8c25c19..0000000 --- a/avahi-outdated-URL.patch +++ /dev/null @@ -1,19 +0,0 @@ -Index: avahi-0.6.31/avahi-compat-libdns_sd/warn.c -=================================================================== ---- avahi-0.6.31.orig/avahi-compat-libdns_sd/warn.c -+++ avahi-0.6.31/avahi-compat-libdns_sd/warn.c -@@ -113,12 +113,12 @@ void avahi_warn_linkage(void) { - if (!w && !getenv("AVAHI_COMPAT_NOWARN")) { - avahi_warn("The program '%s' uses the "COMPAT_LAYER" compatibility layer of Avahi.", avahi_exe_name()); - avahi_warn("Please fix your application to use the native API of Avahi!"); -- avahi_warn("For more information see ", avahi_exe_name()); -+ avahi_warn("For more information see "); - } - } - - void avahi_warn_unsupported(const char *function) { - avahi_warn("The program '%s' called '%s()' which is not supported (or only supported partially) in the "COMPAT_LAYER" compatibility layer of Avahi.", avahi_exe_name(), function); - avahi_warn("Please fix your application to use the native API of Avahi!"); -- avahi_warn("For more information see ", avahi_exe_name(), function); -+ avahi_warn("For more information see "); - } diff --git a/avahi-qt4.spec b/avahi-qt4.spec index 2767cf0..69c13c2 100644 --- a/avahi-qt4.spec +++ b/avahi-qt4.spec @@ -1,7 +1,7 @@ # # spec file for package avahi-qt4 # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -28,12 +28,12 @@ Name: avahi-qt4 # For build all at once, set all to 1. # If you set build_core to 0, you cannot set more than one other option to 1. %define build_core 0 -# NOTE: build_glib2 also controls build of gobject, gtk2, gtk3 and pygtk code. +# NOTE: build_glib2 also controls build of gobject, gtk2, gtk3 code. %define build_glib2 0 %define build_mono 0 %define build_qt3 0 %define build_qt4 1 -Version: 0.6.32 +Version: 0.7 Release: 0 # FIXME: on upgrade, ensure to verify if -DGTK_DISABLE_DEPRECATED=1 can remain in avahi=ui/Makefile.am (GtkStock deprecated with GTK+ 3.9.10). %if !%build_glib2 && !%build_mono && !%build_qt3 && !%build_qt4 @@ -42,7 +42,6 @@ Release: 0 %endif %define avahi_client_soname 3 %define avahi_common_soname 3 -# If avahi_core_soname changes, make sure to update avahi-gir-fixup.patch %define avahi_core_soname 7 %define avahi_ui_soname 0 %define avahi_glib_soname 1 @@ -55,9 +54,9 @@ Release: 0 %endif Url: http://www.avahi.org/ Summary: Qt4 Bindings for avahi, the D-BUS Service for Zeroconf and Bonjour -License: LGPL-2.1+ +License: LGPL-2.1-or-later Group: System/GUI/KDE -Source: https://github.com/lathiat/avahi/releases/download/v%{version}/%{_name}-%{version}.tar.gz +Source: http://avahi.org/download/%{_name}-%{version}.tar.gz # From http://packages.debian.org/sid/avahi-daemon http://ftp.debian.org/debian/pool/main/a/avahi/avahi_0.6.31-1.debian.tar.gz Source1: avahi-daemon-check-dns.sh Source3: avahi.firewall @@ -78,16 +77,8 @@ Source102: baselibs.conf Patch0: avahi-gacdir.patch # PATCH-FIX-UPSTREAM avahi-desktop.patch bnc254654 Avahi#365 -- sbrabec@suse.cz Patch1: avahi-desktop.patch -# PATCH-FIX-UPSTREAM avahi-empty-share-dir.patch jpr@novell.com -- mailed maintainer -Patch3: avahi-empty-share-dir.patch # PATCH-FEATURE-OPENSUSE avahi-daemon-check-dns-suse.patch bnc431704 sbrabec@suse.cz -- Port Debian avahi-daemon-check-dns.sh to SUSE, see also http://avahi.org/wiki/AvahiAndUnicastDotLocal Patch4: avahi-daemon-check-dns-suse.patch -# PATCH-FIX-UPSTREAM avahi-gir-fixup.patch dimstar@opensnse.org -- Use complete shared library name in gir file for dependency -Patch12: avahi-gir-fixup.patch -# PATCH-FIX-OPENSUSE avahi-move-everything-to-run.patch rmilasan@suse.com -- Move everything to /run directory (socket and pid files) -Patch15: avahi-move-everything-to-run.patch -# PATCH-FIX-UPSTREAM avahi-outdated-URL.patch boo#914298 dimstar@opensuse.org -- Replace reference to no longer existing address with a more generic explanation URL -Patch17: avahi-outdated-URL.patch # PATCH-FIX-UPSTREAM avahi-0.6.31-invalid-packet.patch boo#947140 mgorse@suse.com -- don't spam logs for Windows 10 multicast packets Patch18: avahi-0.6.31-invalid-packet.patch # PATCH-FIX-UPSTREAM avahi-0.6.32-suppress-resolv-conf-warning.patch bsc#982317 mgorse@suse.com -- only warn on missing resolv.conf if it is being used. @@ -120,7 +111,6 @@ PreReq: sysvinit(network) %else PreReq: sysconfig %endif -%{?systemd_requires} Recommends: %{_name}-lang BuildRequires: dbus-1-devel BuildRequires: doxygen @@ -151,6 +141,7 @@ BuildRequires: gtk3-devel BuildRequires: libavahi-devel BuildRequires: python-gtk-devel BuildRequires: update-desktop-files +BuildRequires: pkgconfig(pygobject-3.0) %endif %if %build_qt3 BuildRequires: libavahi-devel @@ -765,11 +756,7 @@ sed "s:@sbindir@:%{_sbindir}:g" <%{S:11} >avahi-autoipd/avahi-autoipd.if-down translation-update-upstream %patch0 %patch1 -p1 -%patch3 %patch4 -%patch12 -p1 -%patch15 -p1 -%patch17 -p1 %patch18 -p1 %patch19 -p1 @@ -812,15 +799,15 @@ intltoolize -f --enable-gobject\ --enable-gtk\ --enable-gtk3\ - --enable-pygtk\ + --enable-pygobject\ %else --disable-glib\ --disable-gobject\ + --disable-pygobject\ %if ! %build_mono --disable-gtk\ %endif --disable-gtk3\ - --disable-pygtk\ %endif %if %build_qt3 --enable-qt3\ @@ -1078,7 +1065,8 @@ chown -R avahi-autoipd:avahi-autoipd %{_localstatedir}/lib/avahi-autoipd %files %defattr(-,root,root) -%doc LICENSE docs/* +%license LICENSE +%doc docs/* %dir %{_libdir}/avahi/ # Note: This file is intentionally packaged here. It is needed for python-avahi and avahi-utils: %{_libdir}/avahi/service-types.db diff --git a/avahi.changes b/avahi.changes index 9bce7ec..c293df2 100644 --- a/avahi.changes +++ b/avahi.changes @@ -1,7 +1,72 @@ +------------------------------------------------------------------- +Mon Feb 19 15:19:41 UTC 2018 - dimstar@opensuse.org + +- Use SPDX3.0 license tags and package COPYING as %license. + +------------------------------------------------------------------- +Wed Nov 29 15:44:31 UTC 2017 - zaitor@opensuse.org + +- Update to version 0.7: + + The Avahi 0.7 release brings two new features, binary TXT + records in XML service files and the ability to start the + gobject client in a custom context. + + New Features: + - Add support for binary values in TXT records in XML service + files by specifying + value-format="text|binary-hex|binary-base64". If not + specified, defaults to the normal value of "text" (thus + backwards compatible). + - avahi-gobject: Allow starting the client in a custom + GMainContext by passing context to ga_client_start_in_context + instead of ga_client_start (avahi-gobject minor version has + been incremented). + + Notable Changes: + - avahi-daemon: Remove all default rlimits from + avahi-daemon.conf, as two main problems happened with firstly + rlimit-nproc causing avahi to fail when started in a + container without user namespaces and secondly because memory + rlimits were causing avahi to crash in some cases. Leave it + up to the init system to impose any modified limits instead. + It is recommend to ship this change in distribution default + config files. + - avahi-common: Fix watch cleanup issue in watch_free + - avahi-discover (python): Updated for Python3 & GTK3 + - avahi-autoipd: + . Clear previously set address before binding a new one. + . Fix dhclient hooks to check for avahi-autoipd before + running. + - build: Move default rundir from /var/run to /run as per + modern system setups. + + Other Changes: + - build: + . Fix the printed value of "Building libavahi-client" in + ./configure. + . autogen.sh improved to work when called from another + directory. + . Fix warnings when compiling against musl libc. + - avahi-compat-libdns_sd: Fix incorrect URL in warnings. + - service-type-database: Add new service Types: _ipps._tcp, + _xpra._tcp. + - avahi-dnsconfd: Update manpage with the correct action script + name. + - avahi-gobject: + . Use the correct shared library name in AvahiCore-0.6.gir + . Fix build failing under some locales. + - avahi-common/dbus-watch-glue.c: remove Unneeded semicolon. + - Update gentoo init scripts for newer openrc version. + + Updated translations. +- Drop avahi-empty-share-dir.patch, avahi-gir-fixup.patch, + avahi-move-everything-to-run.patch and avahi-outdated-URL.patch: + Fixed upstream. +- Drop systemd_requires macro: on a machine managed by systemd, we + don't have to require it. If the machine/container is not managed + by systemd, we don't want to require it. +- Add pkgconfig(pygobject-3.0) BuildRequires: New dependency. + ------------------------------------------------------------------- Thu Nov 23 13:37:18 UTC 2017 - rbrown@suse.com -- Replace references to /var/adm/fillup-templates with new +- Replace references to /var/adm/fillup-templates with new %_fillupdir macro (boo#1069468) ------------------------------------------------------------------- diff --git a/avahi.spec b/avahi.spec index 365e1e8..b49743a 100644 --- a/avahi.spec +++ b/avahi.spec @@ -1,7 +1,7 @@ # # spec file for package avahi # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -30,12 +30,12 @@ Name: avahi # For build all at once, set all to 1. # If you set build_core to 0, you cannot set more than one other option to 1. %define build_core 1 -# NOTE: build_glib2 also controls build of gobject, gtk2, gtk3 and pygtk code. +# NOTE: build_glib2 also controls build of gobject, gtk2, gtk3 code. %define build_glib2 0 %define build_mono 0 %define build_qt3 0 %define build_qt4 0 -Version: 0.6.32 +Version: 0.7 Release: 0 # FIXME: on upgrade, ensure to verify if -DGTK_DISABLE_DEPRECATED=1 can remain in avahi=ui/Makefile.am (GtkStock deprecated with GTK+ 3.9.10). %if !%build_glib2 && !%build_mono && !%build_qt3 && !%build_qt4 @@ -44,7 +44,6 @@ Release: 0 %endif %define avahi_client_soname 3 %define avahi_common_soname 3 -# If avahi_core_soname changes, make sure to update avahi-gir-fixup.patch %define avahi_core_soname 7 %define avahi_ui_soname 0 %define avahi_glib_soname 1 @@ -57,9 +56,9 @@ Release: 0 %endif Url: http://www.avahi.org/ Summary: D-BUS Service for Zeroconf and Bonjour -License: LGPL-2.1+ +License: LGPL-2.1-or-later Group: System/Daemons -Source: https://github.com/lathiat/avahi/releases/download/v%{version}/%{_name}-%{version}.tar.gz +Source: http://avahi.org/download/%{_name}-%{version}.tar.gz # From http://packages.debian.org/sid/avahi-daemon http://ftp.debian.org/debian/pool/main/a/avahi/avahi_0.6.31-1.debian.tar.gz Source1: avahi-daemon-check-dns.sh Source3: avahi.firewall @@ -80,16 +79,8 @@ Source102: baselibs.conf Patch0: avahi-gacdir.patch # PATCH-FIX-UPSTREAM avahi-desktop.patch bnc254654 Avahi#365 -- sbrabec@suse.cz Patch1: avahi-desktop.patch -# PATCH-FIX-UPSTREAM avahi-empty-share-dir.patch jpr@novell.com -- mailed maintainer -Patch3: avahi-empty-share-dir.patch # PATCH-FEATURE-OPENSUSE avahi-daemon-check-dns-suse.patch bnc431704 sbrabec@suse.cz -- Port Debian avahi-daemon-check-dns.sh to SUSE, see also http://avahi.org/wiki/AvahiAndUnicastDotLocal Patch4: avahi-daemon-check-dns-suse.patch -# PATCH-FIX-UPSTREAM avahi-gir-fixup.patch dimstar@opensnse.org -- Use complete shared library name in gir file for dependency -Patch12: avahi-gir-fixup.patch -# PATCH-FIX-OPENSUSE avahi-move-everything-to-run.patch rmilasan@suse.com -- Move everything to /run directory (socket and pid files) -Patch15: avahi-move-everything-to-run.patch -# PATCH-FIX-UPSTREAM avahi-outdated-URL.patch boo#914298 dimstar@opensuse.org -- Replace reference to no longer existing address with a more generic explanation URL -Patch17: avahi-outdated-URL.patch # PATCH-FIX-UPSTREAM avahi-0.6.31-invalid-packet.patch boo#947140 mgorse@suse.com -- don't spam logs for Windows 10 multicast packets Patch18: avahi-0.6.31-invalid-packet.patch # PATCH-FIX-UPSTREAM avahi-0.6.32-suppress-resolv-conf-warning.patch bsc#982317 mgorse@suse.com -- only warn on missing resolv.conf if it is being used. @@ -122,7 +113,6 @@ PreReq: sysvinit(network) %else PreReq: sysconfig %endif -%{?systemd_requires} Recommends: %{_name}-lang BuildRequires: dbus-1-devel BuildRequires: doxygen @@ -153,6 +143,7 @@ BuildRequires: gtk3-devel BuildRequires: libavahi-devel BuildRequires: python-gtk-devel BuildRequires: update-desktop-files +BuildRequires: pkgconfig(pygobject-3.0) %endif %if %build_qt3 BuildRequires: libavahi-devel @@ -765,11 +756,7 @@ sed "s:@sbindir@:%{_sbindir}:g" <%{S:11} >avahi-autoipd/avahi-autoipd.if-down translation-update-upstream %patch0 %patch1 -p1 -%patch3 %patch4 -%patch12 -p1 -%patch15 -p1 -%patch17 -p1 %patch18 -p1 %patch19 -p1 @@ -812,15 +799,15 @@ intltoolize -f --enable-gobject\ --enable-gtk\ --enable-gtk3\ - --enable-pygtk\ + --enable-pygobject\ %else --disable-glib\ --disable-gobject\ + --disable-pygobject\ %if ! %build_mono --disable-gtk\ %endif --disable-gtk3\ - --disable-pygtk\ %endif %if %build_qt3 --enable-qt3\ @@ -1078,7 +1065,8 @@ chown -R avahi-autoipd:avahi-autoipd %{_localstatedir}/lib/avahi-autoipd %files %defattr(-,root,root) -%doc LICENSE docs/* +%license LICENSE +%doc docs/* %dir %{_libdir}/avahi/ # Note: This file is intentionally packaged here. It is needed for python-avahi and avahi-utils: %{_libdir}/avahi/service-types.db