pool/avahi
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 458658 from GNOME:Next

Browse Source 
Fix build with the latest util-linux submission in Staging:C

OBS-URL: https://build.opensuse.org/request/show/458658
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/avahi?expand=0&rev=133
This commit is contained in:
Bjørn Lie 2017-02-17 23:05:07 +00:00 committed by Git OBS Bridge
parent b2280fbdfc
commit 85df621f92
6 changed files with 44 additions and 125 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
avahi-glib2.spec
View File

@ -1,7 +1,7 @@
# #
# spec file for package avahi-glib2 # spec file for package avahi-glib2
# #
# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -119,9 +119,7 @@ BuildRequires: doxygen
BuildRequires: graphviz BuildRequires: graphviz
BuildRequires: python-gdbm BuildRequires: python-gdbm
BuildRequires: zlib-devel BuildRequires: zlib-devel
%if %suse_version >= 1210
BuildRequires: pkgconfig(systemd) BuildRequires: pkgconfig(systemd)
%endif
# For python bindings and utilities: # For python bindings and utilities:
#BuildRequires: dbus-1-python #BuildRequires: dbus-1-python
#Requires: dbus-1 #Requires: dbus-1
@ -235,9 +233,9 @@ across LAN segments.
%package -n libdns_sd %package -n libdns_sd
Summary: mDNSResponder Compatibility Package for D-BUS Service for Zeroconf/Bonjour Summary: mDNSResponder Compatibility Package for D-BUS Service for Zeroconf/Bonjour
Group: System/Libraries
# mDNSResponder-lib used unversioned soname. # mDNSResponder-lib used unversioned soname.
# Provide full compatibility with mDNSResponder (FIXME: should be fixed in the package): # Provide full compatibility with mDNSResponder (FIXME: should be fixed in the package):
Group: System/Libraries
%ifarch ia64 x86_64 ppc64 s390x %ifarch ia64 x86_64 ppc64 s390x
Provides: libdns_sd.so()(64bit) Provides: libdns_sd.so()(64bit)
%else %else
@ -272,8 +270,8 @@ correct mDNS reflection across LAN segments.
%package -n libhowl0 %package -n libhowl0
Summary: Howl Compatibility Package for D-BUS Service for Zeroconf/Bonjour Summary: Howl Compatibility Package for D-BUS Service for Zeroconf/Bonjour
Group: System/Libraries
# Old name used for <= 10.3: # Old name used for <= 10.3:
Group: System/Libraries
Provides: avahi-compat-howl = %{version} Provides: avahi-compat-howl = %{version}
Obsoletes: avahi-compat-howl < %{version} Obsoletes: avahi-compat-howl < %{version}
@ -321,8 +319,8 @@ elsewhere, like correct mDNS reflection across LAN segments.
%package autoipd %package autoipd
Summary: IPv4LL Service for Zeroconf and Bonjour Summary: IPv4LL Service for Zeroconf and Bonjour
Group: Productivity/Networking/Other
# Split provides for upgrade from openSUSE <= 12.3 and SLE <= 11. # Split provides for upgrade from openSUSE <= 12.3 and SLE <= 11.
Group: Productivity/Networking/Other
Provides: avahi:%{_sbindir}/avahi-autoipd Provides: avahi:%{_sbindir}/avahi-autoipd
# Disable this conflict for now, it breaks staging, and it's pretty much obsolete, but can go back in if needed once a new version of avahi is released. # Disable this conflict for now, it breaks staging, and it's pretty much obsolete, but can go back in if needed once a new version of avahi is released.
# File conflict for avahi-autoipd openSUSE <= 12.3 SLE <= 11 # File conflict for avahi-autoipd openSUSE <= 12.3 SLE <= 11
@ -359,8 +357,8 @@ across LAN segments.
%package -n libavahi-devel %package -n libavahi-devel
Summary: Include Files and Libraries Mandatory for Development Summary: Include Files and Libraries Mandatory for Development
Group: Development/Libraries/C and C++
# #
Group: Development/Libraries/C and C++
Requires: %{_name} = %{version} Requires: %{_name} = %{version}
Requires: dbus-1-devel Requires: dbus-1-devel
Requires: glibc-devel Requires: glibc-devel
@ -467,8 +465,8 @@ across LAN segments.
%package -n libavahi-glib1 %package -n libavahi-glib1
Summary: Glib Bindings for avahi, the D-BUS Service for Zeroconf and Bonjour Summary: Glib Bindings for avahi, the D-BUS Service for Zeroconf and Bonjour
Group: System/Libraries
# Old name used for <= 10.3: # Old name used for <= 10.3:
Group: System/Libraries
Provides: avahi-glib = %{version} Provides: avahi-glib = %{version}
Obsoletes: avahi-glib < %{version} Obsoletes: avahi-glib < %{version}
@ -624,8 +622,8 @@ across LAN segments.
%package -n libavahi-qt3-1 %package -n libavahi-qt3-1
Summary: Qt3 Bindings for avahi, the D-BUS Service for Zeroconf and Bonjour Summary: Qt3 Bindings for avahi, the D-BUS Service for Zeroconf and Bonjour
Group: System/GUI/KDE
# Old name used for <= 10.3: # Old name used for <= 10.3:
Group: System/GUI/KDE
Provides: avahi-qt3 = %{version} Provides: avahi-qt3 = %{version}
Obsoletes: avahi-qt3 < %{version} Obsoletes: avahi-qt3 < %{version}
@ -673,8 +671,8 @@ correct mDNS reflection across LAN segments.
%package -n libavahi-qt4-1 %package -n libavahi-qt4-1
Summary: Qt4 Bindings for avahi, the D-BUS Service for Zeroconf and Bonjour Summary: Qt4 Bindings for avahi, the D-BUS Service for Zeroconf and Bonjour
Group: System/GUI/KDE
# Old name used for <= 10.3: # Old name used for <= 10.3:
Group: System/GUI/KDE
Provides: avahi-qt4 = %{version} Provides: avahi-qt4 = %{version}
Obsoletes: avahi-qt4 < %{version} Obsoletes: avahi-qt4 < %{version}
@ -965,9 +963,7 @@ rm $RPM_BUILD_ROOT%{_libdir}/pkgconfig/avahi-ui.pc
%pre %pre
%{_sbindir}/groupadd -r avahi 2> /dev/null || : %{_sbindir}/groupadd -r avahi 2> /dev/null || :
%{_sbindir}/useradd -r -s /bin/false -c "User for Avahi" -d /run/avahi-daemon -g avahi avahi 2> /dev/null || : %{_sbindir}/useradd -r -s /bin/false -c "User for Avahi" -d /run/avahi-daemon -g avahi avahi 2> /dev/null || :
%if %suse_version >= 1210
%service_add_pre avahi-dnsconfd.service avahi-daemon.service %service_add_pre avahi-dnsconfd.service avahi-daemon.service
%endif
# bnc#853845,bnc#851953: do not start by default under # bnc#853845,bnc#851953: do not start by default under
# sysconfig as this breaks vlan,bridge,bonding setups # sysconfig as this breaks vlan,bridge,bonding setups
# in pre to revert old default setting from template. # in pre to revert old default setting from template.
@ -983,18 +979,12 @@ fi
%post %post
%{fillup_only -n avahi} %{fillup_only -n avahi}
%{fillup_only -ns security checksig} %{fillup_only -ns security checksig}
%if %suse_version >= 1210
%service_add_post avahi-dnsconfd.service avahi-daemon.service %service_add_post avahi-dnsconfd.service avahi-daemon.service
%endif
%preun %preun
%if %suse_version >= 1210
%service_del_preun avahi-dnsconfd.service avahi-daemon.service %service_del_preun avahi-dnsconfd.service avahi-daemon.service
%endif
%postun %postun
%insserv_cleanup
%if %suse_version >= 1210
%service_del_postun avahi-dnsconfd.service avahi-daemon.service %service_del_postun avahi-dnsconfd.service avahi-daemon.service
%pre autoipd %pre autoipd
@ -1005,7 +995,6 @@ fi
%{fillup_only -ns avahi autoipd} %{fillup_only -ns avahi autoipd}
# Change ownership of /var/lib/avahi-autoipd after upgrade from openSUSE <= 12.3 and SLE <= 11. # Change ownership of /var/lib/avahi-autoipd after upgrade from openSUSE <= 12.3 and SLE <= 11.
chown -R avahi-autoipd:avahi-autoipd %{_localstatedir}/lib/avahi-autoipd chown -R avahi-autoipd:avahi-autoipd %{_localstatedir}/lib/avahi-autoipd
%endif
%post -n libavahi-client3 -p /sbin/ldconfig %post -n libavahi-client3 -p /sbin/ldconfig
@ -1026,12 +1015,6 @@ chown -R avahi-autoipd:avahi-autoipd %{_localstatedir}/lib/avahi-autoipd
%post -n libhowl0 -p /sbin/ldconfig %post -n libhowl0 -p /sbin/ldconfig
%postun -n libhowl0 -p /sbin/ldconfig %postun -n libhowl0 -p /sbin/ldconfig
%preun -n python-avahi
%insserv_cleanup
%postun -n python-avahi
%insserv_cleanup
%endif %endif
%if %build_glib2 %if %build_glib2

