Accepting request 230260 from GNOME:Factory

Fix filelist to use /run (forwarded request 230224 from a_jaeger)

OBS-URL: https://build.opensuse.org/request/show/230260
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/avahi?expand=0&rev=107

avahi-glib2.spec

@@ -973,10 +973,21 @@ rm $RPM_BUILD_ROOT%{_libdir}/pkgconfig/avahi-ui.pc
 
 %pre
 %{_sbindir}/groupadd -r avahi 2> /dev/null || :
-%{_sbindir}/useradd -r -s /bin/false -c "User for Avahi" -d %{_localstatedir}/run/avahi-daemon -g avahi 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.
+if test -f var/adm/fillup-templates/sysconfig.avahi-autoipd -a \
+	-f etc/sysconfig/avahi ; then
+	.  var/adm/fillup-templates/sysconfig.avahi-autoipd
+	if test "X$AVAHI_AUTOIPD_ENABLE" = "Xyes" ; then
+		sed -i etc/sysconfig/avahi \
+		    -e 's/^\(AVAHI_AUTOIPD_ENABLE\)=.*/\1="no"/'
+	fi
+fi
 
 %post
 %{fillup_only -n avahi}
@@ -1112,7 +1123,7 @@ fi
 %{_libdir}/avahi/service-types.db
 # avahi creates the directory itself, we do not package it
 # since it might be on tmpfs
-%attr(-,avahi,avahi) %ghost %{_localstatedir}/run/avahi-daemon
+%attr(-,avahi,avahi) %ghost /run/avahi-daemon
 %doc %{_mandir}/man5/*.5*
 %doc %{_mandir}/man8/*.8*
 %exclude %doc %{_mandir}/man8/avahi-autoipd*

avahi-mono.spec

@@ -972,10 +972,21 @@ rm $RPM_BUILD_ROOT%{_libdir}/pkgconfig/avahi-ui.pc
 
 %pre
 %{_sbindir}/groupadd -r avahi 2> /dev/null || :
-%{_sbindir}/useradd -r -s /bin/false -c "User for Avahi" -d %{_localstatedir}/run/avahi-daemon -g avahi 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.
+if test -f var/adm/fillup-templates/sysconfig.avahi-autoipd -a \
+	-f etc/sysconfig/avahi ; then
+	.  var/adm/fillup-templates/sysconfig.avahi-autoipd
+	if test "X$AVAHI_AUTOIPD_ENABLE" = "Xyes" ; then
+		sed -i etc/sysconfig/avahi \
+		    -e 's/^\(AVAHI_AUTOIPD_ENABLE\)=.*/\1="no"/'
+	fi
+fi
 
 %post
 %{fillup_only -n avahi}
@@ -1111,7 +1122,7 @@ fi
 %{_libdir}/avahi/service-types.db
 # avahi creates the directory itself, we do not package it
 # since it might be on tmpfs
-%attr(-,avahi,avahi) %ghost %{_localstatedir}/run/avahi-daemon
+%attr(-,avahi,avahi) %ghost /run/avahi-daemon
 %doc %{_mandir}/man5/*.5*
 %doc %{_mandir}/man8/*.8*
 %exclude %doc %{_mandir}/man8/avahi-autoipd*

avahi-qt4.spec

@@ -975,10 +975,21 @@ rm $RPM_BUILD_ROOT%{_libdir}/pkgconfig/avahi-ui.pc
 
 %pre
 %{_sbindir}/groupadd -r avahi 2> /dev/null || :
-%{_sbindir}/useradd -r -s /bin/false -c "User for Avahi" -d %{_localstatedir}/run/avahi-daemon -g avahi 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.
+if test -f var/adm/fillup-templates/sysconfig.avahi-autoipd -a \
+	-f etc/sysconfig/avahi ; then
+	.  var/adm/fillup-templates/sysconfig.avahi-autoipd
+	if test "X$AVAHI_AUTOIPD_ENABLE" = "Xyes" ; then
+		sed -i etc/sysconfig/avahi \
+		    -e 's/^\(AVAHI_AUTOIPD_ENABLE\)=.*/\1="no"/'
+	fi
+fi
 
 %post
 %{fillup_only -n avahi}
@@ -1114,7 +1125,7 @@ fi
 %{_libdir}/avahi/service-types.db
 # avahi creates the directory itself, we do not package it
 # since it might be on tmpfs
-%attr(-,avahi,avahi) %ghost %{_localstatedir}/run/avahi-daemon
+%attr(-,avahi,avahi) %ghost /run/avahi-daemon
 %doc %{_mandir}/man5/*.5*
 %doc %{_mandir}/man8/*.8*
 %exclude %doc %{_mandir}/man8/avahi-autoipd*

avahi.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Apr 15 15:55:46 UTC 2014 - aj@suse.com
+
+- We've moved everything to /run, adjust file list as well.
+
 -------------------------------------------------------------------
 Thu Feb 27 18:12:43 UTC 2014 - mt@suse.com
 

avahi.spec

@@ -975,7 +975,7 @@ rm $RPM_BUILD_ROOT%{_libdir}/pkgconfig/avahi-ui.pc
 
 %pre
 %{_sbindir}/groupadd -r avahi 2> /dev/null || :
-%{_sbindir}/useradd -r -s /bin/false -c "User for Avahi" -d %{_localstatedir}/run/avahi-daemon -g avahi 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
@@ -1125,7 +1125,7 @@ fi
 %{_libdir}/avahi/service-types.db
 # avahi creates the directory itself, we do not package it
 # since it might be on tmpfs
-%attr(-,avahi,avahi) %ghost %{_localstatedir}/run/avahi-daemon
+%attr(-,avahi,avahi) %ghost /run/avahi-daemon
 %doc %{_mandir}/man5/*.5*
 %doc %{_mandir}/man8/*.8*
 %exclude %doc %{_mandir}/man8/avahi-autoipd*