Accepting request 585257 from home:jengelh:branches:GNOME:Factory

- Rename %*soname to %*sover to better reflect its use.

OBS-URL: https://build.opensuse.org/request/show/585257
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/avahi?expand=0&rev=144
This commit is contained in:
Dominique Leuenberger 2018-03-12 10:48:32 +00:00 committed by Git OBS Bridge
parent f18ded8a5d
commit f3b8f6dffb
5 changed files with 86 additions and 80 deletions

View File

@ -27,17 +27,17 @@
%define build_mono 0 %define build_mono 0
%define build_qt3 0 %define build_qt3 0
%define build_qt4 0 %define build_qt4 0
%define avahi_client_soname 3 %define avahi_client_sover 3
%define avahi_common_soname 3 %define avahi_common_sover 3
%define avahi_core_soname 7 %define avahi_core_sover 7
%define avahi_ui_soname 0 %define avahi_ui_sover 0
%define avahi_glib_soname 1 %define avahi_glib_sover 1
%define avahi_gobject_soname 0 %define avahi_gobject_sover 0
%define avahi_gtk3_soname 0 %define avahi_gtk3_sover 0
%define avahi_qt3_soname 1 %define avahi_qt3_sover 1
%define avahi_qt4_soname 1 %define avahi_qt4_sover 1
%if %{build_glib2} %if %{build_glib2}
%define debug_package_requires libavahi-ui%{avahi_ui_soname} = %{version}-%{release} %define debug_package_requires libavahi-ui%{avahi_ui_sover} = %{version}-%{release}
%endif %endif
Name: avahi-glib2 Name: avahi-glib2
Version: 0.7 Version: 0.7
@ -45,7 +45,7 @@ Release: 0
Summary: D-BUS Service for Zeroconf and Bonjour Summary: D-BUS Service for Zeroconf and Bonjour
License: LGPL-2.1-or-later License: LGPL-2.1-or-later
Group: System/Daemons Group: System/Daemons
URL: http://www.avahi.org/ Url: http://www.avahi.org/
Source: http://avahi.org/download/%{_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 # 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 Source1: avahi-daemon-check-dns.sh
@ -217,9 +217,9 @@ across LAN segments.
Summary: mDNSResponder Compatibility Package for D-BUS Service for Zeroconf/Bonjour Summary: mDNSResponder Compatibility Package for D-BUS Service for Zeroconf/Bonjour
# 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
# #
# mDNSResponder-lib was used for <= 10.2: # mDNSResponder-lib was used for <= 10.2:
Group: System/Libraries
Provides: mDNSResponder-lib = 107.5 Provides: mDNSResponder-lib = 107.5
Obsoletes: mDNSResponder-lib < 107.5 Obsoletes: mDNSResponder-lib < 107.5
# Old name used for <= 10.3: # Old name used for <= 10.3:
@ -298,11 +298,11 @@ 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
# 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
# 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
#Conflicts: avahi <= 0.6.31-9.2 #Conflicts: avahi <= 0.6.31-9.2
# coreutils contains /usr/bin/chown # coreutils contains /usr/bin/chown
Group: Productivity/Networking/Other
Requires(post): coreutils Requires(post): coreutils
# shadow contains useradd and groupadd # shadow contains useradd and groupadd
Requires(pre): shadow Requires(pre): shadow
@ -424,11 +424,11 @@ It passes all tests in the Apple Bonjour conformance test suite. In
addition, it supports some nifty things, like correct mDNS reflection addition, it supports some nifty things, like correct mDNS reflection
across LAN segments. across LAN segments.
%package -n libavahi-ui-gtk3-%{avahi_gtk3_soname} %package -n libavahi-ui-gtk3-%{avahi_gtk3_sover}
Summary: D-BUS Service for Zeroconf and Bonjour Summary: D-BUS Service for Zeroconf and Bonjour
Group: System/Libraries Group: System/Libraries
%description -n libavahi-ui-gtk3-%{avahi_gtk3_soname} %description -n libavahi-ui-gtk3-%{avahi_gtk3_sover}
Avahi is an implementation of the DNS Service Discovery and Multicast Avahi is an implementation of the DNS Service Discovery and Multicast
DNS specifications for Zeroconf Computing. It uses D-BUS for DNS specifications for Zeroconf Computing. It uses D-BUS for
communication between user applications and a system daemon. The daemon communication between user applications and a system daemon. The daemon
@ -553,7 +553,7 @@ Summary: Include Files and Libraries Mandatory for Development
Group: Development/Libraries/C and C++ Group: Development/Libraries/C and C++
Requires: libavahi-devel = %{version} Requires: libavahi-devel = %{version}
Requires: libavahi-glib1 = %{version} Requires: libavahi-glib1 = %{version}
Requires: libavahi-ui-gtk3-%{avahi_gtk3_soname} = %{version} Requires: libavahi-ui-gtk3-%{avahi_gtk3_sover} = %{version}
Requires: libavahi-ui0 = %{version} Requires: libavahi-ui0 = %{version}
Requires: typelib-1_0-Avahi-0_6 = %{version} Requires: typelib-1_0-Avahi-0_6 = %{version}
# Last appeared in OpenSUSE 10.3: # Last appeared in OpenSUSE 10.3:
@ -986,8 +986,8 @@ chown -R avahi-autoipd:avahi-autoipd %{_localstatedir}/lib/avahi-autoipd
%if %{build_glib2} %if %{build_glib2}
%post -n libavahi-ui0 -p /sbin/ldconfig %post -n libavahi-ui0 -p /sbin/ldconfig
%postun -n libavahi-ui0 -p /sbin/ldconfig %postun -n libavahi-ui0 -p /sbin/ldconfig
%post -n libavahi-ui-gtk3-%{avahi_gtk3_soname} -p /sbin/ldconfig %post -n libavahi-ui-gtk3-%{avahi_gtk3_sover} -p /sbin/ldconfig
%postun -n libavahi-ui-gtk3-%{avahi_gtk3_soname} -p /sbin/ldconfig %postun -n libavahi-ui-gtk3-%{avahi_gtk3_sover} -p /sbin/ldconfig
%post -n libavahi-gobject0 -p /sbin/ldconfig %post -n libavahi-gobject0 -p /sbin/ldconfig
%postun -n libavahi-gobject0 -p /sbin/ldconfig %postun -n libavahi-gobject0 -p /sbin/ldconfig
%post -n libavahi-glib1 -p /sbin/ldconfig %post -n libavahi-glib1 -p /sbin/ldconfig
@ -1137,8 +1137,8 @@ chown -R avahi-autoipd:avahi-autoipd %{_localstatedir}/lib/avahi-autoipd
%files -n libavahi-ui0 %files -n libavahi-ui0
%{_libdir}/libavahi-ui.so.* %{_libdir}/libavahi-ui.so.*
%files -n libavahi-ui-gtk3-%{avahi_gtk3_soname} %files -n libavahi-ui-gtk3-%{avahi_gtk3_sover}
%{_libdir}/libavahi-ui-gtk3.so.%{avahi_gtk3_soname}* %{_libdir}/libavahi-ui-gtk3.so.%{avahi_gtk3_sover}*
%files -n libavahi-glib1 %files -n libavahi-glib1
%{_libdir}/libavahi-glib*.so.* %{_libdir}/libavahi-glib*.so.*