33
avahi-mono.spec
View File

@ -1,7 +1,7 @@
# #
# spec file for package avahi-mono # spec file for package avahi-mono
# #
# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -119,9 +119,7 @@ BuildRequires: doxygen
BuildRequires: graphviz BuildRequires: graphviz
BuildRequires: python-gdbm BuildRequires: python-gdbm
BuildRequires: zlib-devel BuildRequires: zlib-devel
%if %suse_version >= 1210
BuildRequires: pkgconfig(systemd) BuildRequires: pkgconfig(systemd)
%endif
# For python bindings and utilities: # For python bindings and utilities:
#BuildRequires: dbus-1-python #BuildRequires: dbus-1-python
#Requires: dbus-1 #Requires: dbus-1
@ -234,9 +232,9 @@ across LAN segments.
%package -n libdns_sd %package -n libdns_sd
Summary: mDNSResponder Compatibility Package for D-BUS Service for Zeroconf/Bonjour Summary: mDNSResponder Compatibility Package for D-BUS Service for Zeroconf/Bonjour
Group: System/Libraries
# mDNSResponder-lib used unversioned soname. # mDNSResponder-lib used unversioned soname.
# Provide full compatibility with mDNSResponder (FIXME: should be fixed in the package): # Provide full compatibility with mDNSResponder (FIXME: should be fixed in the package):
Group: System/Libraries
%ifarch ia64 x86_64 ppc64 s390x %ifarch ia64 x86_64 ppc64 s390x
Provides: libdns_sd.so()(64bit) Provides: libdns_sd.so()(64bit)
%else %else
@ -271,8 +269,8 @@ correct mDNS reflection across LAN segments.
%package -n libhowl0 %package -n libhowl0
Summary: Howl Compatibility Package for D-BUS Service for Zeroconf/Bonjour Summary: Howl Compatibility Package for D-BUS Service for Zeroconf/Bonjour
Group: System/Libraries
# Old name used for <= 10.3: # Old name used for <= 10.3:
Group: System/Libraries
Provides: avahi-compat-howl = %{version} Provides: avahi-compat-howl = %{version}
Obsoletes: avahi-compat-howl < %{version} Obsoletes: avahi-compat-howl < %{version}
@ -320,8 +318,8 @@ elsewhere, like correct mDNS reflection across LAN segments.
%package autoipd %package autoipd
Summary: IPv4LL Service for Zeroconf and Bonjour Summary: IPv4LL Service for Zeroconf and Bonjour
Group: Productivity/Networking/Other
# Split provides for upgrade from openSUSE <= 12.3 and SLE <= 11. # Split provides for upgrade from openSUSE <= 12.3 and SLE <= 11.
Group: Productivity/Networking/Other
Provides: avahi:%{_sbindir}/avahi-autoipd Provides: avahi:%{_sbindir}/avahi-autoipd
# Disable this conflict for now, it breaks staging, and it's pretty much obsolete, but can go back in if needed once a new version of avahi is released. # Disable this conflict for now, it breaks staging, and it's pretty much obsolete, but can go back in if needed once a new version of avahi is released.
# File conflict for avahi-autoipd openSUSE <= 12.3 SLE <= 11 # File conflict for avahi-autoipd openSUSE <= 12.3 SLE <= 11
@ -358,8 +356,8 @@ across LAN segments.
%package -n libavahi-devel %package -n libavahi-devel
Summary: Include Files and Libraries Mandatory for Development Summary: Include Files and Libraries Mandatory for Development
Group: Development/Libraries/C and C++
# #
Group: Development/Libraries/C and C++
Requires: %{_name} = %{version} Requires: %{_name} = %{version}
Requires: dbus-1-devel Requires: dbus-1-devel
Requires: glibc-devel Requires: glibc-devel
@ -466,8 +464,8 @@ across LAN segments.
%package -n libavahi-glib1 %package -n libavahi-glib1
Summary: Glib Bindings for avahi, the D-BUS Service for Zeroconf and Bonjour Summary: Glib Bindings for avahi, the D-BUS Service for Zeroconf and Bonjour
Group: System/Libraries
# Old name used for <= 10.3: # Old name used for <= 10.3:
Group: System/Libraries
Provides: avahi-glib = %{version} Provides: avahi-glib = %{version}
Obsoletes: avahi-glib < %{version} Obsoletes: avahi-glib < %{version}
@ -623,8 +621,8 @@ across LAN segments.
%package -n libavahi-qt3-1 %package -n libavahi-qt3-1
Summary: Qt3 Bindings for avahi, the D-BUS Service for Zeroconf and Bonjour Summary: Qt3 Bindings for avahi, the D-BUS Service for Zeroconf and Bonjour
Group: System/GUI/KDE
# Old name used for <= 10.3: # Old name used for <= 10.3:
Group: System/GUI/KDE
Provides: avahi-qt3 = %{version} Provides: avahi-qt3 = %{version}
Obsoletes: avahi-qt3 < %{version} Obsoletes: avahi-qt3 < %{version}
@ -672,8 +670,8 @@ correct mDNS reflection across LAN segments.
%package -n libavahi-qt4-1 %package -n libavahi-qt4-1
Summary: Qt4 Bindings for avahi, the D-BUS Service for Zeroconf and Bonjour Summary: Qt4 Bindings for avahi, the D-BUS Service for Zeroconf and Bonjour
Group: System/GUI/KDE
# Old name used for <= 10.3: # Old name used for <= 10.3:
Group: System/GUI/KDE
Provides: avahi-qt4 = %{version} Provides: avahi-qt4 = %{version}
Obsoletes: avahi-qt4 < %{version} Obsoletes: avahi-qt4 < %{version}
@ -965,9 +963,7 @@ rm $RPM_BUILD_ROOT%{_libdir}/pkgconfig/avahi-ui.pc
%pre %pre
%{_sbindir}/groupadd -r avahi 2> /dev/null || : %{_sbindir}/groupadd -r avahi 2> /dev/null || :
%{_sbindir}/useradd -r -s /bin/false -c "User for Avahi" -d /run/avahi-daemon -g avahi avahi 2> /dev/null || : %{_sbindir}/useradd -r -s /bin/false -c "User for Avahi" -d /run/avahi-daemon -g avahi avahi 2> /dev/null || :
%if %suse_version >= 1210
%service_add_pre avahi-dnsconfd.service avahi-daemon.service %service_add_pre avahi-dnsconfd.service avahi-daemon.service
%endif
# bnc#853845,bnc#851953: do not start by default under # bnc#853845,bnc#851953: do not start by default under
# sysconfig as this breaks vlan,bridge,bonding setups # sysconfig as this breaks vlan,bridge,bonding setups
# in pre to revert old default setting from template. # in pre to revert old default setting from template.
@ -983,18 +979,12 @@ fi
%post %post
%{fillup_only -n avahi} %{fillup_only -n avahi}
%{fillup_only -ns security checksig} %{fillup_only -ns security checksig}
%if %suse_version >= 1210
%service_add_post avahi-dnsconfd.service avahi-daemon.service %service_add_post avahi-dnsconfd.service avahi-daemon.service
%endif
%preun %preun
%if %suse_version >= 1210
%service_del_preun avahi-dnsconfd.service avahi-daemon.service %service_del_preun avahi-dnsconfd.service avahi-daemon.service
%endif
%postun %postun
%insserv_cleanup
%if %suse_version >= 1210
%service_del_postun avahi-dnsconfd.service avahi-daemon.service %service_del_postun avahi-dnsconfd.service avahi-daemon.service
%pre autoipd %pre autoipd
@ -1005,7 +995,6 @@ fi
%{fillup_only -ns avahi autoipd} %{fillup_only -ns avahi autoipd}
# Change ownership of /var/lib/avahi-autoipd after upgrade from openSUSE <= 12.3 and SLE <= 11. # Change ownership of /var/lib/avahi-autoipd after upgrade from openSUSE <= 12.3 and SLE <= 11.
chown -R avahi-autoipd:avahi-autoipd %{_localstatedir}/lib/avahi-autoipd chown -R avahi-autoipd:avahi-autoipd %{_localstatedir}/lib/avahi-autoipd
%endif
%post -n libavahi-client3 -p /sbin/ldconfig %post -n libavahi-client3 -p /sbin/ldconfig
@ -1026,12 +1015,6 @@ chown -R avahi-autoipd:avahi-autoipd %{_localstatedir}/lib/avahi-autoipd
%post -n libhowl0 -p /sbin/ldconfig %post -n libhowl0 -p /sbin/ldconfig
%postun -n libhowl0 -p /sbin/ldconfig %postun -n libhowl0 -p /sbin/ldconfig
%preun -n python-avahi
%insserv_cleanup
%postun -n python-avahi
%insserv_cleanup
%endif %endif
%if %build_glib2 %if %build_glib2

