From 60565a61e85bcd8aeba02abc09772d5af8baeb661e2cfb21709c48e7c764744e Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Wed, 29 Sep 2010 07:03:15 +0000 Subject: [PATCH 1/3] Accepting request 49452 from home:a_jaeger:branches:openSUSE:Factory Thanks OBS-URL: https://build.opensuse.org/request/show/49452 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/avahi?expand=0&rev=45 --- avahi-glib2.spec | 2 +- avahi-mono.spec | 2 +- avahi-qt4.spec | 2 +- avahi.changes | 6 ++++++ avahi.spec | 2 +- 5 files changed, 10 insertions(+), 4 deletions(-) diff --git a/avahi-glib2.spec b/avahi-glib2.spec index 75d5b68..4434fd8 100644 --- a/avahi-glib2.spec +++ b/avahi-glib2.spec @@ -84,7 +84,7 @@ BuildRequires: python-devel python-gdbm %if %build_core Source5: %{_name}_spec-prepare.sh PreReq: pwdutils -Requires: %{_name}-lang = %{version} +Recommends: %{_name}-lang BuildRequires: dbus-1-devel doxygen graphviz python-gdbm zlib-devel # For python bindings and utilities: #BuildRequires: dbus-1-python diff --git a/avahi-mono.spec b/avahi-mono.spec index 1aeeb43..fc375ff 100644 --- a/avahi-mono.spec +++ b/avahi-mono.spec @@ -84,7 +84,7 @@ BuildRequires: python-devel python-gdbm %if %build_core Source5: %{_name}_spec-prepare.sh PreReq: pwdutils -Requires: %{_name}-lang = %{version} +Recommends: %{_name}-lang BuildRequires: dbus-1-devel doxygen graphviz python-gdbm zlib-devel # For python bindings and utilities: #BuildRequires: dbus-1-python diff --git a/avahi-qt4.spec b/avahi-qt4.spec index b54f6ed..69c441b 100644 --- a/avahi-qt4.spec +++ b/avahi-qt4.spec @@ -84,7 +84,7 @@ BuildRequires: python-devel python-gdbm %if %build_core Source5: %{_name}_spec-prepare.sh PreReq: pwdutils -Requires: %{_name}-lang = %{version} +Recommends: %{_name}-lang BuildRequires: dbus-1-devel doxygen graphviz python-gdbm zlib-devel # For python bindings and utilities: #BuildRequires: dbus-1-python diff --git a/avahi.changes b/avahi.changes index 14769bf..c8a075f 100644 --- a/avahi.changes +++ b/avahi.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Sep 29 02:11:18 UTC 2010 - aj@suse.de + +- Change lang package Requires to Recommends since it is not + mandatory at runtime. + ------------------------------------------------------------------- Sat Sep 18 17:29:54 CEST 2010 - vuntz@opensuse.org diff --git a/avahi.spec b/avahi.spec index 0f5bb46..4de6db2 100644 --- a/avahi.spec +++ b/avahi.spec @@ -86,7 +86,7 @@ BuildRequires: python-devel python-gdbm %if %build_core Source5: %{_name}_spec-prepare.sh PreReq: pwdutils -Requires: %{_name}-lang = %{version} +Recommends: %{_name}-lang BuildRequires: dbus-1-devel doxygen graphviz python-gdbm zlib-devel # For python bindings and utilities: #BuildRequires: dbus-1-python From c9d11fa74c5cfc9248f053a54c7cd032b2c80b9ec1863c2bb271be09d1e031f2 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Wed, 6 Oct 2010 14:21:13 +0000 Subject: [PATCH 2/3] Accepting request 49774 from home:vuntz:branches:GNOME:Factory Thanks OBS-URL: https://build.opensuse.org/request/show/49774 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/avahi?expand=0&rev=46 --- avahi-0.6.27.tar.bz2 | 3 --- avahi-0.6.28.tar.bz2 | 3 +++ avahi-glib2.spec | 9 +++----- avahi-gobject-introspection-1.2.patch | 32 --------------------------- avahi-mono.spec | 9 +++----- avahi-qt4.spec | 9 +++----- avahi.changes | 11 +++++++++ avahi.spec | 9 +++----- 8 files changed, 26 insertions(+), 59 deletions(-) delete mode 100644 avahi-0.6.27.tar.bz2 create mode 100644 avahi-0.6.28.tar.bz2 delete mode 100644 avahi-gobject-introspection-1.2.patch diff --git a/avahi-0.6.27.tar.bz2 b/avahi-0.6.27.tar.bz2 deleted file mode 100644 index c95b5a3..0000000 --- a/avahi-0.6.27.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:86e159d1edafcd7dbd16f8638a5bab592165fc08fc4603f3e9b30ce479886a63 -size 905690 diff --git a/avahi-0.6.28.tar.bz2 b/avahi-0.6.28.tar.bz2 new file mode 100644 index 0000000..1c0c900 --- /dev/null +++ b/avahi-0.6.28.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ac7309cd1469988f4ddd8be6b0d67b6e6b4180fe0b7c62fa83b8f1be24589535 +size 906458 diff --git a/avahi-glib2.spec b/avahi-glib2.spec index 4434fd8..d7bcb23 100644 --- a/avahi-glib2.spec +++ b/avahi-glib2.spec @@ -1,5 +1,5 @@ # -# spec file for package avahi-glib2 (Version 0.6.27) +# spec file for package avahi-glib2 (Version 0.6.28) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -30,8 +30,8 @@ Name: avahi-glib2 %define build_mono 0 %define build_qt3 0 %define build_qt4 0 -Version: 0.6.27 -Release: 2 +Version: 0.6.28 +Release: 1 %if !%build_glib2 && !%build_mono && !%build_qt3 && !%build_qt4 # Create split spec files only when building per partes: #%(sh %{_sourcedir}/%{_name}_spec-prepare.sh %{_sourcedir} %{name}) @@ -68,8 +68,6 @@ Patch1: avahi-desktop.patch Patch2: avahi-init-lsb.patch #PATCH-FIX-UPSTREAM avahi-empty-share-dir.patch jpr@novell.com -- mailed maintainer Patch3: avahi-empty-share-dir.patch -# PATCH-FIX-UPSTREAM avahi-gobject-introspection-1.2.patch vuntz@opensuse.org -- New version of introspection format; http://www.avahi.org/ticket/318 -Patch4: avahi-gobject-introspection-1.2.patch # PATCH-FIX-UPSTREAM avahi-fix-howl.pc.patch vuntz@opensuse.org -- Fix howl.pc to be correctly generated, mailed upstream Patch5: avahi-fix-howl.pc.patch #PATCH-FIX-OPENSUSE avahi-unicastdomains.patch bnc433359 lnussel@suse.de -- disable pre-set unicast domains by default @@ -644,7 +642,6 @@ translation-update-upstream %patch1 -p1 %patch2 %patch3 -%patch4 -p1 %patch5 -p1 %patch10 -p1 %if !%build_core diff --git a/avahi-gobject-introspection-1.2.patch b/avahi-gobject-introspection-1.2.patch deleted file mode 100644 index e165477..0000000 --- a/avahi-gobject-introspection-1.2.patch +++ /dev/null @@ -1,32 +0,0 @@ -Index: avahi-0.6.27/avahi-gobject/AvahiCore-0.6.gir -=================================================================== ---- avahi-0.6.27.orig/avahi-gobject/AvahiCore-0.6.gir -+++ avahi-0.6.27/avahi-gobject/AvahiCore-0.6.gir -@@ -1,10 +1,12 @@ - -- - -- -+ -+ -+ - - Date: Thu, 14 Oct 2010 07:49:34 +0000 Subject: [PATCH 3/3] Accepting request 50492 from home:vuntz:branches:GNOME:Factory OBS-URL: https://build.opensuse.org/request/show/50492 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/avahi?expand=0&rev=47 --- avahi-glib2.spec | 3 +++ avahi-init-dnsconfd-fix-status.patch | 25 +++++++++++++++++++++++++ avahi-mono.spec | 3 +++ avahi-qt4.spec | 3 +++ avahi.changes | 7 +++++++ avahi.spec | 3 +++ 6 files changed, 44 insertions(+) create mode 100644 avahi-init-dnsconfd-fix-status.patch diff --git a/avahi-glib2.spec b/avahi-glib2.spec index d7bcb23..278c089 100644 --- a/avahi-glib2.spec +++ b/avahi-glib2.spec @@ -68,6 +68,8 @@ Patch1: avahi-desktop.patch Patch2: avahi-init-lsb.patch #PATCH-FIX-UPSTREAM avahi-empty-share-dir.patch jpr@novell.com -- mailed maintainer Patch3: avahi-empty-share-dir.patch +# PATCH-FIX-UPSTREAM avahi-init-dnsconfd-fix-status.patch vuntz@opensuse.org -- Report unused instead of dead for dnsconfd init script, sent upstream by mail +Patch4: avahi-init-dnsconfd-fix-status.patch # PATCH-FIX-UPSTREAM avahi-fix-howl.pc.patch vuntz@opensuse.org -- Fix howl.pc to be correctly generated, mailed upstream Patch5: avahi-fix-howl.pc.patch #PATCH-FIX-OPENSUSE avahi-unicastdomains.patch bnc433359 lnussel@suse.de -- disable pre-set unicast domains by default @@ -642,6 +644,7 @@ translation-update-upstream %patch1 -p1 %patch2 %patch3 +%patch4 -p1 %patch5 -p1 %patch10 -p1 %if !%build_core diff --git a/avahi-init-dnsconfd-fix-status.patch b/avahi-init-dnsconfd-fix-status.patch new file mode 100644 index 0000000..3101430 --- /dev/null +++ b/avahi-init-dnsconfd-fix-status.patch @@ -0,0 +1,25 @@ +From bd76c886b4bd44abad745b4b3c4bb99fe752c8f0 Mon Sep 17 00:00:00 2001 +From: Vincent Untz +Date: Wed, 13 Oct 2010 16:36:35 +0200 +Subject: [PATCH] init: suse, avahi-dnsconfd status reports dead instead of unused + +--- + initscript/suse/avahi-dnsconfd.in | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/initscript/suse/avahi-dnsconfd.in b/initscript/suse/avahi-dnsconfd.in +index e633b8d..4169737 100644 +--- a/initscript/suse/avahi-dnsconfd.in ++++ b/initscript/suse/avahi-dnsconfd.in +@@ -37,7 +37,7 @@ case "$1" in + ;; + status) + echo -n "Checking for Avahi DNS Configuration daemon: " +- $AVAHI_BIN -c ++ $AVAHI_BIN -c || _rc_status=3 + rc_status -v + ;; + *) +-- +1.7.3.1 + diff --git a/avahi-mono.spec b/avahi-mono.spec index 4bcb3c7..c5cb221 100644 --- a/avahi-mono.spec +++ b/avahi-mono.spec @@ -68,6 +68,8 @@ Patch1: avahi-desktop.patch Patch2: avahi-init-lsb.patch #PATCH-FIX-UPSTREAM avahi-empty-share-dir.patch jpr@novell.com -- mailed maintainer Patch3: avahi-empty-share-dir.patch +# PATCH-FIX-UPSTREAM avahi-init-dnsconfd-fix-status.patch vuntz@opensuse.org -- Report unused instead of dead for dnsconfd init script, sent upstream by mail +Patch4: avahi-init-dnsconfd-fix-status.patch # PATCH-FIX-UPSTREAM avahi-fix-howl.pc.patch vuntz@opensuse.org -- Fix howl.pc to be correctly generated, mailed upstream Patch5: avahi-fix-howl.pc.patch #PATCH-FIX-OPENSUSE avahi-unicastdomains.patch bnc433359 lnussel@suse.de -- disable pre-set unicast domains by default @@ -641,6 +643,7 @@ translation-update-upstream %patch1 -p1 %patch2 %patch3 +%patch4 -p1 %patch5 -p1 %patch10 -p1 %if !%build_core diff --git a/avahi-qt4.spec b/avahi-qt4.spec index 2eebd7d..7503e4d 100644 --- a/avahi-qt4.spec +++ b/avahi-qt4.spec @@ -68,6 +68,8 @@ Patch1: avahi-desktop.patch Patch2: avahi-init-lsb.patch #PATCH-FIX-UPSTREAM avahi-empty-share-dir.patch jpr@novell.com -- mailed maintainer Patch3: avahi-empty-share-dir.patch +# PATCH-FIX-UPSTREAM avahi-init-dnsconfd-fix-status.patch vuntz@opensuse.org -- Report unused instead of dead for dnsconfd init script, sent upstream by mail +Patch4: avahi-init-dnsconfd-fix-status.patch # PATCH-FIX-UPSTREAM avahi-fix-howl.pc.patch vuntz@opensuse.org -- Fix howl.pc to be correctly generated, mailed upstream Patch5: avahi-fix-howl.pc.patch #PATCH-FIX-OPENSUSE avahi-unicastdomains.patch bnc433359 lnussel@suse.de -- disable pre-set unicast domains by default @@ -644,6 +646,7 @@ translation-update-upstream %patch1 -p1 %patch2 %patch3 +%patch4 -p1 %patch5 -p1 %patch10 -p1 %if !%build_core diff --git a/avahi.changes b/avahi.changes index b418382..4cee99e 100644 --- a/avahi.changes +++ b/avahi.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Wed Oct 13 16:43:18 CEST 2010 - vuntz@opensuse.org + +- Add avahi-init-dnsconfd-fix-status.patch to make avahi-dnsconfd + init script report unused instead of dead in status when it's + unused. + ------------------------------------------------------------------- Tue Oct 5 10:52:15 CEST 2010 - vuntz@opensuse.org diff --git a/avahi.spec b/avahi.spec index d764c8e..91fc076 100644 --- a/avahi.spec +++ b/avahi.spec @@ -70,6 +70,8 @@ Patch1: avahi-desktop.patch Patch2: avahi-init-lsb.patch #PATCH-FIX-UPSTREAM avahi-empty-share-dir.patch jpr@novell.com -- mailed maintainer Patch3: avahi-empty-share-dir.patch +# PATCH-FIX-UPSTREAM avahi-init-dnsconfd-fix-status.patch vuntz@opensuse.org -- Report unused instead of dead for dnsconfd init script, sent upstream by mail +Patch4: avahi-init-dnsconfd-fix-status.patch # PATCH-FIX-UPSTREAM avahi-fix-howl.pc.patch vuntz@opensuse.org -- Fix howl.pc to be correctly generated, mailed upstream Patch5: avahi-fix-howl.pc.patch #PATCH-FIX-OPENSUSE avahi-unicastdomains.patch bnc433359 lnussel@suse.de -- disable pre-set unicast domains by default @@ -644,6 +646,7 @@ translation-update-upstream %patch1 -p1 %patch2 %patch3 +%patch4 -p1 %patch5 -p1 %patch10 -p1 %if !%build_core