From e2102123fe7ad2384e1a382f58d6057a3ad56752a92ab72550d5653f1e6f75ce Mon Sep 17 00:00:00 2001
From: OBS User unknown <null@suse.de>
Date: Wed, 31 Jan 2007 22:50:48 +0000
Subject: [PATCH] OBS-URL:
 https://build.opensuse.org/package/show/openSUSE:Factory/avahi?expand=0&rev=6

---
 avahi-discover-icon.patch | 10 ++++++++++
 avahi.changes             |  6 ++++++
 avahi.spec                | 14 ++++++++++----
 gnome-nettool2.png        |  3 +++
 4 files changed, 29 insertions(+), 4 deletions(-)
 create mode 100644 avahi-discover-icon.patch
 create mode 100644 gnome-nettool2.png

diff --git a/avahi-discover-icon.patch b/avahi-discover-icon.patch
new file mode 100644
index 0000000..5605f58
--- /dev/null
+++ b/avahi-discover-icon.patch
@@ -0,0 +1,10 @@
+--- avahi-python/avahi-discover.desktop.in
++++ avahi-python/avahi-discover.desktop.in
+@@ -5,6 +5,6 @@
+ Exec=@bindir@/avahi-discover
+ Terminal=false
+ Type=Application
+-Icon=gnome-nettool
++Icon=gnome-nettool2
+ Categories=GNOME;Application;System;Utility;
+ StartupNotify=false
diff --git a/avahi.changes b/avahi.changes
index 2301158..964a8f4 100644
--- a/avahi.changes
+++ b/avahi.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed Jan 31 23:20:35 CET 2007 - ro@suse.de
+
+- removed gnome-nettool from BuildRequires (and Recommends)
+  (causes a build-cycle) and use local copy of the icon
+
 -------------------------------------------------------------------
 Fri Jan 26 01:35:53 CET 2007 - ro@suse.de
 
diff --git a/avahi.spec b/avahi.spec
index 94e1e15..332400e 100644
--- a/avahi.spec
+++ b/avahi.spec
@@ -17,18 +17,17 @@ BuildRequires:  libqt4-devel python-gtk-devel
 %else
 BuildRequires:  python-gtk qt-devel
 %endif
-# FIXME (upstream): Needed only for desktop icon
-BuildRequires:  gnome-nettool
-Recommends:     gnome-nettool
 Version:        0.6.16
-Release:        2
+Release:        3
 URL:            http://www.avahi.org/
 Group:          System/Daemons
 License:        GNU Library General Public License v. 2.0 and 2.1 (LGPL)
 Summary:        D-BUS Service for Zeroconf and Bonjour
 Source:         %{name}-%{version}.tar.bz2
+Source1:        gnome-nettool2.png
 Patch:          avahi-gacdir.patch
 Patch1:         avahi-random-return.patch
+Patch2:         avahi-discover-icon.patch
 Requires:       dbus-1 python python-gdbm python-gtk
 Autoreqprov:    on
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
@@ -338,6 +337,7 @@ Authors:
 %setup -q
 %patch
 %patch1
+%patch2
 
 %build
 ACLOCAL="aclocal -I common" autoreconf -f -i
@@ -355,6 +355,8 @@ make %{?jobs:-j%jobs}
 
 %install
 make DESTDIR=$RPM_BUILD_ROOT install
+install -d $RPM_BUILD_ROOT%{_datadir}/pixmaps
+install -m 644 %{S:1} $RPM_BUILD_ROOT%{_datadir}/pixmaps/gnome-nettool2.png
 install -d $RPM_BUILD_ROOT%{_localstatedir}/run/avahi-daemon
 cd $RPM_BUILD_ROOT%{_includedir} ; ln -s avahi-compat-libdns_sd/dns_sd.h avahi-compat-howl/howl.h $RPM_BUILD_ROOT%{_includedir}/
 # Work-around qt4 bug:
@@ -411,6 +413,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_sysconfdir}/dbus-1/system.d/*.conf
 %{_sysconfdir}/init.d/*
 %{py_sitedir}/avahi
+%{_datadir}/pixmaps/gnome-nettool2.png
 
 %files glib
 %defattr(-,root,root)
@@ -488,6 +491,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/avahi-qt4.pc
 
 %changelog -n avahi
+* Wed Jan 31 2007 - ro@suse.de
+- removed gnome-nettool from BuildRequires (and Recommends)
+  (causes a build-cycle) and use local copy of the icon
 * Fri Jan 26 2007 - ro@suse.de
 - add mono-devel to build requires to make mono-reqprov work
 * Wed Jan 24 2007 - sbrabec@suse.cz
diff --git a/gnome-nettool2.png b/gnome-nettool2.png
new file mode 100644
index 0000000..11cd7ab
--- /dev/null
+++ b/gnome-nettool2.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:88cbac3316fd0ad10bb7d054dcd53ab822517a1d9bbb70a31cd754dcd59e94b9
+size 4509