33
avahi-qt4.spec
View File

@ -1,7 +1,7 @@
# #
# spec file for package avahi-qt4 # spec file for package avahi-qt4
# #
# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -119,9 +119,7 @@ BuildRequires: doxygen
BuildRequires: graphviz BuildRequires: graphviz
BuildRequires: python-gdbm BuildRequires: python-gdbm
BuildRequires: zlib-devel BuildRequires: zlib-devel
%if %suse_version >= 1210
BuildRequires: pkgconfig(systemd) BuildRequires: pkgconfig(systemd)
%endif
# For python bindings and utilities: # For python bindings and utilities:
#BuildRequires: dbus-1-python #BuildRequires: dbus-1-python
#Requires: dbus-1 #Requires: dbus-1
@ -237,9 +235,9 @@ across LAN segments.
%package -n libdns_sd %package -n libdns_sd
Summary: mDNSResponder Compatibility Package for D-BUS Service for Zeroconf/Bonjour Summary: mDNSResponder Compatibility Package for D-BUS Service for Zeroconf/Bonjour
Group: System/Libraries
# mDNSResponder-lib used unversioned soname. # mDNSResponder-lib used unversioned soname.
# Provide full compatibility with mDNSResponder (FIXME: should be fixed in the package): # Provide full compatibility with mDNSResponder (FIXME: should be fixed in the package):
Group: System/Libraries
%ifarch ia64 x86_64 ppc64 s390x %ifarch ia64 x86_64 ppc64 s390x
Provides: libdns_sd.so()(64bit) Provides: libdns_sd.so()(64bit)
%else %else
@ -274,8 +272,8 @@ correct mDNS reflection across LAN segments.
%package -n libhowl0 %package -n libhowl0
Summary: Howl Compatibility Package for D-BUS Service for Zeroconf/Bonjour Summary: Howl Compatibility Package for D-BUS Service for Zeroconf/Bonjour
Group: System/Libraries
# Old name used for <= 10.3: # Old name used for <= 10.3:
Group: System/Libraries
Provides: avahi-compat-howl = %{version} Provides: avahi-compat-howl = %{version}
Obsoletes: avahi-compat-howl < %{version} Obsoletes: avahi-compat-howl < %{version}
@ -323,8 +321,8 @@ elsewhere, like correct mDNS reflection across LAN segments.
%package autoipd %package autoipd
Summary: IPv4LL Service for Zeroconf and Bonjour Summary: IPv4LL Service for Zeroconf and Bonjour
Group: Productivity/Networking/Other
# Split provides for upgrade from openSUSE <= 12.3 and SLE <= 11. # Split provides for upgrade from openSUSE <= 12.3 and SLE <= 11.
Group: Productivity/Networking/Other
Provides: avahi:%{_sbindir}/avahi-autoipd Provides: avahi:%{_sbindir}/avahi-autoipd
# Disable this conflict for now, it breaks staging, and it's pretty much obsolete, but can go back in if needed once a new version of avahi is released. # Disable this conflict for now, it breaks staging, and it's pretty much obsolete, but can go back in if needed once a new version of avahi is released.
# File conflict for avahi-autoipd openSUSE <= 12.3 SLE <= 11 # File conflict for avahi-autoipd openSUSE <= 12.3 SLE <= 11
@ -361,8 +359,8 @@ across LAN segments.
%package -n libavahi-devel %package -n libavahi-devel
Summary: Include Files and Libraries Mandatory for Development Summary: Include Files and Libraries Mandatory for Development
Group: Development/Libraries/C and C++
# #
Group: Development/Libraries/C and C++
Requires: %{_name} = %{version} Requires: %{_name} = %{version}
Requires: dbus-1-devel Requires: dbus-1-devel
Requires: glibc-devel Requires: glibc-devel
@ -469,8 +467,8 @@ across LAN segments.
%package -n libavahi-glib1 %package -n libavahi-glib1
Summary: Glib Bindings for avahi, the D-BUS Service for Zeroconf and Bonjour Summary: Glib Bindings for avahi, the D-BUS Service for Zeroconf and Bonjour
Group: System/Libraries
# Old name used for <= 10.3: # Old name used for <= 10.3:
Group: System/Libraries
Provides: avahi-glib = %{version} Provides: avahi-glib = %{version}
Obsoletes: avahi-glib < %{version} Obsoletes: avahi-glib < %{version}
@ -626,8 +624,8 @@ across LAN segments.
%package -n libavahi-qt3-1 %package -n libavahi-qt3-1
Summary: Qt3 Bindings for avahi, the D-BUS Service for Zeroconf and Bonjour Summary: Qt3 Bindings for avahi, the D-BUS Service for Zeroconf and Bonjour
Group: System/GUI/KDE
# Old name used for <= 10.3: # Old name used for <= 10.3:
Group: System/GUI/KDE
Provides: avahi-qt3 = %{version} Provides: avahi-qt3 = %{version}
Obsoletes: avahi-qt3 < %{version} Obsoletes: avahi-qt3 < %{version}
@ -675,8 +673,8 @@ correct mDNS reflection across LAN segments.
%package -n libavahi-qt4-1 %package -n libavahi-qt4-1
Summary: Qt4 Bindings for avahi, the D-BUS Service for Zeroconf and Bonjour Summary: Qt4 Bindings for avahi, the D-BUS Service for Zeroconf and Bonjour
Group: System/GUI/KDE
# Old name used for <= 10.3: # Old name used for <= 10.3:
Group: System/GUI/KDE
Provides: avahi-qt4 = %{version} Provides: avahi-qt4 = %{version}
Obsoletes: avahi-qt4 < %{version} Obsoletes: avahi-qt4 < %{version}
@ -967,9 +965,7 @@ rm $RPM_BUILD_ROOT%{_libdir}/pkgconfig/avahi-ui.pc
%pre %pre
%{_sbindir}/groupadd -r avahi 2> /dev/null || : %{_sbindir}/groupadd -r avahi 2> /dev/null || :
%{_sbindir}/useradd -r -s /bin/false -c "User for Avahi" -d /run/avahi-daemon -g avahi avahi 2> /dev/null || : %{_sbindir}/useradd -r -s /bin/false -c "User for Avahi" -d /run/avahi-daemon -g avahi avahi 2> /dev/null || :
%if %suse_version >= 1210
%service_add_pre avahi-dnsconfd.service avahi-daemon.service %service_add_pre avahi-dnsconfd.service avahi-daemon.service
%endif
# bnc#853845,bnc#851953: do not start by default under # bnc#853845,bnc#851953: do not start by default under
# sysconfig as this breaks vlan,bridge,bonding setups # sysconfig as this breaks vlan,bridge,bonding setups
# in pre to revert old default setting from template. # in pre to revert old default setting from template.
@ -985,18 +981,12 @@ fi
%post %post
%{fillup_only -n avahi} %{fillup_only -n avahi}
%{fillup_only -ns security checksig} %{fillup_only -ns security checksig}
%if %suse_version >= 1210
%service_add_post avahi-dnsconfd.service avahi-daemon.service %service_add_post avahi-dnsconfd.service avahi-daemon.service
%endif
%preun %preun
%if %suse_version >= 1210
%service_del_preun avahi-dnsconfd.service avahi-daemon.service %service_del_preun avahi-dnsconfd.service avahi-daemon.service
%endif
%postun %postun
%insserv_cleanup
%if %suse_version >= 1210
%service_del_postun avahi-dnsconfd.service avahi-daemon.service %service_del_postun avahi-dnsconfd.service avahi-daemon.service
%pre autoipd %pre autoipd
@ -1007,7 +997,6 @@ fi
%{fillup_only -ns avahi autoipd} %{fillup_only -ns avahi autoipd}
# Change ownership of /var/lib/avahi-autoipd after upgrade from openSUSE <= 12.3 and SLE <= 11. # Change ownership of /var/lib/avahi-autoipd after upgrade from openSUSE <= 12.3 and SLE <= 11.
chown -R avahi-autoipd:avahi-autoipd %{_localstatedir}/lib/avahi-autoipd chown -R avahi-autoipd:avahi-autoipd %{_localstatedir}/lib/avahi-autoipd
%endif
%post -n libavahi-client3 -p /sbin/ldconfig %post -n libavahi-client3 -p /sbin/ldconfig
@ -1028,12 +1017,6 @@ chown -R avahi-autoipd:avahi-autoipd %{_localstatedir}/lib/avahi-autoipd
%post -n libhowl0 -p /sbin/ldconfig %post -n libhowl0 -p /sbin/ldconfig
%postun -n libhowl0 -p /sbin/ldconfig %postun -n libhowl0 -p /sbin/ldconfig
%preun -n python-avahi
%insserv_cleanup
%postun -n python-avahi
%insserv_cleanup
%endif %endif
%if %build_glib2 %if %build_glib2

