From d2c8ad4953e2f3d550e26bc5ed654de1e8ce1f3fa34cb80ab27664f937bd6474 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Thu, 23 Nov 2017 14:59:13 +0000 Subject: [PATCH] Accepting request 544649 from home:RBrownSUSE:branches:GNOME:Factory Replace references to /var/adm/fillup-templates with new %_fillupdir macro (boo#1069468) OBS-URL: https://build.opensuse.org/request/show/544649 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/avahi?expand=0&rev=139 --- avahi-glib2.changes | 6 ++++++ avahi-glib2.spec | 19 ++++++++++++------- avahi-mono.changes | 6 ++++++ avahi-mono.spec | 19 ++++++++++++------- avahi-qt4.changes | 6 ++++++ avahi-qt4.spec | 19 ++++++++++++------- avahi.changes | 6 ++++++ avahi.spec | 19 ++++++++++++------- 8 files changed, 72 insertions(+), 28 deletions(-) diff --git a/avahi-glib2.changes b/avahi-glib2.changes index 668d492..3f536fb 100644 --- a/avahi-glib2.changes +++ b/avahi-glib2.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Nov 23 13:37:38 UTC 2017 - rbrown@suse.com + +- Replace references to /var/adm/fillup-templates with new + %_fillupdir macro (boo#1069468) + ------------------------------------------------------------------- Sat Sep 21 14:31:18 UTC 2013 - dimstar@opensuse.org diff --git a/avahi-glib2.spec b/avahi-glib2.spec index ff5b77b..9f05afb 100644 --- a/avahi-glib2.spec +++ b/avahi-glib2.spec @@ -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 @@ -338,7 +343,7 @@ avahi-autoipd is an implementation of Dynamic Configuration of IPv4 Link-Local Addresses. avahi-autoipd doesn't depend on any other Avahi library, hence it makes -sense to install it even if Avahi itself is not installed. +sense to install it even if Avahi itself is not installed. %package utils Summary: Command Line Utilities for D-BUS Service for Zeroconf and Bonjour @@ -910,8 +915,8 @@ ln -s %{_sbindir}/service %{buildroot}/%{_sbindir}/rcavahi-daemon 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 @@ getent passwd avahi >/dev/null || %{_sbindir}/useradd -r -s /bin/false -c "User # 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 @@ chown -R avahi-autoipd:avahi-autoipd %{_localstatedir}/lib/avahi-autoipd %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 @@ chown -R avahi-autoipd:avahi-autoipd %{_localstatedir}/lib/avahi-autoipd %{_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) diff --git a/avahi-mono.changes b/avahi-mono.changes index 2ae494b..7b202be 100644 --- a/avahi-mono.changes +++ b/avahi-mono.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Nov 23 13:37:31 UTC 2017 - rbrown@suse.com + +- Replace references to /var/adm/fillup-templates with new + %_fillupdir macro (boo#1069468) + ------------------------------------------------------------------- Fri Apr 21 13:49:59 UTC 2017 - bwiedemann@suse.com diff --git a/avahi-mono.spec b/avahi-mono.spec index b5ddb99..9c4a388 100644 --- a/avahi-mono.spec +++ b/avahi-mono.spec @@ -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-mono # Do not edit this auto generated file! Edit avahi.spec. %define _name avahi @@ -337,7 +342,7 @@ avahi-autoipd is an implementation of Dynamic Configuration of IPv4 Link-Local Addresses. avahi-autoipd doesn't depend on any other Avahi library, hence it makes -sense to install it even if Avahi itself is not installed. +sense to install it even if Avahi itself is not installed. %package utils Summary: Command Line Utilities for D-BUS Service for Zeroconf and Bonjour @@ -910,8 +915,8 @@ ln -s %{_sbindir}/service %{buildroot}/%{_sbindir}/rcavahi-daemon 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 @@ getent passwd avahi >/dev/null || %{_sbindir}/useradd -r -s /bin/false -c "User # 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 @@ chown -R avahi-autoipd:avahi-autoipd %{_localstatedir}/lib/avahi-autoipd %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 @@ chown -R avahi-autoipd:avahi-autoipd %{_localstatedir}/lib/avahi-autoipd %{_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) diff --git a/avahi-qt4.changes b/avahi-qt4.changes index a3da1f7..c0ab5a7 100644 --- a/avahi-qt4.changes +++ b/avahi-qt4.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Nov 23 13:37:26 UTC 2017 - rbrown@suse.com + +- Replace references to /var/adm/fillup-templates with new + %_fillupdir macro (boo#1069468) + ------------------------------------------------------------------- Sat Sep 17 13:52:41 UTC 2011 - jengelh@medozas.de diff --git a/avahi-qt4.spec b/avahi-qt4.spec index 988b2ab..2767cf0 100644 --- a/avahi-qt4.spec +++ b/avahi-qt4.spec @@ -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-qt4 # Do not edit this auto generated file! Edit avahi.spec. %define _name avahi @@ -340,7 +345,7 @@ avahi-autoipd is an implementation of Dynamic Configuration of IPv4 Link-Local Addresses. avahi-autoipd doesn't depend on any other Avahi library, hence it makes -sense to install it even if Avahi itself is not installed. +sense to install it even if Avahi itself is not installed. %package utils Summary: Command Line Utilities for D-BUS Service for Zeroconf and Bonjour @@ -912,8 +917,8 @@ ln -s %{_sbindir}/service %{buildroot}/%{_sbindir}/rcavahi-daemon 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 @@ getent passwd avahi >/dev/null || %{_sbindir}/useradd -r -s /bin/false -c "User # 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 @@ chown -R avahi-autoipd:avahi-autoipd %{_localstatedir}/lib/avahi-autoipd %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 @@ chown -R avahi-autoipd:avahi-autoipd %{_localstatedir}/lib/avahi-autoipd %{_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) diff --git a/avahi.changes b/avahi.changes index 3beb809..9bce7ec 100644 --- a/avahi.changes +++ b/avahi.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Nov 23 13:37:18 UTC 2017 - rbrown@suse.com + +- Replace references to /var/adm/fillup-templates with new + %_fillupdir macro (boo#1069468) + ------------------------------------------------------------------- Thu Jun 1 08:37:54 UTC 2017 - jengelh@inai.de diff --git a/avahi.spec b/avahi.spec index c49e3c0..365e1e8 100644 --- a/avahi.spec +++ b/avahi.spec @@ -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 @@ -340,7 +345,7 @@ avahi-autoipd is an implementation of Dynamic Configuration of IPv4 Link-Local Addresses. avahi-autoipd doesn't depend on any other Avahi library, hence it makes -sense to install it even if Avahi itself is not installed. +sense to install it even if Avahi itself is not installed. %package utils Summary: Command Line Utilities for D-BUS Service for Zeroconf and Bonjour @@ -912,8 +917,8 @@ ln -s %{_sbindir}/service %{buildroot}/%{_sbindir}/rcavahi-daemon 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 @@ getent passwd avahi >/dev/null || %{_sbindir}/useradd -r -s /bin/false -c "User # 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 @@ chown -R avahi-autoipd:avahi-autoipd %{_localstatedir}/lib/avahi-autoipd %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 @@ chown -R avahi-autoipd:avahi-autoipd %{_localstatedir}/lib/avahi-autoipd %{_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)