From 60a0e6ad07bd1125178c9306807a461a05a6a38eaef340922d2a8798b1c3f602 Mon Sep 17 00:00:00 2001 From: Stanislav Brabec Date: Mon, 15 Mar 2010 17:31:14 +0000 Subject: [PATCH] - Do not force start avahi daemon on update (bnc#588367). - Added support for translation-update-upstream (FATE#301344). OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/avahi?expand=0&rev=30 --- avahi-glib2.changes | 5 +++++ avahi-glib2.spec | 11 ++++++----- avahi-mono.changes | 5 +++++ avahi-mono.spec | 11 ++++++----- avahi-qt4.changes | 5 +++++ avahi-qt4.spec | 11 ++++++----- avahi.changes | 6 ++++++ avahi.spec | 5 +++-- 8 files changed, 42 insertions(+), 17 deletions(-) diff --git a/avahi-glib2.changes b/avahi-glib2.changes index d80080a..4eaaf70 100644 --- a/avahi-glib2.changes +++ b/avahi-glib2.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Mar 15 17:10:10 CET 2010 - sbrabec@suse.cz + +- Added support for translation-update-upstream (FATE#301344). + ------------------------------------------------------------------- Sun Aug 9 12:43:26 CEST 2009 - coolo@novell.com diff --git a/avahi-glib2.spec b/avahi-glib2.spec index 0128c0f..4bc4919 100644 --- a/avahi-glib2.spec +++ b/avahi-glib2.spec @@ -73,7 +73,7 @@ Patch10: avahi-unicastdomains.patch # PATCH-FIX-UPSTREAM avahi-init_unused-not-dead.patch bnc#329708 dimstar@opensuse.org -- Report unused instead of dead Patch11: avahi-init_unused-not-dead.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildRequires: dbus-1-python fdupes gcc-c++ gdbm-devel intltool libdaemon-devel libexpat-devel pkg-config +BuildRequires: dbus-1-python fdupes gcc-c++ gdbm-devel intltool libdaemon-devel libexpat-devel pkg-config translation-update-upstream # Even if we are not building python bindings, we need python to build service types database: BuildRequires: python-devel python-gdbm %if %suse_version <= 1110 @@ -272,7 +272,7 @@ addition, it supports some nifty things that have never been seen elsewhere, like correct mDNS reflection across LAN segments. %package utils -License: LGPL v2.1 or later +License: LGPLv2.1+ Summary: Command Line Utilities for D-BUS Service for Zeroconf and Bonjour Requires: %{_name} >= %{version} Group: Productivity/Networking/Other @@ -314,7 +314,7 @@ supports some nifty things that have never been seen elsewhere like correct mDNS reflection accross LAN segments. %package compat-mDNSResponder-devel -License: LGPL v2.1 or later +License: LGPLv2.1+ Summary: mDNSResponder Compatibility Package for D-BUS Service for Zeroconf/Bonjour Requires: libavahi-devel = %{version} libdns_sd = %{version} Group: Development/Libraries/C and C++ @@ -337,7 +337,7 @@ supports some nifty things that have never been seen elsewhere like correct mDNS reflection accross LAN segments. %package compat-howl-devel -License: LGPL v2.1 or later +License: LGPLv2.1+ Summary: howl Compatibility Package for D-BUS Service for Zeroconf/Bonjour Requires: libavahi-devel = %{version} libhowl0 = %{version} Group: Development/Libraries/C and C++ @@ -637,6 +637,7 @@ things, like correct mDNS reflection across LAN segments. %prep %setup -q -n %{_name}-%{version} +translation-update-upstream %patch0 %patch1 -p1 %patch2 @@ -831,7 +832,7 @@ rm -rf $RPM_BUILD_ROOT %post /sbin/ldconfig -%{fillup_and_insserv -f -Y avahi-daemon} +%{fillup_and_insserv -f -y avahi-daemon} %{fillup_and_insserv -f avahi-dnsconfd} %preun diff --git a/avahi-mono.changes b/avahi-mono.changes index f20edd2..e8832a0 100644 --- a/avahi-mono.changes +++ b/avahi-mono.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Mar 15 17:10:10 CET 2010 - sbrabec@suse.cz + +- Added support for translation-update-upstream (FATE#301344). + ------------------------------------------------------------------- Sun Aug 9 12:43:26 CEST 2009 - coolo@novell.com diff --git a/avahi-mono.spec b/avahi-mono.spec index 76e62c1..661fd89 100644 --- a/avahi-mono.spec +++ b/avahi-mono.spec @@ -73,7 +73,7 @@ Patch10: avahi-unicastdomains.patch # PATCH-FIX-UPSTREAM avahi-init_unused-not-dead.patch bnc#329708 dimstar@opensuse.org -- Report unused instead of dead Patch11: avahi-init_unused-not-dead.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildRequires: dbus-1-python fdupes gcc-c++ gdbm-devel intltool libdaemon-devel libexpat-devel pkg-config +BuildRequires: dbus-1-python fdupes gcc-c++ gdbm-devel intltool libdaemon-devel libexpat-devel pkg-config translation-update-upstream # Even if we are not building python bindings, we need python to build service types database: BuildRequires: python-devel python-gdbm %if %suse_version <= 1110 @@ -271,7 +271,7 @@ addition, it supports some nifty things that have never been seen elsewhere, like correct mDNS reflection across LAN segments. %package utils -License: LGPL v2.1 or later +License: LGPLv2.1+ Summary: Command Line Utilities for D-BUS Service for Zeroconf and Bonjour Requires: %{_name} >= %{version} Group: Productivity/Networking/Other @@ -313,7 +313,7 @@ supports some nifty things that have never been seen elsewhere like correct mDNS reflection accross LAN segments. %package compat-mDNSResponder-devel -License: LGPL v2.1 or later +License: LGPLv2.1+ Summary: mDNSResponder Compatibility Package for D-BUS Service for Zeroconf/Bonjour Requires: libavahi-devel = %{version} libdns_sd = %{version} Group: Development/Libraries/C and C++ @@ -336,7 +336,7 @@ supports some nifty things that have never been seen elsewhere like correct mDNS reflection accross LAN segments. %package compat-howl-devel -License: LGPL v2.1 or later +License: LGPLv2.1+ Summary: howl Compatibility Package for D-BUS Service for Zeroconf/Bonjour Requires: libavahi-devel = %{version} libhowl0 = %{version} Group: Development/Libraries/C and C++ @@ -636,6 +636,7 @@ things, like correct mDNS reflection across LAN segments. %prep %setup -q -n %{_name}-%{version} +translation-update-upstream %patch0 %patch1 -p1 %patch2 @@ -830,7 +831,7 @@ rm -rf $RPM_BUILD_ROOT %post /sbin/ldconfig -%{fillup_and_insserv -f -Y avahi-daemon} +%{fillup_and_insserv -f -y avahi-daemon} %{fillup_and_insserv -f avahi-dnsconfd} %preun diff --git a/avahi-qt4.changes b/avahi-qt4.changes index 1f9094b..c430c0a 100644 --- a/avahi-qt4.changes +++ b/avahi-qt4.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Mar 15 17:10:10 CET 2010 - sbrabec@suse.cz + +- Added support for translation-update-upstream (FATE#301344). + ------------------------------------------------------------------- Sun Aug 9 12:43:26 CEST 2009 - coolo@novell.com diff --git a/avahi-qt4.spec b/avahi-qt4.spec index d9b52eb..4f3222f 100644 --- a/avahi-qt4.spec +++ b/avahi-qt4.spec @@ -73,7 +73,7 @@ Patch10: avahi-unicastdomains.patch # PATCH-FIX-UPSTREAM avahi-init_unused-not-dead.patch bnc#329708 dimstar@opensuse.org -- Report unused instead of dead Patch11: avahi-init_unused-not-dead.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildRequires: dbus-1-python fdupes gcc-c++ gdbm-devel intltool libdaemon-devel libexpat-devel pkg-config +BuildRequires: dbus-1-python fdupes gcc-c++ gdbm-devel intltool libdaemon-devel libexpat-devel pkg-config translation-update-upstream # Even if we are not building python bindings, we need python to build service types database: BuildRequires: python-devel python-gdbm %if %suse_version <= 1110 @@ -274,7 +274,7 @@ addition, it supports some nifty things that have never been seen elsewhere, like correct mDNS reflection across LAN segments. %package utils -License: LGPL v2.1 or later +License: LGPLv2.1+ Summary: Command Line Utilities for D-BUS Service for Zeroconf and Bonjour Requires: %{_name} >= %{version} Group: Productivity/Networking/Other @@ -316,7 +316,7 @@ supports some nifty things that have never been seen elsewhere like correct mDNS reflection accross LAN segments. %package compat-mDNSResponder-devel -License: LGPL v2.1 or later +License: LGPLv2.1+ Summary: mDNSResponder Compatibility Package for D-BUS Service for Zeroconf/Bonjour Requires: libavahi-devel = %{version} libdns_sd = %{version} Group: Development/Libraries/C and C++ @@ -339,7 +339,7 @@ supports some nifty things that have never been seen elsewhere like correct mDNS reflection accross LAN segments. %package compat-howl-devel -License: LGPL v2.1 or later +License: LGPLv2.1+ Summary: howl Compatibility Package for D-BUS Service for Zeroconf/Bonjour Requires: libavahi-devel = %{version} libhowl0 = %{version} Group: Development/Libraries/C and C++ @@ -639,6 +639,7 @@ things, like correct mDNS reflection across LAN segments. %prep %setup -q -n %{_name}-%{version} +translation-update-upstream %patch0 %patch1 -p1 %patch2 @@ -833,7 +834,7 @@ rm -rf $RPM_BUILD_ROOT %post /sbin/ldconfig -%{fillup_and_insserv -f -Y avahi-daemon} +%{fillup_and_insserv -f -y avahi-daemon} %{fillup_and_insserv -f avahi-dnsconfd} %preun diff --git a/avahi.changes b/avahi.changes index 242c096..4d9473c 100644 --- a/avahi.changes +++ b/avahi.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Mar 15 17:10:10 CET 2010 - sbrabec@suse.cz + +- Do not force start avahi daemon on update (bnc#588367). +- Added support for translation-update-upstream (FATE#301344). + ------------------------------------------------------------------- Tue Dec 15 22:09:00 CET 2009 - jengelh@medozas.de diff --git a/avahi.spec b/avahi.spec index c3e7e78..fb4cd80 100644 --- a/avahi.spec +++ b/avahi.spec @@ -75,7 +75,7 @@ Patch10: avahi-unicastdomains.patch # PATCH-FIX-UPSTREAM avahi-init_unused-not-dead.patch bnc#329708 dimstar@opensuse.org -- Report unused instead of dead Patch11: avahi-init_unused-not-dead.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildRequires: dbus-1-python fdupes gcc-c++ gdbm-devel intltool libdaemon-devel libexpat-devel pkg-config +BuildRequires: dbus-1-python fdupes gcc-c++ gdbm-devel intltool libdaemon-devel libexpat-devel pkg-config translation-update-upstream # Even if we are not building python bindings, we need python to build service types database: BuildRequires: python-devel python-gdbm %if %suse_version <= 1110 @@ -639,6 +639,7 @@ things, like correct mDNS reflection across LAN segments. %prep %setup -q -n %{_name}-%{version} +translation-update-upstream %patch0 %patch1 -p1 %patch2 @@ -833,7 +834,7 @@ rm -rf $RPM_BUILD_ROOT %post /sbin/ldconfig -%{fillup_and_insserv -f -Y avahi-daemon} +%{fillup_and_insserv -f -y avahi-daemon} %{fillup_and_insserv -f avahi-dnsconfd} %preun