13
avahi.changes
View File

@ -1,7 +1,18 @@
-------------------------------------------------------------------
Wed Feb 15 17:58:46 UTC 2017 - dimstar@opensuse.org
- Drop %insserv_cleanup scriptlets: it's been a while that avahi
did not install any sysV init scripts anymore.
- Simplify avahi_spec-prepare.sh: OBS is well able to handle macros
in package names by now.
- Drop conditions to only handle systemd services on openSUSE >
12.1; it's been long that we did not ship the sysv scripts
anymore and openSUSE 12.1 is long EOL.
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Jul 11 18:31:35 UTC 2016 - mgorse@suse.com Mon Jul 11 18:31:35 UTC 2016 - mgorse@suse.com
- Replace avahi-0.6.31-systemd-order.patch with - Replace avahi-0.6.31-systemd-order.patch with
avahi-0.6.32-suppress-resolv-conf-warning.patch: only warn avahi-0.6.32-suppress-resolv-conf-warning.patch: only warn
on missing resolv.conf if the options that use it are enabled. on missing resolv.conf if the options that use it are enabled.
https://github.com/lathiat/avahi/pull/63 https://github.com/lathiat/avahi/pull/63

33
avahi.spec
View File

@ -1,7 +1,7 @@
# #
# spec file for package avahi # spec file for package avahi
# #
# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -121,9 +121,7 @@ BuildRequires: doxygen
BuildRequires: graphviz BuildRequires: graphviz
BuildRequires: python-gdbm BuildRequires: python-gdbm
BuildRequires: zlib-devel BuildRequires: zlib-devel
%if %suse_version >= 1210
BuildRequires: pkgconfig(systemd) BuildRequires: pkgconfig(systemd)
%endif
# For python bindings and utilities: # For python bindings and utilities:
#BuildRequires: dbus-1-python #BuildRequires: dbus-1-python
#Requires: dbus-1 #Requires: dbus-1
@ -237,9 +235,9 @@ across LAN segments.
%package -n libdns_sd %package -n libdns_sd
Summary: mDNSResponder Compatibility Package for D-BUS Service for Zeroconf/Bonjour Summary: mDNSResponder Compatibility Package for D-BUS Service for Zeroconf/Bonjour
Group: System/Libraries
# mDNSResponder-lib used unversioned soname. # mDNSResponder-lib used unversioned soname.
# Provide full compatibility with mDNSResponder (FIXME: should be fixed in the package): # Provide full compatibility with mDNSResponder (FIXME: should be fixed in the package):
Group: System/Libraries
%ifarch ia64 x86_64 ppc64 s390x %ifarch ia64 x86_64 ppc64 s390x
Provides: libdns_sd.so()(64bit) Provides: libdns_sd.so()(64bit)
%else %else
@ -274,8 +272,8 @@ correct mDNS reflection across LAN segments.
%package -n libhowl0 %package -n libhowl0
Summary: Howl Compatibility Package for D-BUS Service for Zeroconf/Bonjour Summary: Howl Compatibility Package for D-BUS Service for Zeroconf/Bonjour
Group: System/Libraries
# Old name used for <= 10.3: # Old name used for <= 10.3:
Group: System/Libraries
Provides: avahi-compat-howl = %{version} Provides: avahi-compat-howl = %{version}
Obsoletes: avahi-compat-howl < %{version} Obsoletes: avahi-compat-howl < %{version}
@ -323,8 +321,8 @@ elsewhere, like correct mDNS reflection across LAN segments.
%package autoipd %package autoipd
Summary: IPv4LL Service for Zeroconf and Bonjour Summary: IPv4LL Service for Zeroconf and Bonjour
Group: Productivity/Networking/Other
# Split provides for upgrade from openSUSE <= 12.3 and SLE <= 11. # Split provides for upgrade from openSUSE <= 12.3 and SLE <= 11.
Group: Productivity/Networking/Other
Provides: avahi:%{_sbindir}/avahi-autoipd Provides: avahi:%{_sbindir}/avahi-autoipd
# Disable this conflict for now, it breaks staging, and it's pretty much obsolete, but can go back in if needed once a new version of avahi is released. # Disable this conflict for now, it breaks staging, and it's pretty much obsolete, but can go back in if needed once a new version of avahi is released.
# File conflict for avahi-autoipd openSUSE <= 12.3 SLE <= 11 # File conflict for avahi-autoipd openSUSE <= 12.3 SLE <= 11
@ -361,8 +359,8 @@ across LAN segments.
%package -n libavahi-devel %package -n libavahi-devel
Summary: Include Files and Libraries Mandatory for Development Summary: Include Files and Libraries Mandatory for Development
Group: Development/Libraries/C and C++
# #
Group: Development/Libraries/C and C++
Requires: %{_name} = %{version} Requires: %{_name} = %{version}
Requires: dbus-1-devel Requires: dbus-1-devel
Requires: glibc-devel Requires: glibc-devel
@ -469,8 +467,8 @@ across LAN segments.
%package -n libavahi-glib1 %package -n libavahi-glib1
Summary: Glib Bindings for avahi, the D-BUS Service for Zeroconf and Bonjour Summary: Glib Bindings for avahi, the D-BUS Service for Zeroconf and Bonjour
Group: System/Libraries
# Old name used for <= 10.3: # Old name used for <= 10.3:
Group: System/Libraries
Provides: avahi-glib = %{version} Provides: avahi-glib = %{version}
Obsoletes: avahi-glib < %{version} Obsoletes: avahi-glib < %{version}
@ -626,8 +624,8 @@ across LAN segments.
%package -n libavahi-qt3-1 %package -n libavahi-qt3-1
Summary: Qt3 Bindings for avahi, the D-BUS Service for Zeroconf and Bonjour Summary: Qt3 Bindings for avahi, the D-BUS Service for Zeroconf and Bonjour
Group: System/GUI/KDE
# Old name used for <= 10.3: # Old name used for <= 10.3:
Group: System/GUI/KDE
Provides: avahi-qt3 = %{version} Provides: avahi-qt3 = %{version}
Obsoletes: avahi-qt3 < %{version} Obsoletes: avahi-qt3 < %{version}
@ -675,8 +673,8 @@ correct mDNS reflection across LAN segments.
%package -n libavahi-qt4-1 %package -n libavahi-qt4-1
Summary: Qt4 Bindings for avahi, the D-BUS Service for Zeroconf and Bonjour Summary: Qt4 Bindings for avahi, the D-BUS Service for Zeroconf and Bonjour
Group: System/GUI/KDE
# Old name used for <= 10.3: # Old name used for <= 10.3:
Group: System/GUI/KDE
Provides: avahi-qt4 = %{version} Provides: avahi-qt4 = %{version}
Obsoletes: avahi-qt4 < %{version} Obsoletes: avahi-qt4 < %{version}
@ -967,9 +965,7 @@ rm $RPM_BUILD_ROOT%{_libdir}/pkgconfig/avahi-ui.pc
%pre %pre
%{_sbindir}/groupadd -r avahi 2> /dev/null || : %{_sbindir}/groupadd -r avahi 2> /dev/null || :
%{_sbindir}/useradd -r -s /bin/false -c "User for Avahi" -d /run/avahi-daemon -g avahi avahi 2> /dev/null || : %{_sbindir}/useradd -r -s /bin/false -c "User for Avahi" -d /run/avahi-daemon -g avahi avahi 2> /dev/null || :
%if %suse_version >= 1210
%service_add_pre avahi-dnsconfd.service avahi-daemon.service %service_add_pre avahi-dnsconfd.service avahi-daemon.service
%endif
# bnc#853845,bnc#851953: do not start by default under # bnc#853845,bnc#851953: do not start by default under
# sysconfig as this breaks vlan,bridge,bonding setups # sysconfig as this breaks vlan,bridge,bonding setups
# in pre to revert old default setting from template. # in pre to revert old default setting from template.
@ -985,18 +981,12 @@ fi
%post %post
%{fillup_only -n avahi} %{fillup_only -n avahi}
%{fillup_only -ns security checksig} %{fillup_only -ns security checksig}
%if %suse_version >= 1210
%service_add_post avahi-dnsconfd.service avahi-daemon.service %service_add_post avahi-dnsconfd.service avahi-daemon.service
%endif
%preun %preun
%if %suse_version >= 1210
%service_del_preun avahi-dnsconfd.service avahi-daemon.service %service_del_preun avahi-dnsconfd.service avahi-daemon.service
%endif
%postun %postun
%insserv_cleanup
%if %suse_version >= 1210
%service_del_postun avahi-dnsconfd.service avahi-daemon.service %service_del_postun avahi-dnsconfd.service avahi-daemon.service
%pre autoipd %pre autoipd
@ -1007,7 +997,6 @@ fi
%{fillup_only -ns avahi autoipd} %{fillup_only -ns avahi autoipd}
# Change ownership of /var/lib/avahi-autoipd after upgrade from openSUSE <= 12.3 and SLE <= 11. # Change ownership of /var/lib/avahi-autoipd after upgrade from openSUSE <= 12.3 and SLE <= 11.
chown -R avahi-autoipd:avahi-autoipd %{_localstatedir}/lib/avahi-autoipd chown -R avahi-autoipd:avahi-autoipd %{_localstatedir}/lib/avahi-autoipd
%endif
%post -n libavahi-client3 -p /sbin/ldconfig %post -n libavahi-client3 -p /sbin/ldconfig
@ -1028,12 +1017,6 @@ chown -R avahi-autoipd:avahi-autoipd %{_localstatedir}/lib/avahi-autoipd
%post -n libhowl0 -p /sbin/ldconfig %post -n libhowl0 -p /sbin/ldconfig
%postun -n libhowl0 -p /sbin/ldconfig %postun -n libhowl0 -p /sbin/ldconfig
%preun -n python-avahi
%insserv_cleanup
%postun -n python-avahi
%insserv_cleanup
%endif %endif
%if %build_glib2 %if %build_glib2

