Hello community, here is the log from the commit of package avahi checked in at Wed Jan 31 23:50:47 CET 2007. -------- --- avahi/avahi.changes 2007-01-26 01:36:07.000000000 +0100 +++ /mounts/work_users/ro/STABLE/avahi/avahi.changes 2007-01-31 23:49:40.627826000 +0100 @@ -1,0 +2,6 @@ +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 + +------------------------------------------------------------------- New: ---- avahi-discover-icon.patch gnome-nettool2.png ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ avahi.spec ++++++ --- /var/tmp/diff_new_pack.W13700/_old 2007-01-31 23:50:32.000000000 +0100 +++ /var/tmp/diff_new_pack.W13700/_new 2007-01-31 23:50:32.000000000 +0100 @@ -17,18 +17,17 @@ %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 @@ %setup -q %patch %patch1 +%patch2 %build ACLOCAL="aclocal -I common" autoreconf -f -i @@ -355,6 +355,8 @@ %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 @@ %{_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 @@ %{_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 ++++++ avahi-discover-icon.patch ++++++ --- 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 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org