From 99175c74dc41d67bc79153c04c9d9c9e4d472124 Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter@math.unl.edu>
Date: Sep 22 2015 13:27:34 +0000
Subject: Merge branch 'master' into f21


---

diff --git a/avahi-0.6.31-invalid_packet.patch b/avahi-0.6.31-invalid_packet.patch
index 3240a56..0c11945 100644
--- a/avahi-0.6.31-invalid_packet.patch
+++ b/avahi-0.6.31-invalid_packet.patch
@@ -1,7 +1,7 @@
 diff -up avahi-0.6.31/avahi-core/server.c.invalid_packet avahi-0.6.31/avahi-core/server.c
---- avahi-0.6.31/avahi-core/server.c.invalid_packet	2015-09-17 10:36:58.286843110 -0500
-+++ avahi-0.6.31/avahi-core/server.c	2015-09-17 10:38:46.973153235 -0500
-@@ -972,9 +972,7 @@ static void dispatch_packet(AvahiServer
+--- avahi-0.6.31/avahi-core/server.c.invalid_packet	2015-09-22 08:12:58.544588701 -0500
++++ avahi-0.6.31/avahi-core/server.c	2015-09-22 08:13:39.743862403 -0500
+@@ -972,11 +972,9 @@ static void dispatch_packet(AvahiServer
              return;
          }
  
@@ -10,5 +10,8 @@ diff -up avahi-0.6.31/avahi-core/server.c.invalid_packet avahi-0.6.31/avahi-core
 -            avahi_dns_packet_get_field(p, AVAHI_DNS_FIELD_NSCOUNT) != 0) {
 +        if (avahi_dns_packet_get_field(p, AVAHI_DNS_FIELD_ANCOUNT) == 0) {
  
-             avahi_log_warn("Invalid response packet from host %s.", avahi_address_snprint(t, sizeof(t), src_address));
+-            avahi_log_warn("Invalid response packet from host %s.", avahi_address_snprint(t, sizeof(t), src_address));
++            avahi_log_debug("Invalid response packet from host %s.", avahi_address_snprint(t, sizeof(t), src_address));
              return;
+         }
+ 
diff --git a/avahi.spec b/avahi.spec
index ebb81ce..583f7a6 100644
--- a/avahi.spec
+++ b/avahi.spec
@@ -18,7 +18,7 @@
 
 Name:             avahi
 Version:          0.6.31
-Release:          40%{?dist}
+Release:          42%{?dist}
 Summary:          Local network service discovery
 License:          LGPLv2+
 URL:              http://avahi.org
@@ -447,31 +447,6 @@ rm -fv %{buildroot}%{buildroot}%{python3_sitelib}/avahi/*.py{c,o}
 rm -fv %{buildroot}%{_sysconfdir}/rc.d/init.d/avahi-daemon
 rm -fv %{buildroot}%{_sysconfdir}/rc.d/init.d/avahi-dnsconfd
 
-# Merge applications into one software center item
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/appdata
-cat > $RPM_BUILD_ROOT%{_datadir}/appdata/bssh.appdata.xml <<EOF
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright 2014 Richard Hughes <richard@hughsie.com> -->
-<component type="desktop">
-  <metadata_license>CC0-1.0</metadata_license>
-  <id>bssh.desktop</id>
-  <metadata>
-    <value key="X-Merge-With-Parent">avahi-discover.desktop</value>
-  </metadata>
-</component>
-EOF
-cat > $RPM_BUILD_ROOT%{_datadir}/appdata/bvnc.appdata.xml <<EOF
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright 2014 Richard Hughes <richard@hughsie.com> -->
-<component type="desktop">
-  <metadata_license>CC0-1.0</metadata_license>
-  <id>bvnc.desktop</id>
-  <metadata>
-    <value key="X-Merge-With-Parent">avahi-discover.desktop</value>
-  </metadata>
-</component>
-EOF
-
 %find_lang %{name}
 
 %pre
@@ -614,7 +589,6 @@ exit 0
 %{_mandir}/man1/avahi-discover*
 %{_mandir}/man1/avahi-bookmarks*
 %{_datadir}/applications/b*.desktop
-%{_datadir}/appdata/*.appdata.xml
 %{_datadir}/applications/avahi-discover.desktop
 %{_datadir}/avahi/interfaces/
 %{python2_sitelib}/avahi_discover/
@@ -731,6 +705,12 @@ exit 0
 %{python3_sitelib}/avahi/
 
 %changelog
+* Tue Sep 22 2015 Rex Dieter <rdieter@fedoraproject.org> 0.6.31-42
+- treat "Invalid response packet from host" as avahi_log_debug (#1240711)
+
+* Fri Sep 18 2015 Richard Hughes <rhughes@redhat.com> - 0.6.31-41
+- Remove no longer required AppData file
+
 * Thu Sep 17 2015 Rex Dieter <rdieter@fedoraproject.org> 0.6.31-40
 - non-existing homedir /var/lib/avahi-autoipd (#1173822)