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 - 0.6.29-1 +- New upstream release +- Fixes CVE-2011-1002 among other things + * Thu Feb 10 2011 Matthias Clasen - 0.6.28-9 - Rebuild against new gtk @@ -906,7 +911,7 @@ fi * Thu Mar 09 2006 Jason Vas Dias - 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 - 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 - 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 - 0.6-5 - python-twisted has been removed from the FC-5 distribution - disable its use diff --git a/gtk3-fix.patch b/gtk3-fix.patch deleted file mode 100644 index af982f6..0000000 --- a/gtk3-fix.patch +++ /dev/null @@ -1,47 +0,0 @@ -From fc2ac4ab73a27341ffd7eecc06f836dc9d1bbb85 Mon Sep 17 00:00:00 2001 -From: Matthias Clasen -Date: Thu, 16 Sep 2010 16:19:35 -0400 -Subject: [PATCH 1/1] gtk: avahi build fix - -Hey, - -avahi-0.26.7 braucht einen kleinen fix, um mit gtk+ 2.21.8/2.90.7 zu -bauen. See attachment. ---- - avahi-ui/avahi-ui.c | 8 ++++++-- - 1 files changed, 6 insertions(+), 2 deletions(-) - -diff --git a/avahi-ui/avahi-ui.c b/avahi-ui/avahi-ui.c -index 62ccd18..2569ba0 100644 ---- a/avahi-ui/avahi-ui.c -+++ b/avahi-ui/avahi-ui.c -@@ -254,11 +254,13 @@ GtkWidget *aui_service_dialog_new_valist( - const gchar *button_text; - gint dr; - -- GtkWidget *w = GTK_WIDGET(g_object_new( -+ GtkWidget *w = (GtkWidget*)g_object_new( - AUI_TYPE_SERVICE_DIALOG, -+#if !GTK_CHECK_VERSION (2,21,8) - "has-separator", FALSE, -+#endif - "title", title, -- NULL)); -+ NULL); - - if (parent) - gtk_window_set_transient_for(GTK_WINDOW(w), parent); -@@ -985,7 +987,9 @@ static void domain_button_clicked(GtkButton *button G_GNUC_UNUSED, gpointer user - p->domain_dialog = gtk_dialog_new(); - gtk_container_set_border_width(GTK_CONTAINER(p->domain_dialog), 5); - gtk_window_set_title(GTK_WINDOW(p->domain_dialog), _("Change domain")); -+#if !GTK_CHECK_VERSION(2,21,8) - gtk_dialog_set_has_separator(GTK_DIALOG(p->domain_dialog), FALSE); -+#endif - - vbox = gtk_vbox_new(FALSE, 8); - gtk_container_set_border_width(GTK_CONTAINER(vbox), 8); --- -1.6.3.3 - - 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