View File

@ -27,17 +27,17 @@
%define build_mono 1 %define build_mono 1
%define build_qt3 0 %define build_qt3 0
%define build_qt4 0 %define build_qt4 0
%define avahi_client_soname 3 %define avahi_client_sover 3
%define avahi_common_soname 3 %define avahi_common_sover 3
%define avahi_core_soname 7 %define avahi_core_sover 7
%define avahi_ui_soname 0 %define avahi_ui_sover 0
%define avahi_glib_soname 1 %define avahi_glib_sover 1
%define avahi_gobject_soname 0 %define avahi_gobject_sover 0
%define avahi_gtk3_soname 0 %define avahi_gtk3_sover 0
%define avahi_qt3_soname 1 %define avahi_qt3_sover 1
%define avahi_qt4_soname 1 %define avahi_qt4_sover 1
%if %{build_glib2} %if %{build_glib2}
%define debug_package_requires libavahi-ui%{avahi_ui_soname} = %{version}-%{release} %define debug_package_requires libavahi-ui%{avahi_ui_sover} = %{version}-%{release}
%endif %endif
Name: avahi-mono Name: avahi-mono
Version: 0.7 Version: 0.7
@ -45,7 +45,7 @@ Release: 0
Summary: Mono Bindings for avahi, the D-BUS Service for Zeroconf and Bonjour Summary: Mono Bindings for avahi, the D-BUS Service for Zeroconf and Bonjour
License: LGPL-2.1-or-later License: LGPL-2.1-or-later
Group: Development/Languages/Mono Group: Development/Languages/Mono
URL: http://www.avahi.org/ Url: http://www.avahi.org/
Source: http://avahi.org/download/%{_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 # 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 Source1: avahi-daemon-check-dns.sh
@ -216,9 +216,9 @@ across LAN segments.
Summary: mDNSResponder Compatibility Package for D-BUS Service for Zeroconf/Bonjour Summary: mDNSResponder Compatibility Package for D-BUS Service for Zeroconf/Bonjour
# 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
# #
# mDNSResponder-lib was used for <= 10.2: # mDNSResponder-lib was used for <= 10.2:
Group: System/Libraries
Provides: mDNSResponder-lib = 107.5 Provides: mDNSResponder-lib = 107.5
Obsoletes: mDNSResponder-lib < 107.5 Obsoletes: mDNSResponder-lib < 107.5
# Old name used for <= 10.3: # Old name used for <= 10.3:
@ -297,11 +297,11 @@ 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
# 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
# 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
#Conflicts: avahi <= 0.6.31-9.2 #Conflicts: avahi <= 0.6.31-9.2
# coreutils contains /usr/bin/chown # coreutils contains /usr/bin/chown
Group: Productivity/Networking/Other
Requires(post): coreutils Requires(post): coreutils
# shadow contains useradd and groupadd # shadow contains useradd and groupadd
Requires(pre): shadow Requires(pre): shadow
@ -423,11 +423,11 @@ It passes all tests in the Apple Bonjour conformance test suite. In
addition, it supports some nifty things, like correct mDNS reflection addition, it supports some nifty things, like correct mDNS reflection
across LAN segments. across LAN segments.
%package -n libavahi-ui-gtk3-%{avahi_gtk3_soname} %package -n libavahi-ui-gtk3-%{avahi_gtk3_sover}
Summary: D-BUS Service for Zeroconf and Bonjour Summary: D-BUS Service for Zeroconf and Bonjour
Group: System/Libraries Group: System/Libraries
%description -n libavahi-ui-gtk3-%{avahi_gtk3_soname} %description -n libavahi-ui-gtk3-%{avahi_gtk3_sover}
Avahi is an implementation of the DNS Service Discovery and Multicast Avahi is an implementation of the DNS Service Discovery and Multicast
DNS specifications for Zeroconf Computing. It uses D-BUS for DNS specifications for Zeroconf Computing. It uses D-BUS for
communication between user applications and a system daemon. The daemon communication between user applications and a system daemon. The daemon
@ -552,7 +552,7 @@ Summary: Include Files and Libraries Mandatory for Development
Group: Development/Libraries/C and C++ Group: Development/Libraries/C and C++
Requires: libavahi-devel = %{version} Requires: libavahi-devel = %{version}
Requires: libavahi-glib1 = %{version} Requires: libavahi-glib1 = %{version}
Requires: libavahi-ui-gtk3-%{avahi_gtk3_soname} = %{version} Requires: libavahi-ui-gtk3-%{avahi_gtk3_sover} = %{version}
Requires: libavahi-ui0 = %{version} Requires: libavahi-ui0 = %{version}
Requires: typelib-1_0-Avahi-0_6 = %{version} Requires: typelib-1_0-Avahi-0_6 = %{version}
# Last appeared in OpenSUSE 10.3: # Last appeared in OpenSUSE 10.3:
@ -699,6 +699,7 @@ correct mDNS reflection across LAN segments.
%package -n avahi-mono %package -n avahi-mono
Summary: Mono Bindings for avahi, the D-BUS Service for Zeroconf and Bonjour Summary: Mono Bindings for avahi, the D-BUS Service for Zeroconf and Bonjour
# FIXME: use correct group, see "https://en.opensuse.org/openSUSE:Package_group_guidelines" # FIXME: use correct group, see "https://en.opensuse.org/openSUSE:Package_group_guidelines"
License: LGPL-2.1-or-later
Group: Development/Languages/Mono Group: Development/Languages/Mono
Requires: gtk-sharp2 Requires: gtk-sharp2
Requires: libavahi-client3 >= %{version} Requires: libavahi-client3 >= %{version}
@ -985,8 +986,8 @@ chown -R avahi-autoipd:avahi-autoipd %{_localstatedir}/lib/avahi-autoipd
%if %{build_glib2} %if %{build_glib2}
%post -n libavahi-ui0 -p /sbin/ldconfig %post -n libavahi-ui0 -p /sbin/ldconfig
%postun -n libavahi-ui0 -p /sbin/ldconfig %postun -n libavahi-ui0 -p /sbin/ldconfig
%post -n libavahi-ui-gtk3-%{avahi_gtk3_soname} -p /sbin/ldconfig %post -n libavahi-ui-gtk3-%{avahi_gtk3_sover} -p /sbin/ldconfig
%postun -n libavahi-ui-gtk3-%{avahi_gtk3_soname} -p /sbin/ldconfig %postun -n libavahi-ui-gtk3-%{avahi_gtk3_sover} -p /sbin/ldconfig
%post -n libavahi-gobject0 -p /sbin/ldconfig %post -n libavahi-gobject0 -p /sbin/ldconfig
%postun -n libavahi-gobject0 -p /sbin/ldconfig %postun -n libavahi-gobject0 -p /sbin/ldconfig
%post -n libavahi-glib1 -p /sbin/ldconfig %post -n libavahi-glib1 -p /sbin/ldconfig
@ -1136,8 +1137,8 @@ chown -R avahi-autoipd:avahi-autoipd %{_localstatedir}/lib/avahi-autoipd
%files -n libavahi-ui0 %files -n libavahi-ui0
%{_libdir}/libavahi-ui.so.* %{_libdir}/libavahi-ui.so.*
%files -n libavahi-ui-gtk3-%{avahi_gtk3_soname} %files -n libavahi-ui-gtk3-%{avahi_gtk3_sover}
%{_libdir}/libavahi-ui-gtk3.so.%{avahi_gtk3_soname}* %{_libdir}/libavahi-ui-gtk3.so.%{avahi_gtk3_sover}*
%files -n libavahi-glib1 %files -n libavahi-glib1
%{_libdir}/libavahi-glib*.so.* %{_libdir}/libavahi-glib*.so.*

