From 81703027d535b59ed551db4d843fb3e1106badbdfafcc01124fc21760feb215e Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Wed, 30 Jan 2013 08:31:36 +0000 Subject: [PATCH] Accepting request 150131 from home:rmilasan:branches:GNOME:Factory - Add avahi-move-everything-to-run.patch: move everything (socket and pid files) to /run. OBS-URL: https://build.opensuse.org/request/show/150131 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/avahi?expand=0&rev=94 --- avahi-glib2.spec | 16 ++++++++++------ avahi-mono.spec | 16 ++++++++++------ avahi-move-everything-to-run.patch | 26 ++++++++++++++++++++++++++ avahi-qt4.spec | 16 ++++++++++------ avahi.changes | 6 ++++++ avahi.spec | 16 ++++++++++------ 6 files changed, 72 insertions(+), 24 deletions(-) create mode 100644 avahi-move-everything-to-run.patch diff --git a/avahi-glib2.spec b/avahi-glib2.spec index 9ab1ace..5f42bd7 100644 --- a/avahi-glib2.spec +++ b/avahi-glib2.spec @@ -1,7 +1,7 @@ # # spec file for package avahi-glib2 # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -60,13 +60,13 @@ Source101: update_spec.pl Source102: baselibs.conf # Copy of glib-2.0.m4 from glib2-devel to not depend on glib2-devel. Source4: avahi-glib-gettext.m4 -#PATCH-FIX-OPENSUSE avahi-gacdir.patch -- Mono libs are in $prefix/lib on suse +# PATCH-FIX-OPENSUSE avahi-gacdir.patch -- Mono libs are in $prefix/lib on suse Patch0: avahi-gacdir.patch -#PATCH-FIX-UPSTREAM avahi-desktop.patch bnc254654 sbrabec@suse.de +# PATCH-FIX-UPSTREAM avahi-desktop.patch bnc254654 sbrabec@suse.de Patch1: avahi-desktop.patch -#PATCH-FIX-UPSTREAM avahi-empty-share-dir.patch jpr@novell.com -- mailed maintainer +# PATCH-FIX-UPSTREAM avahi-empty-share-dir.patch jpr@novell.com -- mailed maintainer Patch3: avahi-empty-share-dir.patch -#PATCH-FIX-OPENSUSE avahi-unicastdomains.patch bnc433359 lnussel@suse.de -- disable pre-set unicast domains by default +# PATCH-FIX-OPENSUSE avahi-unicastdomains.patch bnc433359 lnussel@suse.de -- disable pre-set unicast domains by default Patch10: avahi-unicastdomains.patch # PATCH-FIX-UPSTREAM avahi-gtk_box_new.patch dimstar@opensuse.org -- Do not use deprecated gtk_[hv]box_new, http://www.avahi.org/ticket/342 Patch11: avahi-gtk_box_new.patch @@ -74,8 +74,10 @@ Patch11: avahi-gtk_box_new.patch Patch12: avahi-gir-fixup.patch # PATCH-FIX-UPSTREAM avahi-fix-mkdir.diff coolo@suse.de -- Avoid obsolete automake macros Patch13: avahi-fix-mkdir.diff -#PATCH-FIX-OPENSUSE avahi-enable-ipv6.patch bnc#710230 vuntz@opensuse.org -- Enable ipv6 by default +# PATCH-FIX-OPENSUSE avahi-enable-ipv6.patch bnc#710230 vuntz@opensuse.org -- Enable ipv6 by default Patch14: avahi-enable-ipv6.patch +# PATCH-FIX-OPENSUSE avahi-move-everything-to-run.patch rmilasan@suse.com -- Move everything to /run directory (socket and pid files) +Patch15: avahi-move-everything-to-run.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: dbus-1-python BuildRequires: fdupes @@ -726,6 +728,8 @@ translation-update-upstream %patch12 -p1 %patch13 -p1 %patch14 -p1 +%patch15 -p1 + %if !%build_core # Replace all .la references from local .la files to installed versions # with exception of libavahi-glib.la. diff --git a/avahi-mono.spec b/avahi-mono.spec index b3da2f6..6dcb3e7 100644 --- a/avahi-mono.spec +++ b/avahi-mono.spec @@ -1,7 +1,7 @@ # # spec file for package avahi-mono # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -60,13 +60,13 @@ Source101: update_spec.pl Source102: baselibs.conf # Copy of glib-2.0.m4 from glib2-devel to not depend on glib2-devel. Source4: avahi-glib-gettext.m4 -#PATCH-FIX-OPENSUSE avahi-gacdir.patch -- Mono libs are in $prefix/lib on suse +# PATCH-FIX-OPENSUSE avahi-gacdir.patch -- Mono libs are in $prefix/lib on suse Patch0: avahi-gacdir.patch -#PATCH-FIX-UPSTREAM avahi-desktop.patch bnc254654 sbrabec@suse.de +# PATCH-FIX-UPSTREAM avahi-desktop.patch bnc254654 sbrabec@suse.de Patch1: avahi-desktop.patch -#PATCH-FIX-UPSTREAM avahi-empty-share-dir.patch jpr@novell.com -- mailed maintainer +# PATCH-FIX-UPSTREAM avahi-empty-share-dir.patch jpr@novell.com -- mailed maintainer Patch3: avahi-empty-share-dir.patch -#PATCH-FIX-OPENSUSE avahi-unicastdomains.patch bnc433359 lnussel@suse.de -- disable pre-set unicast domains by default +# PATCH-FIX-OPENSUSE avahi-unicastdomains.patch bnc433359 lnussel@suse.de -- disable pre-set unicast domains by default Patch10: avahi-unicastdomains.patch # PATCH-FIX-UPSTREAM avahi-gtk_box_new.patch dimstar@opensuse.org -- Do not use deprecated gtk_[hv]box_new, http://www.avahi.org/ticket/342 Patch11: avahi-gtk_box_new.patch @@ -74,8 +74,10 @@ Patch11: avahi-gtk_box_new.patch Patch12: avahi-gir-fixup.patch # PATCH-FIX-UPSTREAM avahi-fix-mkdir.diff coolo@suse.de -- Avoid obsolete automake macros Patch13: avahi-fix-mkdir.diff -#PATCH-FIX-OPENSUSE avahi-enable-ipv6.patch bnc#710230 vuntz@opensuse.org -- Enable ipv6 by default +# PATCH-FIX-OPENSUSE avahi-enable-ipv6.patch bnc#710230 vuntz@opensuse.org -- Enable ipv6 by default Patch14: avahi-enable-ipv6.patch +# PATCH-FIX-OPENSUSE avahi-move-everything-to-run.patch rmilasan@suse.com -- Move everything to /run directory (socket and pid files) +Patch15: avahi-move-everything-to-run.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: dbus-1-python BuildRequires: fdupes @@ -725,6 +727,8 @@ translation-update-upstream %patch12 -p1 %patch13 -p1 %patch14 -p1 +%patch15 -p1 + %if !%build_core # Replace all .la references from local .la files to installed versions # with exception of libavahi-glib.la. diff --git a/avahi-move-everything-to-run.patch b/avahi-move-everything-to-run.patch new file mode 100644 index 0000000..7a15669 --- /dev/null +++ b/avahi-move-everything-to-run.patch @@ -0,0 +1,26 @@ +Index: avahi-0.6.31/configure +=================================================================== +--- avahi-0.6.31.orig/configure ++++ avahi-0.6.31/configure +@@ -22710,7 +22710,7 @@ _ACEOF + # + # Avahi runtime dir + # +-avahi_runtime_dir="${localstatedir}/run" ++avahi_runtime_dir="/run" + avahi_socket="${avahi_runtime_dir}/avahi-daemon/socket" + + +Index: avahi-0.6.31/configure.ac +=================================================================== +--- avahi-0.6.31.orig/configure.ac ++++ avahi-0.6.31/configure.ac +@@ -956,7 +956,7 @@ AC_DEFINE_UNQUOTED(AVAHI_AUTOIPD_GROUP," + # + # Avahi runtime dir + # +-avahi_runtime_dir="${localstatedir}/run" ++avahi_runtime_dir="/run" + avahi_socket="${avahi_runtime_dir}/avahi-daemon/socket" + AC_SUBST(avahi_runtime_dir) + AC_SUBST(avahi_socket) diff --git a/avahi-qt4.spec b/avahi-qt4.spec index a21e34c..19d3a4d 100644 --- a/avahi-qt4.spec +++ b/avahi-qt4.spec @@ -1,7 +1,7 @@ # # spec file for package avahi-qt4 # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -60,13 +60,13 @@ Source101: update_spec.pl Source102: baselibs.conf # Copy of glib-2.0.m4 from glib2-devel to not depend on glib2-devel. Source4: avahi-glib-gettext.m4 -#PATCH-FIX-OPENSUSE avahi-gacdir.patch -- Mono libs are in $prefix/lib on suse +# PATCH-FIX-OPENSUSE avahi-gacdir.patch -- Mono libs are in $prefix/lib on suse Patch0: avahi-gacdir.patch -#PATCH-FIX-UPSTREAM avahi-desktop.patch bnc254654 sbrabec@suse.de +# PATCH-FIX-UPSTREAM avahi-desktop.patch bnc254654 sbrabec@suse.de Patch1: avahi-desktop.patch -#PATCH-FIX-UPSTREAM avahi-empty-share-dir.patch jpr@novell.com -- mailed maintainer +# PATCH-FIX-UPSTREAM avahi-empty-share-dir.patch jpr@novell.com -- mailed maintainer Patch3: avahi-empty-share-dir.patch -#PATCH-FIX-OPENSUSE avahi-unicastdomains.patch bnc433359 lnussel@suse.de -- disable pre-set unicast domains by default +# PATCH-FIX-OPENSUSE avahi-unicastdomains.patch bnc433359 lnussel@suse.de -- disable pre-set unicast domains by default Patch10: avahi-unicastdomains.patch # PATCH-FIX-UPSTREAM avahi-gtk_box_new.patch dimstar@opensuse.org -- Do not use deprecated gtk_[hv]box_new, http://www.avahi.org/ticket/342 Patch11: avahi-gtk_box_new.patch @@ -74,8 +74,10 @@ Patch11: avahi-gtk_box_new.patch Patch12: avahi-gir-fixup.patch # PATCH-FIX-UPSTREAM avahi-fix-mkdir.diff coolo@suse.de -- Avoid obsolete automake macros Patch13: avahi-fix-mkdir.diff -#PATCH-FIX-OPENSUSE avahi-enable-ipv6.patch bnc#710230 vuntz@opensuse.org -- Enable ipv6 by default +# PATCH-FIX-OPENSUSE avahi-enable-ipv6.patch bnc#710230 vuntz@opensuse.org -- Enable ipv6 by default Patch14: avahi-enable-ipv6.patch +# PATCH-FIX-OPENSUSE avahi-move-everything-to-run.patch rmilasan@suse.com -- Move everything to /run directory (socket and pid files) +Patch15: avahi-move-everything-to-run.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: dbus-1-python BuildRequires: fdupes @@ -728,6 +730,8 @@ translation-update-upstream %patch12 -p1 %patch13 -p1 %patch14 -p1 +%patch15 -p1 + %if !%build_core # Replace all .la references from local .la files to installed versions # with exception of libavahi-glib.la. diff --git a/avahi.changes b/avahi.changes index b0894aa..db63580 100644 --- a/avahi.changes +++ b/avahi.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Jan 28 10:01:28 UTC 2013 - rmilasan@suse.com + +- Add avahi-move-everything-to-run.patch: move everything + (socket and pid files) to /run. + ------------------------------------------------------------------- Wed Nov 14 09:05:25 UTC 2012 - dimstar@opensuse.org diff --git a/avahi.spec b/avahi.spec index 24f98f6..63cf177 100644 --- a/avahi.spec +++ b/avahi.spec @@ -1,7 +1,7 @@ # # spec file for package avahi # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -62,13 +62,13 @@ Source101: update_spec.pl Source102: baselibs.conf # Copy of glib-2.0.m4 from glib2-devel to not depend on glib2-devel. Source4: avahi-glib-gettext.m4 -#PATCH-FIX-OPENSUSE avahi-gacdir.patch -- Mono libs are in $prefix/lib on suse +# PATCH-FIX-OPENSUSE avahi-gacdir.patch -- Mono libs are in $prefix/lib on suse Patch0: avahi-gacdir.patch -#PATCH-FIX-UPSTREAM avahi-desktop.patch bnc254654 sbrabec@suse.de +# PATCH-FIX-UPSTREAM avahi-desktop.patch bnc254654 sbrabec@suse.de Patch1: avahi-desktop.patch -#PATCH-FIX-UPSTREAM avahi-empty-share-dir.patch jpr@novell.com -- mailed maintainer +# PATCH-FIX-UPSTREAM avahi-empty-share-dir.patch jpr@novell.com -- mailed maintainer Patch3: avahi-empty-share-dir.patch -#PATCH-FIX-OPENSUSE avahi-unicastdomains.patch bnc433359 lnussel@suse.de -- disable pre-set unicast domains by default +# PATCH-FIX-OPENSUSE avahi-unicastdomains.patch bnc433359 lnussel@suse.de -- disable pre-set unicast domains by default Patch10: avahi-unicastdomains.patch # PATCH-FIX-UPSTREAM avahi-gtk_box_new.patch dimstar@opensuse.org -- Do not use deprecated gtk_[hv]box_new, http://www.avahi.org/ticket/342 Patch11: avahi-gtk_box_new.patch @@ -76,8 +76,10 @@ Patch11: avahi-gtk_box_new.patch Patch12: avahi-gir-fixup.patch # PATCH-FIX-UPSTREAM avahi-fix-mkdir.diff coolo@suse.de -- Avoid obsolete automake macros Patch13: avahi-fix-mkdir.diff -#PATCH-FIX-OPENSUSE avahi-enable-ipv6.patch bnc#710230 vuntz@opensuse.org -- Enable ipv6 by default +# PATCH-FIX-OPENSUSE avahi-enable-ipv6.patch bnc#710230 vuntz@opensuse.org -- Enable ipv6 by default Patch14: avahi-enable-ipv6.patch +# PATCH-FIX-OPENSUSE avahi-move-everything-to-run.patch rmilasan@suse.com -- Move everything to /run directory (socket and pid files) +Patch15: avahi-move-everything-to-run.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: dbus-1-python BuildRequires: fdupes @@ -728,6 +730,8 @@ translation-update-upstream %patch12 -p1 %patch13 -p1 %patch14 -p1 +%patch15 -p1 + %if !%build_core # Replace all .la references from local .la files to installed versions # with exception of libavahi-glib.la.