Hello community,
here is the log from the commit of package avahi for openSUSE:Factory checked
in at 2017-03-01 23:39:23
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/avahi (Old)
and /work/SRC/openSUSE:Factory/.avahi.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "avahi"
Wed Mar 1 23:39:23 2017 rev:117 rq:458734 version:0.6.32
Changes:
--------
avahi-mono.changes: same change
avahi-qt4.changes: same change
--- /work/SRC/openSUSE:Factory/avahi/avahi.changes 2016-07-21
07:52:33.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.avahi.new/avahi.changes 2017-03-01
23:39:24.912999676 +0100
@@ -1,0 +2,11 @@
+Wed Feb 15 17:58:46 UTC 2017 - dims...@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.
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ avahi-glib2.spec ++++++
--- /var/tmp/diff_new_pack.vFvMuW/_old 2017-03-01 23:39:26.128828214 +0100
+++ /var/tmp/diff_new_pack.vFvMuW/_new 2017-03-01 23:39:26.128828214 +0100
@@ -1,7 +1,7 @@
#
# 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
# remain the property of their copyright owners, unless otherwise agreed
@@ -119,9 +119,7 @@
BuildRequires: graphviz
BuildRequires: python-gdbm
BuildRequires: zlib-devel
-%if %suse_version >= 1210
BuildRequires: pkgconfig(systemd)
-%endif
# For python bindings and utilities:
#BuildRequires: dbus-1-python
#Requires: dbus-1
@@ -235,9 +233,9 @@
%package -n libdns_sd
Summary: mDNSResponder Compatibility Package for D-BUS Service for
Zeroconf/Bonjour
-Group: System/Libraries
# mDNSResponder-lib used unversioned soname.
# Provide full compatibility with mDNSResponder (FIXME: should be fixed in the
package):
+Group: System/Libraries
%ifarch ia64 x86_64 ppc64 s390x
Provides: libdns_sd.so()(64bit)
%else
@@ -272,8 +270,8 @@
%package -n libhowl0
Summary: Howl Compatibility Package for D-BUS Service for
Zeroconf/Bonjour
-Group: System/Libraries
# Old name used for <= 10.3:
+Group: System/Libraries
Provides: avahi-compat-howl = %{version}
Obsoletes: avahi-compat-howl < %{version}
@@ -321,8 +319,8 @@
%package autoipd
Summary: IPv4LL Service for Zeroconf and Bonjour
-Group: Productivity/Networking/Other
# Split provides for upgrade from openSUSE <= 12.3 and SLE <= 11.
+Group: Productivity/Networking/Other
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.
# File conflict for avahi-autoipd openSUSE <= 12.3 SLE <= 11
@@ -359,8 +357,8 @@
%package -n libavahi-devel
Summary: Include Files and Libraries Mandatory for Development
-Group: Development/Libraries/C and C++
#
+Group: Development/Libraries/C and C++
Requires: %{_name} = %{version}
Requires: dbus-1-devel
Requires: glibc-devel
@@ -467,8 +465,8 @@
%package -n libavahi-glib1
Summary: Glib Bindings for avahi, the D-BUS Service for Zeroconf and
Bonjour
-Group: System/Libraries
# Old name used for <= 10.3:
+Group: System/Libraries
Provides: avahi-glib = %{version}
Obsoletes: avahi-glib < %{version}
@@ -624,8 +622,8 @@
%package -n libavahi-qt3-1
Summary: Qt3 Bindings for avahi, the D-BUS Service for Zeroconf and
Bonjour
-Group: System/GUI/KDE
# Old name used for <= 10.3:
+Group: System/GUI/KDE
Provides: avahi-qt3 = %{version}
Obsoletes: avahi-qt3 < %{version}
@@ -673,8 +671,8 @@
%package -n libavahi-qt4-1
Summary: Qt4 Bindings for avahi, the D-BUS Service for Zeroconf and
Bonjour
-Group: System/GUI/KDE
# Old name used for <= 10.3:
+Group: System/GUI/KDE
Provides: avahi-qt4 = %{version}
Obsoletes: avahi-qt4 < %{version}
@@ -965,9 +963,7 @@
%pre
%{_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 || :
-%if %suse_version >= 1210
%service_add_pre avahi-dnsconfd.service avahi-daemon.service
-%endif
# bnc#853845,bnc#851953: do not start by default under
# sysconfig as this breaks vlan,bridge,bonding setups
# in pre to revert old default setting from template.
@@ -983,18 +979,12 @@
%post
%{fillup_only -n avahi}
%{fillup_only -ns security checksig}
-%if %suse_version >= 1210
%service_add_post avahi-dnsconfd.service avahi-daemon.service
-%endif
%preun
-%if %suse_version >= 1210
%service_del_preun avahi-dnsconfd.service avahi-daemon.service
-%endif
%postun
-%insserv_cleanup
-%if %suse_version >= 1210
%service_del_postun avahi-dnsconfd.service avahi-daemon.service
%pre autoipd
@@ -1005,7 +995,6 @@
%{fillup_only -ns avahi autoipd}
# 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
-%endif
%post -n libavahi-client3 -p /sbin/ldconfig
@@ -1026,12 +1015,6 @@
%post -n libhowl0 -p /sbin/ldconfig
%postun -n libhowl0 -p /sbin/ldconfig
-
-%preun -n python-avahi
-%insserv_cleanup
-
-%postun -n python-avahi
-%insserv_cleanup
%endif
%if %build_glib2
avahi-mono.spec: same change
++++++ avahi-qt4.spec ++++++
--- /var/tmp/diff_new_pack.vFvMuW/_old 2017-03-01 23:39:26.188819754 +0100
+++ /var/tmp/diff_new_pack.vFvMuW/_new 2017-03-01 23:39:26.192819190 +0100
@@ -1,7 +1,7 @@
#
# 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
# remain the property of their copyright owners, unless otherwise agreed
@@ -119,9 +119,7 @@
BuildRequires: graphviz
BuildRequires: python-gdbm
BuildRequires: zlib-devel
-%if %suse_version >= 1210
BuildRequires: pkgconfig(systemd)
-%endif
# For python bindings and utilities:
#BuildRequires: dbus-1-python
#Requires: dbus-1
@@ -237,9 +235,9 @@
%package -n libdns_sd
Summary: mDNSResponder Compatibility Package for D-BUS Service for
Zeroconf/Bonjour
-Group: System/Libraries
# mDNSResponder-lib used unversioned soname.
# Provide full compatibility with mDNSResponder (FIXME: should be fixed in the
package):
+Group: System/Libraries
%ifarch ia64 x86_64 ppc64 s390x
Provides: libdns_sd.so()(64bit)
%else
@@ -274,8 +272,8 @@
%package -n libhowl0
Summary: Howl Compatibility Package for D-BUS Service for
Zeroconf/Bonjour
-Group: System/Libraries
# Old name used for <= 10.3:
+Group: System/Libraries
Provides: avahi-compat-howl = %{version}
Obsoletes: avahi-compat-howl < %{version}
@@ -323,8 +321,8 @@
%package autoipd
Summary: IPv4LL Service for Zeroconf and Bonjour
-Group: Productivity/Networking/Other
# Split provides for upgrade from openSUSE <= 12.3 and SLE <= 11.
+Group: Productivity/Networking/Other
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.
# File conflict for avahi-autoipd openSUSE <= 12.3 SLE <= 11
@@ -361,8 +359,8 @@
%package -n libavahi-devel
Summary: Include Files and Libraries Mandatory for Development
-Group: Development/Libraries/C and C++
#
+Group: Development/Libraries/C and C++
Requires: %{_name} = %{version}
Requires: dbus-1-devel
Requires: glibc-devel
@@ -469,8 +467,8 @@
%package -n libavahi-glib1
Summary: Glib Bindings for avahi, the D-BUS Service for Zeroconf and
Bonjour
-Group: System/Libraries
# Old name used for <= 10.3:
+Group: System/Libraries
Provides: avahi-glib = %{version}
Obsoletes: avahi-glib < %{version}
@@ -626,8 +624,8 @@
%package -n libavahi-qt3-1
Summary: Qt3 Bindings for avahi, the D-BUS Service for Zeroconf and
Bonjour
-Group: System/GUI/KDE
# Old name used for <= 10.3:
+Group: System/GUI/KDE
Provides: avahi-qt3 = %{version}
Obsoletes: avahi-qt3 < %{version}
@@ -675,8 +673,8 @@
%package -n libavahi-qt4-1
Summary: Qt4 Bindings for avahi, the D-BUS Service for Zeroconf and
Bonjour
-Group: System/GUI/KDE
# Old name used for <= 10.3:
+Group: System/GUI/KDE
Provides: avahi-qt4 = %{version}
Obsoletes: avahi-qt4 < %{version}
@@ -967,9 +965,7 @@
%pre
%{_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 || :
-%if %suse_version >= 1210
%service_add_pre avahi-dnsconfd.service avahi-daemon.service
-%endif
# bnc#853845,bnc#851953: do not start by default under
# sysconfig as this breaks vlan,bridge,bonding setups
# in pre to revert old default setting from template.
@@ -985,18 +981,12 @@
%post
%{fillup_only -n avahi}
%{fillup_only -ns security checksig}
-%if %suse_version >= 1210
%service_add_post avahi-dnsconfd.service avahi-daemon.service
-%endif
%preun
-%if %suse_version >= 1210
%service_del_preun avahi-dnsconfd.service avahi-daemon.service
-%endif
%postun
-%insserv_cleanup
-%if %suse_version >= 1210
%service_del_postun avahi-dnsconfd.service avahi-daemon.service
%pre autoipd
@@ -1007,7 +997,6 @@
%{fillup_only -ns avahi autoipd}
# 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
-%endif
%post -n libavahi-client3 -p /sbin/ldconfig
@@ -1028,12 +1017,6 @@
%post -n libhowl0 -p /sbin/ldconfig
%postun -n libhowl0 -p /sbin/ldconfig
-
-%preun -n python-avahi
-%insserv_cleanup
-
-%postun -n python-avahi
-%insserv_cleanup
%endif
%if %build_glib2
++++++ avahi.spec ++++++
--- /var/tmp/diff_new_pack.vFvMuW/_old 2017-03-01 23:39:26.220815242 +0100
+++ /var/tmp/diff_new_pack.vFvMuW/_new 2017-03-01 23:39:26.220815242 +0100
@@ -1,7 +1,7 @@
#
# 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
# remain the property of their copyright owners, unless otherwise agreed
@@ -121,9 +121,7 @@
BuildRequires: graphviz
BuildRequires: python-gdbm
BuildRequires: zlib-devel
-%if %suse_version >= 1210
BuildRequires: pkgconfig(systemd)
-%endif
# For python bindings and utilities:
#BuildRequires: dbus-1-python
#Requires: dbus-1
@@ -237,9 +235,9 @@
%package -n libdns_sd
Summary: mDNSResponder Compatibility Package for D-BUS Service for
Zeroconf/Bonjour
-Group: System/Libraries
# mDNSResponder-lib used unversioned soname.
# Provide full compatibility with mDNSResponder (FIXME: should be fixed in the
package):
+Group: System/Libraries
%ifarch ia64 x86_64 ppc64 s390x
Provides: libdns_sd.so()(64bit)
%else
@@ -274,8 +272,8 @@
%package -n libhowl0
Summary: Howl Compatibility Package for D-BUS Service for
Zeroconf/Bonjour
-Group: System/Libraries
# Old name used for <= 10.3:
+Group: System/Libraries
Provides: avahi-compat-howl = %{version}
Obsoletes: avahi-compat-howl < %{version}
@@ -323,8 +321,8 @@
%package autoipd
Summary: IPv4LL Service for Zeroconf and Bonjour
-Group: Productivity/Networking/Other
# Split provides for upgrade from openSUSE <= 12.3 and SLE <= 11.
+Group: Productivity/Networking/Other
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.
# File conflict for avahi-autoipd openSUSE <= 12.3 SLE <= 11
@@ -361,8 +359,8 @@
%package -n libavahi-devel
Summary: Include Files and Libraries Mandatory for Development
-Group: Development/Libraries/C and C++
#
+Group: Development/Libraries/C and C++
Requires: %{_name} = %{version}
Requires: dbus-1-devel
Requires: glibc-devel
@@ -469,8 +467,8 @@
%package -n libavahi-glib1
Summary: Glib Bindings for avahi, the D-BUS Service for Zeroconf and
Bonjour
-Group: System/Libraries
# Old name used for <= 10.3:
+Group: System/Libraries
Provides: avahi-glib = %{version}
Obsoletes: avahi-glib < %{version}
@@ -626,8 +624,8 @@
%package -n libavahi-qt3-1
Summary: Qt3 Bindings for avahi, the D-BUS Service for Zeroconf and
Bonjour
-Group: System/GUI/KDE
# Old name used for <= 10.3:
+Group: System/GUI/KDE
Provides: avahi-qt3 = %{version}
Obsoletes: avahi-qt3 < %{version}
@@ -675,8 +673,8 @@
%package -n libavahi-qt4-1
Summary: Qt4 Bindings for avahi, the D-BUS Service for Zeroconf and
Bonjour
-Group: System/GUI/KDE
# Old name used for <= 10.3:
+Group: System/GUI/KDE
Provides: avahi-qt4 = %{version}
Obsoletes: avahi-qt4 < %{version}
@@ -967,9 +965,7 @@
%pre
%{_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 || :
-%if %suse_version >= 1210
%service_add_pre avahi-dnsconfd.service avahi-daemon.service
-%endif
# bnc#853845,bnc#851953: do not start by default under
# sysconfig as this breaks vlan,bridge,bonding setups
# in pre to revert old default setting from template.
@@ -985,18 +981,12 @@
%post
%{fillup_only -n avahi}
%{fillup_only -ns security checksig}
-%if %suse_version >= 1210
%service_add_post avahi-dnsconfd.service avahi-daemon.service
-%endif
%preun
-%if %suse_version >= 1210
%service_del_preun avahi-dnsconfd.service avahi-daemon.service
-%endif
%postun
-%insserv_cleanup
-%if %suse_version >= 1210
%service_del_postun avahi-dnsconfd.service avahi-daemon.service
%pre autoipd
@@ -1007,7 +997,6 @@
%{fillup_only -ns avahi autoipd}
# 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
-%endif
%post -n libavahi-client3 -p /sbin/ldconfig
@@ -1028,12 +1017,6 @@
%post -n libhowl0 -p /sbin/ldconfig
%postun -n libhowl0 -p /sbin/ldconfig
-
-%preun -n python-avahi
-%insserv_cleanup
-
-%postun -n python-avahi
-%insserv_cleanup
%endif
%if %build_glib2
++++++ avahi_spec-prepare.sh ++++++
--- /var/tmp/diff_new_pack.vFvMuW/_old 2017-03-01 23:39:26.432785349 +0100
+++ /var/tmp/diff_new_pack.vFvMuW/_new 2017-03-01 23:39:26.432785349 +0100
@@ -13,30 +13,6 @@
exit
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:
sed '
s/spec file for package avahi/spec file for package avahi-mono/;