View File

@ -27,17 +27,17 @@
%define build_mono 0 %define build_mono 0
%define build_qt3 0 %define build_qt3 0
%define build_qt4 1 %define build_qt4 1
%define avahi_client_soname 3 %define avahi_client_sover 3
%define avahi_common_soname 3 %define avahi_common_sover 3
%define avahi_core_soname 7 %define avahi_core_sover 7
%define avahi_ui_soname 0 %define avahi_ui_sover 0
%define avahi_glib_soname 1 %define avahi_glib_sover 1
%define avahi_gobject_soname 0 %define avahi_gobject_sover 0
%define avahi_gtk3_soname 0 %define avahi_gtk3_sover 0
%define avahi_qt3_soname 1 %define avahi_qt3_sover 1
%define avahi_qt4_soname 1 %define avahi_qt4_sover 1
%if %{build_glib2} %if %{build_glib2}
%define debug_package_requires libavahi-ui%{avahi_ui_soname} = %{version}-%{release} %define debug_package_requires libavahi-ui%{avahi_ui_sover} = %{version}-%{release}
%endif %endif
Name: avahi-qt4 Name: avahi-qt4
Version: 0.7 Version: 0.7
@ -45,7 +45,7 @@ Release: 0
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
License: LGPL-2.1-or-later License: LGPL-2.1-or-later
Group: System/GUI/KDE Group: System/GUI/KDE
URL: http://www.avahi.org/ Url: http://www.avahi.org/
Source: http://avahi.org/download/%{_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 # 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 Source1: avahi-daemon-check-dns.sh
@ -219,9 +219,9 @@ across LAN segments.
Summary: mDNSResponder Compatibility Package for D-BUS Service for Zeroconf/Bonjour Summary: mDNSResponder Compatibility Package for D-BUS Service for Zeroconf/Bonjour
# 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
# #
# mDNSResponder-lib was used for <= 10.2: # mDNSResponder-lib was used for <= 10.2:
Group: System/Libraries
Provides: mDNSResponder-lib = 107.5 Provides: mDNSResponder-lib = 107.5
Obsoletes: mDNSResponder-lib < 107.5 Obsoletes: mDNSResponder-lib < 107.5
# Old name used for <= 10.3: # Old name used for <= 10.3:
@ -300,11 +300,11 @@ 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
# 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
# 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
#Conflicts: avahi <= 0.6.31-9.2 #Conflicts: avahi <= 0.6.31-9.2
# coreutils contains /usr/bin/chown # coreutils contains /usr/bin/chown
Group: Productivity/Networking/Other
Requires(post): coreutils Requires(post): coreutils
# shadow contains useradd and groupadd # shadow contains useradd and groupadd
Requires(pre): shadow Requires(pre): shadow
@ -426,11 +426,11 @@ It passes all tests in the Apple Bonjour conformance test suite. In
addition, it supports some nifty things, like correct mDNS reflection addition, it supports some nifty things, like correct mDNS reflection
across LAN segments. across LAN segments.
%package -n libavahi-ui-gtk3-%{avahi_gtk3_soname} %package -n libavahi-ui-gtk3-%{avahi_gtk3_sover}
Summary: D-BUS Service for Zeroconf and Bonjour Summary: D-BUS Service for Zeroconf and Bonjour
Group: System/Libraries Group: System/Libraries
%description -n libavahi-ui-gtk3-%{avahi_gtk3_soname} %description -n libavahi-ui-gtk3-%{avahi_gtk3_sover}
Avahi is an implementation of the DNS Service Discovery and Multicast Avahi is an implementation of the DNS Service Discovery and Multicast
DNS specifications for Zeroconf Computing. It uses D-BUS for DNS specifications for Zeroconf Computing. It uses D-BUS for
communication between user applications and a system daemon. The daemon communication between user applications and a system daemon. The daemon
@ -555,7 +555,7 @@ Summary: Include Files and Libraries Mandatory for Development
Group: Development/Libraries/C and C++ Group: Development/Libraries/C and C++
Requires: libavahi-devel = %{version} Requires: libavahi-devel = %{version}
Requires: libavahi-glib1 = %{version} Requires: libavahi-glib1 = %{version}
Requires: libavahi-ui-gtk3-%{avahi_gtk3_soname} = %{version} Requires: libavahi-ui-gtk3-%{avahi_gtk3_sover} = %{version}
Requires: libavahi-ui0 = %{version} Requires: libavahi-ui0 = %{version}
Requires: typelib-1_0-Avahi-0_6 = %{version} Requires: typelib-1_0-Avahi-0_6 = %{version}
# Last appeared in OpenSUSE 10.3: # Last appeared in OpenSUSE 10.3:
@ -988,8 +988,8 @@ chown -R avahi-autoipd:avahi-autoipd %{_localstatedir}/lib/avahi-autoipd
%if %{build_glib2} %if %{build_glib2}
%post -n libavahi-ui0 -p /sbin/ldconfig %post -n libavahi-ui0 -p /sbin/ldconfig
%postun -n libavahi-ui0 -p /sbin/ldconfig %postun -n libavahi-ui0 -p /sbin/ldconfig
%post -n libavahi-ui-gtk3-%{avahi_gtk3_soname} -p /sbin/ldconfig %post -n libavahi-ui-gtk3-%{avahi_gtk3_sover} -p /sbin/ldconfig
%postun -n libavahi-ui-gtk3-%{avahi_gtk3_soname} -p /sbin/ldconfig %postun -n libavahi-ui-gtk3-%{avahi_gtk3_sover} -p /sbin/ldconfig
%post -n libavahi-gobject0 -p /sbin/ldconfig %post -n libavahi-gobject0 -p /sbin/ldconfig
%postun -n libavahi-gobject0 -p /sbin/ldconfig %postun -n libavahi-gobject0 -p /sbin/ldconfig
%post -n libavahi-glib1 -p /sbin/ldconfig %post -n libavahi-glib1 -p /sbin/ldconfig
@ -1139,8 +1139,8 @@ chown -R avahi-autoipd:avahi-autoipd %{_localstatedir}/lib/avahi-autoipd
%files -n libavahi-ui0 %files -n libavahi-ui0
%{_libdir}/libavahi-ui.so.* %{_libdir}/libavahi-ui.so.*
%files -n libavahi-ui-gtk3-%{avahi_gtk3_soname} %files -n libavahi-ui-gtk3-%{avahi_gtk3_sover}
%{_libdir}/libavahi-ui-gtk3.so.%{avahi_gtk3_soname}* %{_libdir}/libavahi-ui-gtk3.so.%{avahi_gtk3_sover}*
%files -n libavahi-glib1 %files -n libavahi-glib1
%{_libdir}/libavahi-glib*.so.* %{_libdir}/libavahi-glib*.so.*

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Sat Mar 10 08:39:00 UTC 2018 - jengelh@inai.de
- Rename %*soname to %*sover to better reflect its use.
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Mar 6 16:57:37 UTC 2018 - dimstar@opensuse.org Tue Mar 6 16:57:37 UTC 2018 - dimstar@opensuse.org

