From 523dde49f8d979fa8816f73eb82b47dc6d37f2f1 Mon Sep 17 00:00:00 2001
From: Richard Hughes <richard@hughsie.com>
Date: Fri, 18 Sep 2015 12:08:38 +0100
Subject: [PATCH 1/2] Remove no longer required AppData file

---
 avahi.spec | 31 ++++---------------------------
 1 file changed, 4 insertions(+), 27 deletions(-)

diff --git a/avahi.spec b/avahi.spec
index ebb81ce..af58032 100644
--- a/avahi.spec
+++ b/avahi.spec
@@ -18,7 +18,7 @@
 
 Name:             avahi
 Version:          0.6.31
-Release:          40%{?dist}
+Release:          41%{?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,9 @@ exit 0
 %{python3_sitelib}/avahi/
 
 %changelog
+* 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)
 

From fdba3f6c7e51a737d795fd3dbd2f85e5cee11cb4 Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter@math.unl.edu>
Date: Tue, 22 Sep 2015 08:26:37 -0500
Subject: [PATCH 2/2] Revert "Remove no longer required AppData file"

This reverts commit 523dde49f8d979fa8816f73eb82b47dc6d37f2f1.

to make branches mergeable again
---
 avahi.spec | 31 +++++++++++++++++++++++++++----
 1 file changed, 27 insertions(+), 4 deletions(-)

diff --git a/avahi.spec b/avahi.spec
index af58032..ebb81ce 100644
--- a/avahi.spec
+++ b/avahi.spec
@@ -18,7 +18,7 @@
 
 Name:             avahi
 Version:          0.6.31
-Release:          41%{?dist}
+Release:          40%{?dist}
 Summary:          Local network service discovery
 License:          LGPLv2+
 URL:              http://avahi.org
@@ -447,6 +447,31 @@ 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
@@ -589,6 +614,7 @@ 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/
@@ -705,9 +731,6 @@ exit 0
 %{python3_sitelib}/avahi/
 
 %changelog
-* 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)