[avahi/f15/master] new upstream release

[Lennart Poettering]

commit 7dd0713ff7385430f137f51a35dbad1ba753ba46
Author: Lennart Poettering <lennart at poettering.net>
Date:   Wed Mar 9 01:15:43 2011 +0100

    new upstream release

 .gitignore     |    5 ++++-
 avahi.spec     |   47 ++++++++++++++++++++++++++---------------------
 gtk3-fix.patch |   47 -----------------------------------------------
 sources        |    2 +-
 4 files changed, 31 insertions(+), 70 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 8349375..d7c2190 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,5 @@
-avahi-0.6.27.tar.gz
+/avahi-0.6.27.tar.gz
 /avahi-0.6.28.tar.gz
+/avahi-0.6.29.tar.gz
+/x86_64
+/.build-*.log
diff --git a/avahi.spec b/avahi.spec
index 8522a6e..c1cb81a 100644
--- a/avahi.spec
+++ b/avahi.spec
@@ -1,12 +1,12 @@
 %{?!WITH_MONO:          %define WITH_MONO 1}
 %{?!WITH_COMPAT_DNSSD:  %define WITH_COMPAT_DNSSD 1}
 %{?!WITH_COMPAT_HOWL:   %define WITH_COMPAT_HOWL  1}
-%ifarch sparc64 s390
+%ifarch sparc64 s390 %{arm}
 %define WITH_MONO 0
 %endif
 Name:           avahi
-Version:        0.6.28
-Release:        9%{?dist}
+Version:        0.6.29
+Release:        1%{?dist}
 Summary:        Local network service discovery
 Group:          System Environment/Base
 License:        LGPLv2
@@ -40,6 +40,7 @@ BuildRequires:  intltool
 BuildRequires:  perl-XML-Parser
 %if %{WITH_MONO}
 BuildRequires:  mono-devel >= 1.1.13
+BuildRequires:  monodoc-devel
 %endif
 Obsoletes:      howl
 Source0:        http://avahi.org/download/%{name}-%{version}.tar.gz
@@ -368,26 +369,26 @@ getent passwd avahi >/dev/null 2>&1 || useradd \
 :;
 
 %post
-/sbin/ldconfig
+/sbin/ldconfig || :
 dbus-send --system --type=method_call --dest=org.freedesktop.DBus / org.freedesktop.DBus.ReloadConfig >/dev/null 2>&1 || :
 /sbin/chkconfig --add avahi-daemon >/dev/null 2>&1 || :
 if [ "$1" -eq 1 ]; then
-   /bin/systemctl daemon-reload >/dev/null 2>&1 || :
-   if [ -s /etc/localtime ]; then
-        cp -cfp /etc/localtime /etc/avahi/etc/localtime || :
-   fi
+        /bin/systemctl daemon-reload >/dev/null 2>&1 || :
+        if [ -s /etc/localtime ]; then
+                cp -cfp /etc/localtime /etc/avahi/etc/localtime || :
+        fi
 fi
 
 %triggerun -- avahi < 0.6.26-1
-if /sbin/chkconfig avahi-daemon ; then
-    /bin/systemctl --no-reload enable avahi-daemon.service >/dev/null 2>&1 || :
+if /sbin/chkconfig --level 3 avahi-daemon ; then
+        /bin/systemctl --no-reload enable avahi-daemon.service >/dev/null 2>&1 || :
 fi
 
 %preun
 if [ "$1" -eq 0 ]; then
-    /bin/systemctl --no-reload disable avahi-daemon.service >/dev/null 2>&1 || :
-    /bin/systemctl stop avahi-daemon.service >/dev/null 2>&1 || :
-    /sbin/chkconfig --del avahi-daemon >/dev/null 2>&1 || :
+        /bin/systemctl --no-reload disable avahi-daemon.service >/dev/null 2>&1 || :
+        /bin/systemctl stop avahi-daemon.service >/dev/null 2>&1 || :
+        /sbin/chkconfig --del avahi-daemon >/dev/null 2>&1 || :
 fi
 
 %postun
@@ -412,19 +413,19 @@ getent passwd avahi-autoipd >/dev/null 2>&1 || useradd \
 %post dnsconfd
 /sbin/chkconfig --add avahi-dnsconfd >/dev/null 2>&1 || :
 if [ "$1" -eq 1 ]; then
-    /bin/systemctl daemon-reload >/dev/null 2>&1 || :
+        /bin/systemctl daemon-reload >/dev/null 2>&1 || :
 fi
 
 %triggerun dnsconfd -- avahi-dnsconfd < 0.6.26-1
-if /sbin/chkconfig avahi-dnsconfd ; then
-    /bin/systemctl --no-reload enable avahi-dnsconfd.service >/dev/null 2>&1 || :
+if /sbin/chkconfig --level 3 avahi-dnsconfd ; then
+        /bin/systemctl --no-reload enable avahi-dnsconfd.service >/dev/null 2>&1 || :
 fi
 
 %preun dnsconfd
 if [ "$1" -eq 0 ]; then
-    /bin/systemctl --no-reload disable avahi-dnsconfd.service >/dev/null 2>&1 || :
-    /bin/systemctl stop avahi-dnsconfd.service >/dev/null 2>&1 || :
-    /sbin/chkconfig --del avahi-dnsconfd >/dev/null 2>&1 || :
+        /bin/systemctl --no-reload disable avahi-dnsconfd.service >/dev/null 2>&1 || :
+        /bin/systemctl stop avahi-dnsconfd.service >/dev/null 2>&1 || :
+        /sbin/chkconfig --del avahi-dnsconfd >/dev/null 2>&1 || :
 fi
 
 %postun dnsconfd
@@ -644,6 +645,10 @@ fi
 %endif
 
 %changelog
+* Wed Mar  9 2011 Lennart Poettering <lpoetter at redhat.com> - 0.6.29-1
+- New upstream release
+- Fixes CVE-2011-1002 among other things
+
 * Thu Feb 10 2011 Matthias Clasen <mclasen at redhat.com> - 0.6.28-9
 - Rebuild against new gtk
 
@@ -906,7 +911,7 @@ fi
 
 * Thu Mar 09 2006 Jason Vas Dias <jvdias at redhat.com> - 0.6.9-4
 - fix scriptlet error introduced by last fix:
-  if user has disabled avahi-daemon, do not enable it during %post
+  if user has disabled avahi-daemon, do not enable it during post
 
 * Wed Mar 08 2006 Bill Nottingham <notting at redhat.com> - 0.6.9-2
 - fix scriplet error during installer
@@ -979,7 +984,7 @@ fi
 - Upgrade to 0.6.1
 
 * Mon Dec 05 2005 Jason Vas Dias<jvdias at redhat.com> - 0.6-6
-- fix bug 174799 - fix .spec file \%files permissions
+- fix bug 174799 - fix .spec file files permissions
 
 * Fri Dec 02 2005 Jason Vas Dias<jvdias at redhat.com> - 0.6-5
 - python-twisted has been removed from the FC-5 distribution - disable its use
diff --git a/sources b/sources
index 6c04d88..42239f7 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-d0143a5aa3265019072e53ab497818d0  avahi-0.6.28.tar.gz
+bb9d326770689610d1dbaceab5a787fc  avahi-0.6.29.tar.gz