View File

@ -29,17 +29,17 @@
%define build_mono 0 %define build_mono 0
%define build_qt3 0 %define build_qt3 0
%define build_qt4 0 %define build_qt4 0
%define avahi_client_soname 3 %define avahi_client_sover 3
%define avahi_common_soname 3 %define avahi_common_sover 3
%define avahi_core_soname 7 %define avahi_core_sover 7
%define avahi_ui_soname 0 %define avahi_ui_sover 0
%define avahi_glib_soname 1 %define avahi_glib_sover 1
%define avahi_gobject_soname 0 %define avahi_gobject_sover 0
%define avahi_gtk3_soname 0 %define avahi_gtk3_sover 0
%define avahi_qt3_soname 1 %define avahi_qt3_sover 1
%define avahi_qt4_soname 1 %define avahi_qt4_sover 1
%if %{build_glib2} %if %{build_glib2}
%define debug_package_requires libavahi-ui%{avahi_ui_soname} = %{version}-%{release} %define debug_package_requires libavahi-ui%{avahi_ui_sover} = %{version}-%{release}
%endif %endif
Name: avahi Name: avahi
Version: 0.7 Version: 0.7
@ -47,7 +47,7 @@ Release: 0
Summary: D-BUS Service for Zeroconf and Bonjour Summary: D-BUS Service for Zeroconf and Bonjour
License: LGPL-2.1-or-later License: LGPL-2.1-or-later
Group: System/Daemons Group: System/Daemons
URL: http://www.avahi.org/ Url: http://www.avahi.org/
Source: http://avahi.org/download/%{_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 # 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 Source1: avahi-daemon-check-dns.sh
@ -219,9 +219,9 @@ across LAN segments.
Summary: mDNSResponder Compatibility Package for D-BUS Service for Zeroconf/Bonjour Summary: mDNSResponder Compatibility Package for D-BUS Service for Zeroconf/Bonjour
# 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
# #
# mDNSResponder-lib was used for <= 10.2: # mDNSResponder-lib was used for <= 10.2:
Group: System/Libraries
Provides: mDNSResponder-lib = 107.5 Provides: mDNSResponder-lib = 107.5
Obsoletes: mDNSResponder-lib < 107.5 Obsoletes: mDNSResponder-lib < 107.5
# Old name used for <= 10.3: # Old name used for <= 10.3:
@ -300,11 +300,11 @@ 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
# 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
# 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
#Conflicts: avahi <= 0.6.31-9.2 #Conflicts: avahi <= 0.6.31-9.2
# coreutils contains /usr/bin/chown # coreutils contains /usr/bin/chown
Group: Productivity/Networking/Other
Requires(post): coreutils Requires(post): coreutils
# shadow contains useradd and groupadd # shadow contains useradd and groupadd
Requires(pre): shadow Requires(pre): shadow
@ -426,11 +426,11 @@ It passes all tests in the Apple Bonjour conformance test suite. In
addition, it supports some nifty things, like correct mDNS reflection addition, it supports some nifty things, like correct mDNS reflection
across LAN segments. across LAN segments.
%package -n libavahi-ui-gtk3-%{avahi_gtk3_soname} %package -n libavahi-ui-gtk3-%{avahi_gtk3_sover}
Summary: D-BUS Service for Zeroconf and Bonjour Summary: D-BUS Service for Zeroconf and Bonjour
Group: System/Libraries Group: System/Libraries
%description -n libavahi-ui-gtk3-%{avahi_gtk3_soname} %description -n libavahi-ui-gtk3-%{avahi_gtk3_sover}
Avahi is an implementation of the DNS Service Discovery and Multicast Avahi is an implementation of the DNS Service Discovery and Multicast
DNS specifications for Zeroconf Computing. It uses D-BUS for DNS specifications for Zeroconf Computing. It uses D-BUS for
communication between user applications and a system daemon. The daemon communication between user applications and a system daemon. The daemon
@ -555,7 +555,7 @@ Summary: Include Files and Libraries Mandatory for Development
Group: Development/Libraries/C and C++ Group: Development/Libraries/C and C++
Requires: libavahi-devel = %{version} Requires: libavahi-devel = %{version}
Requires: libavahi-glib1 = %{version} Requires: libavahi-glib1 = %{version}
Requires: libavahi-ui-gtk3-%{avahi_gtk3_soname} = %{version} Requires: libavahi-ui-gtk3-%{avahi_gtk3_sover} = %{version}
Requires: libavahi-ui0 = %{version} Requires: libavahi-ui0 = %{version}
Requires: typelib-1_0-Avahi-0_6 = %{version} Requires: typelib-1_0-Avahi-0_6 = %{version}
# Last appeared in OpenSUSE 10.3: # Last appeared in OpenSUSE 10.3:
@ -988,8 +988,8 @@ chown -R avahi-autoipd:avahi-autoipd %{_localstatedir}/lib/avahi-autoipd
%if %{build_glib2} %if %{build_glib2}
%post -n libavahi-ui0 -p /sbin/ldconfig %post -n libavahi-ui0 -p /sbin/ldconfig
%postun -n libavahi-ui0 -p /sbin/ldconfig %postun -n libavahi-ui0 -p /sbin/ldconfig
%post -n libavahi-ui-gtk3-%{avahi_gtk3_soname} -p /sbin/ldconfig %post -n libavahi-ui-gtk3-%{avahi_gtk3_sover} -p /sbin/ldconfig
%postun -n libavahi-ui-gtk3-%{avahi_gtk3_soname} -p /sbin/ldconfig %postun -n libavahi-ui-gtk3-%{avahi_gtk3_sover} -p /sbin/ldconfig
%post -n libavahi-gobject0 -p /sbin/ldconfig %post -n libavahi-gobject0 -p /sbin/ldconfig
%postun -n libavahi-gobject0 -p /sbin/ldconfig %postun -n libavahi-gobject0 -p /sbin/ldconfig
%post -n libavahi-glib1 -p /sbin/ldconfig %post -n libavahi-glib1 -p /sbin/ldconfig
@ -1139,8 +1139,8 @@ chown -R avahi-autoipd:avahi-autoipd %{_localstatedir}/lib/avahi-autoipd
%files -n libavahi-ui0 %files -n libavahi-ui0
%{_libdir}/libavahi-ui.so.* %{_libdir}/libavahi-ui.so.*
%files -n libavahi-ui-gtk3-%{avahi_gtk3_soname} %files -n libavahi-ui-gtk3-%{avahi_gtk3_sover}
%{_libdir}/libavahi-ui-gtk3.so.%{avahi_gtk3_soname}* %{_libdir}/libavahi-ui-gtk3.so.%{avahi_gtk3_sover}*
%files -n libavahi-glib1 %files -n libavahi-glib1
%{_libdir}/libavahi-glib*.so.* %{_libdir}/libavahi-glib*.so.*