Hello community, here is the log from the commit of package avahi for openSUSE:Factory checked in at 2017-11-30 16:31:59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/avahi (Old) and /work/SRC/openSUSE:Factory/.avahi.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "avahi" Thu Nov 30 16:31:59 2017 rev:119 rq:544849 version:0.6.32 Changes: -------- --- /work/SRC/openSUSE:Factory/avahi/avahi-glib2.changes 2013-09-23 08:47:02.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.avahi.new/avahi-glib2.changes 2017-11-30 16:32:00.173885889 +0100 @@ -1,0 +2,6 @@ +Thu Nov 23 13:37:38 UTC 2017 - [email protected] + +- Replace references to /var/adm/fillup-templates with new + %_fillupdir macro (boo#1069468) + +------------------------------------------------------------------- --- /work/SRC/openSUSE:Factory/avahi/avahi-mono.changes 2017-06-07 09:54:00.466686154 +0200 +++ /work/SRC/openSUSE:Factory/.avahi.new/avahi-mono.changes 2017-11-30 16:32:00.617869737 +0100 @@ -1,0 +2,6 @@ +Thu Nov 23 13:37:31 UTC 2017 - [email protected] + +- Replace references to /var/adm/fillup-templates with new + %_fillupdir macro (boo#1069468) + +------------------------------------------------------------------- --- /work/SRC/openSUSE:Factory/avahi/avahi-qt4.changes 2011-10-02 09:49:58.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.avahi.new/avahi-qt4.changes 2017-11-30 16:32:01.177849365 +0100 @@ -1,0 +2,6 @@ +Thu Nov 23 13:37:26 UTC 2017 - [email protected] + +- Replace references to /var/adm/fillup-templates with new + %_fillupdir macro (boo#1069468) + +------------------------------------------------------------------- --- /work/SRC/openSUSE:Factory/avahi/avahi.changes 2017-06-07 09:54:00.874628504 +0200 +++ /work/SRC/openSUSE:Factory/.avahi.new/avahi.changes 2017-11-30 16:32:01.341843400 +0100 @@ -1,0 +2,6 @@ +Thu Nov 23 13:37:18 UTC 2017 - [email protected] + +- Replace references to /var/adm/fillup-templates with new + %_fillupdir macro (boo#1069468) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ avahi-glib2.spec ++++++ --- /var/tmp/diff_new_pack.8pq74t/_old 2017-11-30 16:32:02.245810514 +0100 +++ /var/tmp/diff_new_pack.8pq74t/_new 2017-11-30 16:32:02.253810223 +0100 @@ -16,6 +16,11 @@ # +#Compat macro for new _fillupdir macro introduced in Nov 2017 +%if ! %{defined _fillupdir} + %define _fillupdir /var/adm/fillup-templates +%endif + Name: avahi-glib2 # Do not edit this auto generated file! Edit avahi.spec. %define _name avahi @@ -910,8 +915,8 @@ ln -s %{_sbindir}/service %{buildroot}/%{_sbindir}/rcavahi-dnsconfd install -m 644 %{S:3} %{buildroot}/%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/avahi install -d %{buildroot}/%{_datadir}/pixmaps -install -d %{buildroot}/var/adm/fillup-templates -install -m 644 sysconfig.avahi* %{buildroot}/var/adm/fillup-templates/ +install -d %{buildroot}%{_fillupdir} +install -m 644 sysconfig.avahi* %{buildroot}%{_fillupdir}/ %if ! %build_glib2 # Note: This file is intentionally installed here. It is needed for avahi-utils-gtk and python-avahi-gtk: install -d %{buildroot}/%{_datadir}/avahi/interfaces @@ -973,9 +978,9 @@ # 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. -if test -f var/adm/fillup-templates/sysconfig.avahi-autoipd -a \ +if test -f %{_fillupdir}/sysconfig.avahi-autoipd -a \ -f etc/sysconfig/avahi ; then - . var/adm/fillup-templates/sysconfig.avahi-autoipd + . %{_fillupdir}/sysconfig.avahi-autoipd if test "X$AVAHI_AUTOIPD_ENABLE" = "Xyes" ; then sed -i etc/sysconfig/avahi \ -e 's/^\(AVAHI_AUTOIPD_ENABLE\)=.*/\1="no"/' @@ -1104,7 +1109,7 @@ %dir %{_datadir}/avahi/ %{_datadir}/avahi/interfaces /etc/sysconfig/network/*/avahi-daemon -/var/adm/fillup-templates/sysconfig.avahi +%{_fillupdir}/sysconfig.avahi %files lang -f %{name}.lang %defattr(-,root,root) @@ -1147,7 +1152,7 @@ %{_sbindir}/avahi-autoipd %{_sysconfdir}/avahi/avahi-autoipd.action /etc/sysconfig/network/*/avahi-autoipd -/var/adm/fillup-templates/sysconfig.avahi-autoipd +%{_fillupdir}/sysconfig.avahi-autoipd %files utils %defattr(-,root,root) avahi-mono.spec: same change avahi-qt4.spec: same change ++++++ avahi.spec ++++++ --- /var/tmp/diff_new_pack.8pq74t/_old 2017-11-30 16:32:02.385805422 +0100 +++ /var/tmp/diff_new_pack.8pq74t/_new 2017-11-30 16:32:02.389805276 +0100 @@ -16,6 +16,11 @@ # +#Compat macro for new _fillupdir macro introduced in Nov 2017 +%if ! %{defined _fillupdir} + %define _fillupdir /var/adm/fillup-templates +%endif + Name: avahi # WARNING: After editing this file please call Re, rpmbuild or # bash avahi_spec-prepare.sh "$PWD" avahi @@ -912,8 +917,8 @@ ln -s %{_sbindir}/service %{buildroot}/%{_sbindir}/rcavahi-dnsconfd install -m 644 %{S:3} %{buildroot}/%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/avahi install -d %{buildroot}/%{_datadir}/pixmaps -install -d %{buildroot}/var/adm/fillup-templates -install -m 644 sysconfig.avahi* %{buildroot}/var/adm/fillup-templates/ +install -d %{buildroot}%{_fillupdir} +install -m 644 sysconfig.avahi* %{buildroot}%{_fillupdir}/ %if ! %build_glib2 # Note: This file is intentionally installed here. It is needed for avahi-utils-gtk and python-avahi-gtk: install -d %{buildroot}/%{_datadir}/avahi/interfaces @@ -975,9 +980,9 @@ # 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. -if test -f var/adm/fillup-templates/sysconfig.avahi-autoipd -a \ +if test -f %{_fillupdir}/sysconfig.avahi-autoipd -a \ -f etc/sysconfig/avahi ; then - . var/adm/fillup-templates/sysconfig.avahi-autoipd + . %{_fillupdir}/sysconfig.avahi-autoipd if test "X$AVAHI_AUTOIPD_ENABLE" = "Xyes" ; then sed -i etc/sysconfig/avahi \ -e 's/^\(AVAHI_AUTOIPD_ENABLE\)=.*/\1="no"/' @@ -1106,7 +1111,7 @@ %dir %{_datadir}/avahi/ %{_datadir}/avahi/interfaces /etc/sysconfig/network/*/avahi-daemon -/var/adm/fillup-templates/sysconfig.avahi +%{_fillupdir}/sysconfig.avahi %files lang -f %{name}.lang %defattr(-,root,root) @@ -1149,7 +1154,7 @@ %{_sbindir}/avahi-autoipd %{_sysconfdir}/avahi/avahi-autoipd.action /etc/sysconfig/network/*/avahi-autoipd -/var/adm/fillup-templates/sysconfig.avahi-autoipd +%{_fillupdir}/sysconfig.avahi-autoipd %files utils %defattr(-,root,root)
