Hello community, here is the log from the commit of package avahi for openSUSE:Factory checked in at 2016-02-25 21:58:14 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/avahi (Old) and /work/SRC/openSUSE:Factory/.avahi.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "avahi" Changes: -------- avahi-mono.changes: same change avahi-qt4.changes: same change --- /work/SRC/openSUSE:Factory/avahi/avahi.changes 2015-10-25 19:12:12.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.avahi.new/avahi.changes 2016-02-25 22:35:33.000000000 +0100 @@ -1,0 +2,7 @@ +Mon Jan 25 13:58:10 UTC 2016 - [email protected] + +- No longer install sysv services: the systemd services have been + installed for a long time already and are masking the sysv + scripts; those scripts existance only add confusion (boo#959908). + +------------------------------------------------------------------- Old: ---- avahi-bookmarks.init ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ avahi-glib2.spec ++++++ --- /var/tmp/diff_new_pack.SBIyI1/_old 2016-02-25 22:35:35.000000000 +0100 +++ /var/tmp/diff_new_pack.SBIyI1/_new 2016-02-25 22:35:35.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package avahi-glib2 # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 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 @@ -55,7 +55,6 @@ 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 -Source2: avahi-bookmarks.init Source3: avahi.firewall # Copy of glib-2.0.m4 from glib2-devel to not depend on glib2-devel. Source4: avahi-glib-gettext.m4 @@ -887,6 +886,8 @@ cd ../avahi-ui-sharp %endif %makeinstall +# do not install sysv init scripts +rm -rf %{buildroot}%{_sysconfdir}/init.d/ %if !%build_core cd .. make %{?_smp_mflags} install-pkgconfigDATA DESTDIR=$RPM_BUILD_ROOT @@ -916,11 +917,9 @@ sed -i "s,$RPM_BUILD_DIR,/," $RPM_BUILD_ROOT%{_libdir}/libavahi-qt4.la %endif mkdir -p $RPM_BUILD_ROOT%{_sbindir} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services -install %{S:2} $RPM_BUILD_ROOT%{_sysconfdir}/init.d/avahi-bookmarks -ln -s %{_sysconfdir}/init.d/avahi-daemon $RPM_BUILD_ROOT%{_sbindir}/rcavahi-daemon -ln -s %{_sysconfdir}/init.d/avahi-dnsconfd $RPM_BUILD_ROOT%{_sbindir}/rcavahi-dnsconfd +ln -s %{_sbindir}/service $RPM_BUILD_ROOT%{_sbindir}/rcavahi-daemon +ln -s %{_sbindir}/service $RPM_BUILD_ROOT%{_sbindir}/rcavahi-dnsconfd install -m 644 %{S:3} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/avahi -ln -s %{_sysconfdir}/init.d/avahi-bookmarks $RPM_BUILD_ROOT%{_sbindir}/rcavahi-bookmarks install -d $RPM_BUILD_ROOT%{_datadir}/pixmaps install -d $RPM_BUILD_ROOT/var/adm/fillup-templates install -m 644 sysconfig.avahi* $RPM_BUILD_ROOT/var/adm/fillup-templates/ @@ -996,22 +995,16 @@ %post %{fillup_only -n avahi} %{fillup_only -ns security checksig} -%{fillup_and_insserv -f -y avahi-daemon} -%{fillup_and_insserv -f avahi-dnsconfd} %if %suse_version >= 1210 %service_add_post avahi-dnsconfd.service avahi-daemon.service %endif %preun -%{stop_on_removal avahi-daemon} -%{stop_on_removal avahi-dnsconfd} %if %suse_version >= 1210 %service_del_preun avahi-dnsconfd.service avahi-daemon.service %endif %postun -%{restart_on_update avahi-daemon} -%{restart_on_update avahi-dnsconfd} %insserv_cleanup %if %suse_version >= 1210 %service_del_postun avahi-dnsconfd.service avahi-daemon.service @@ -1046,31 +1039,10 @@ %postun -n libhowl0 -p /sbin/ldconfig -%pre -n python-avahi -# For update from == 10.3: -# Restart will not happen due to package rename. Handle it. -if test etc/init.d/avahi-bookmarks -a "$1" = 1 ; then - touch var/adm/python_avahi_needs_restart -fi - -%post -n python-avahi -# For update from == 10.3: -# Restart will not happen due to package rename. Handle it. -if test -f var/adm/python_avahi_needs_restart ; then - rm var/adm/python_avahi_needs_restart - test -f /etc/sysconfig/services && . /etc/sysconfig/services - if test "$YAST_IS_RUNNING" != "instsys" -a "$DISABLE_RESTART_ON_UPDATE" != yes ; then - /etc/init.d/avahi-bookmarks try-restart > /dev/null || : - fi -fi - %preun -n python-avahi -# FIXME: Package was renamed, check for this case! -%{stop_on_removal avahi-bookmarks} %insserv_cleanup %postun -n python-avahi -%{restart_on_update avahi-bookmarks} %insserv_cleanup %endif %if %build_glib2 @@ -1141,8 +1113,6 @@ %{_sysconfdir}/avahi/services/*.service %config(noreplace) %{_sysconfdir}/avahi/hosts %{_sysconfdir}/dbus-1/system.d/*.conf -%{_sysconfdir}/init.d/avahi-dnsconfd -%{_sysconfdir}/init.d/avahi-daemon %{_datadir}/dbus-1/interfaces/org.freedesktop.Avahi.*.xml %{_datadir}/dbus-1/system-services/org.freedesktop.Avahi.service %dir %{_prefix}/lib/avahi @@ -1185,8 +1155,6 @@ %defattr(-,root,root) %{_bindir}/avahi-bookmarks %doc %{_mandir}/man1/avahi-bookmarks.1* -%{_sbindir}/rcavahi-bookmarks -%{_sysconfdir}/init.d/avahi-bookmarks %dir %{python_sitelib}/avahi %{python_sitelib}/avahi/__init__.py* %{python_sitelib}/avahi/ServiceTypeDatabase.py avahi-mono.spec: same change ++++++ avahi-qt4.spec ++++++ --- /var/tmp/diff_new_pack.SBIyI1/_old 2016-02-25 22:35:35.000000000 +0100 +++ /var/tmp/diff_new_pack.SBIyI1/_new 2016-02-25 22:35:35.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package avahi-qt4 # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 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 @@ -55,7 +55,6 @@ 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 -Source2: avahi-bookmarks.init Source3: avahi.firewall # Copy of glib-2.0.m4 from glib2-devel to not depend on glib2-devel. Source4: avahi-glib-gettext.m4 @@ -889,6 +888,8 @@ cd ../avahi-ui-sharp %endif %makeinstall +# do not install sysv init scripts +rm -rf %{buildroot}%{_sysconfdir}/init.d/ %if !%build_core cd .. make %{?_smp_mflags} install-pkgconfigDATA DESTDIR=$RPM_BUILD_ROOT @@ -918,11 +919,9 @@ sed -i "s,$RPM_BUILD_DIR,/," $RPM_BUILD_ROOT%{_libdir}/libavahi-qt4.la %endif mkdir -p $RPM_BUILD_ROOT%{_sbindir} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services -install %{S:2} $RPM_BUILD_ROOT%{_sysconfdir}/init.d/avahi-bookmarks -ln -s %{_sysconfdir}/init.d/avahi-daemon $RPM_BUILD_ROOT%{_sbindir}/rcavahi-daemon -ln -s %{_sysconfdir}/init.d/avahi-dnsconfd $RPM_BUILD_ROOT%{_sbindir}/rcavahi-dnsconfd +ln -s %{_sbindir}/service $RPM_BUILD_ROOT%{_sbindir}/rcavahi-daemon +ln -s %{_sbindir}/service $RPM_BUILD_ROOT%{_sbindir}/rcavahi-dnsconfd install -m 644 %{S:3} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/avahi -ln -s %{_sysconfdir}/init.d/avahi-bookmarks $RPM_BUILD_ROOT%{_sbindir}/rcavahi-bookmarks install -d $RPM_BUILD_ROOT%{_datadir}/pixmaps install -d $RPM_BUILD_ROOT/var/adm/fillup-templates install -m 644 sysconfig.avahi* $RPM_BUILD_ROOT/var/adm/fillup-templates/ @@ -998,22 +997,16 @@ %post %{fillup_only -n avahi} %{fillup_only -ns security checksig} -%{fillup_and_insserv -f -y avahi-daemon} -%{fillup_and_insserv -f avahi-dnsconfd} %if %suse_version >= 1210 %service_add_post avahi-dnsconfd.service avahi-daemon.service %endif %preun -%{stop_on_removal avahi-daemon} -%{stop_on_removal avahi-dnsconfd} %if %suse_version >= 1210 %service_del_preun avahi-dnsconfd.service avahi-daemon.service %endif %postun -%{restart_on_update avahi-daemon} -%{restart_on_update avahi-dnsconfd} %insserv_cleanup %if %suse_version >= 1210 %service_del_postun avahi-dnsconfd.service avahi-daemon.service @@ -1048,31 +1041,10 @@ %postun -n libhowl0 -p /sbin/ldconfig -%pre -n python-avahi -# For update from == 10.3: -# Restart will not happen due to package rename. Handle it. -if test etc/init.d/avahi-bookmarks -a "$1" = 1 ; then - touch var/adm/python_avahi_needs_restart -fi - -%post -n python-avahi -# For update from == 10.3: -# Restart will not happen due to package rename. Handle it. -if test -f var/adm/python_avahi_needs_restart ; then - rm var/adm/python_avahi_needs_restart - test -f /etc/sysconfig/services && . /etc/sysconfig/services - if test "$YAST_IS_RUNNING" != "instsys" -a "$DISABLE_RESTART_ON_UPDATE" != yes ; then - /etc/init.d/avahi-bookmarks try-restart > /dev/null || : - fi -fi - %preun -n python-avahi -# FIXME: Package was renamed, check for this case! -%{stop_on_removal avahi-bookmarks} %insserv_cleanup %postun -n python-avahi -%{restart_on_update avahi-bookmarks} %insserv_cleanup %endif %if %build_glib2 @@ -1143,8 +1115,6 @@ %{_sysconfdir}/avahi/services/*.service %config(noreplace) %{_sysconfdir}/avahi/hosts %{_sysconfdir}/dbus-1/system.d/*.conf -%{_sysconfdir}/init.d/avahi-dnsconfd -%{_sysconfdir}/init.d/avahi-daemon %{_datadir}/dbus-1/interfaces/org.freedesktop.Avahi.*.xml %{_datadir}/dbus-1/system-services/org.freedesktop.Avahi.service %dir %{_prefix}/lib/avahi @@ -1187,8 +1157,6 @@ %defattr(-,root,root) %{_bindir}/avahi-bookmarks %doc %{_mandir}/man1/avahi-bookmarks.1* -%{_sbindir}/rcavahi-bookmarks -%{_sysconfdir}/init.d/avahi-bookmarks %dir %{python_sitelib}/avahi %{python_sitelib}/avahi/__init__.py* %{python_sitelib}/avahi/ServiceTypeDatabase.py ++++++ avahi.spec ++++++ --- /var/tmp/diff_new_pack.SBIyI1/_old 2016-02-25 22:35:35.000000000 +0100 +++ /var/tmp/diff_new_pack.SBIyI1/_new 2016-02-25 22:35:35.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package avahi # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 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 @@ -57,7 +57,6 @@ 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 -Source2: avahi-bookmarks.init Source3: avahi.firewall # Copy of glib-2.0.m4 from glib2-devel to not depend on glib2-devel. Source4: avahi-glib-gettext.m4 @@ -889,6 +888,8 @@ cd ../avahi-ui-sharp %endif %makeinstall +# do not install sysv init scripts +rm -rf %{buildroot}%{_sysconfdir}/init.d/ %if !%build_core cd .. make %{?_smp_mflags} install-pkgconfigDATA DESTDIR=$RPM_BUILD_ROOT @@ -918,11 +919,9 @@ sed -i "s,$RPM_BUILD_DIR,/," $RPM_BUILD_ROOT%{_libdir}/libavahi-qt4.la %endif mkdir -p $RPM_BUILD_ROOT%{_sbindir} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services -install %{S:2} $RPM_BUILD_ROOT%{_sysconfdir}/init.d/avahi-bookmarks -ln -s %{_sysconfdir}/init.d/avahi-daemon $RPM_BUILD_ROOT%{_sbindir}/rcavahi-daemon -ln -s %{_sysconfdir}/init.d/avahi-dnsconfd $RPM_BUILD_ROOT%{_sbindir}/rcavahi-dnsconfd +ln -s %{_sbindir}/service $RPM_BUILD_ROOT%{_sbindir}/rcavahi-daemon +ln -s %{_sbindir}/service $RPM_BUILD_ROOT%{_sbindir}/rcavahi-dnsconfd install -m 644 %{S:3} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/avahi -ln -s %{_sysconfdir}/init.d/avahi-bookmarks $RPM_BUILD_ROOT%{_sbindir}/rcavahi-bookmarks install -d $RPM_BUILD_ROOT%{_datadir}/pixmaps install -d $RPM_BUILD_ROOT/var/adm/fillup-templates install -m 644 sysconfig.avahi* $RPM_BUILD_ROOT/var/adm/fillup-templates/ @@ -998,22 +997,16 @@ %post %{fillup_only -n avahi} %{fillup_only -ns security checksig} -%{fillup_and_insserv -f -y avahi-daemon} -%{fillup_and_insserv -f avahi-dnsconfd} %if %suse_version >= 1210 %service_add_post avahi-dnsconfd.service avahi-daemon.service %endif %preun -%{stop_on_removal avahi-daemon} -%{stop_on_removal avahi-dnsconfd} %if %suse_version >= 1210 %service_del_preun avahi-dnsconfd.service avahi-daemon.service %endif %postun -%{restart_on_update avahi-daemon} -%{restart_on_update avahi-dnsconfd} %insserv_cleanup %if %suse_version >= 1210 %service_del_postun avahi-dnsconfd.service avahi-daemon.service @@ -1048,31 +1041,10 @@ %postun -n libhowl0 -p /sbin/ldconfig -%pre -n python-avahi -# For update from == 10.3: -# Restart will not happen due to package rename. Handle it. -if test etc/init.d/avahi-bookmarks -a "$1" = 1 ; then - touch var/adm/python_avahi_needs_restart -fi - -%post -n python-avahi -# For update from == 10.3: -# Restart will not happen due to package rename. Handle it. -if test -f var/adm/python_avahi_needs_restart ; then - rm var/adm/python_avahi_needs_restart - test -f /etc/sysconfig/services && . /etc/sysconfig/services - if test "$YAST_IS_RUNNING" != "instsys" -a "$DISABLE_RESTART_ON_UPDATE" != yes ; then - /etc/init.d/avahi-bookmarks try-restart > /dev/null || : - fi -fi - %preun -n python-avahi -# FIXME: Package was renamed, check for this case! -%{stop_on_removal avahi-bookmarks} %insserv_cleanup %postun -n python-avahi -%{restart_on_update avahi-bookmarks} %insserv_cleanup %endif %if %build_glib2 @@ -1143,8 +1115,6 @@ %{_sysconfdir}/avahi/services/*.service %config(noreplace) %{_sysconfdir}/avahi/hosts %{_sysconfdir}/dbus-1/system.d/*.conf -%{_sysconfdir}/init.d/avahi-dnsconfd -%{_sysconfdir}/init.d/avahi-daemon %{_datadir}/dbus-1/interfaces/org.freedesktop.Avahi.*.xml %{_datadir}/dbus-1/system-services/org.freedesktop.Avahi.service %dir %{_prefix}/lib/avahi @@ -1187,8 +1157,6 @@ %defattr(-,root,root) %{_bindir}/avahi-bookmarks %doc %{_mandir}/man1/avahi-bookmarks.1* -%{_sbindir}/rcavahi-bookmarks -%{_sysconfdir}/init.d/avahi-bookmarks %dir %{python_sitelib}/avahi %{python_sitelib}/avahi/__init__.py* %{python_sitelib}/avahi/ServiceTypeDatabase.py