24
avahi_spec-prepare.sh
View File

@ -13,30 +13,6 @@ if ! test -f $1/$ORIG_SPEC.spec ; then
exit exit
fi fi
for PKGNAME in avahi-client avahi-common avahi-core avahi-ui avahi-glib avahi-gobject avahi-qt4 ; do
# Packages with name ending by number needs separator
if test x`echo $PKGNAME | sed "s/.*[0-9]$//"` = x ; then
SEPARATOR=-
else
SEPARATOR=
fi
sed -i "
1,/%changelog/ {
# Copy ${PKGNAME//-/_}_soname to hold space
/^%define ${PKGNAME//-/_}_soname / {
h;
s/^%define ${PKGNAME//-/_}_soname //;
x;
};
# Update ${PKGNAME}_soname everywhere
/$PKGNAME$SEPARATOR[0-9][0-9]*\([[:space:]].*\|\)\$/ {
G;
s/$PKGNAME$SEPARATOR[0-9][0-9]*\([[:space:]].*\|\)\n\(.*\)/$PKGNAME$SEPARATOR\2\1/;
};
};" $1/$ORIG_SPEC.spec
done
# Edit file to fit -mono build needs: # Edit file to fit -mono build needs:
sed ' sed '
s/spec file for package avahi/spec file for package avahi-mono/; s/spec file for package avahi/spec file for package avahi-mono/;