pool/avahi
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 150379 from GNOME:Factory

Browse Source 
- Add avahi-move-everything-to-run.patch: move everything 
  (socket and pid files) to /run. (forwarded request 150131 from dimstar)

OBS-URL: https://build.opensuse.org/request/show/150379
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/avahi?expand=0&rev=99
This commit is contained in:
Stephan Kulow 2013-01-30 10:13:44 +00:00 committed by Git OBS Bridge
commit 0bce65d17e
6 changed files with 72 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
avahi-glib2.spec
View File

@ -1,7 +1,7 @@
# #
# spec file for package avahi-glib2 # 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 # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -60,13 +60,13 @@ Source101: update_spec.pl
Source102: baselibs.conf Source102: baselibs.conf
# Copy of glib-2.0.m4 from glib2-devel to not depend on glib2-devel. # Copy of glib-2.0.m4 from glib2-devel to not depend on glib2-devel.
Source4: avahi-glib-gettext.m4 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 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 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 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 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 # 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 Patch11: avahi-gtk_box_new.patch
@ -74,8 +74,10 @@ Patch11: avahi-gtk_box_new.patch
Patch12: avahi-gir-fixup.patch Patch12: avahi-gir-fixup.patch
# PATCH-FIX-UPSTREAM avahi-fix-mkdir.diff coolo@suse.de -- Avoid obsolete automake macros # PATCH-FIX-UPSTREAM avahi-fix-mkdir.diff coolo@suse.de -- Avoid obsolete automake macros
Patch13: avahi-fix-mkdir.diff 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 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 BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: dbus-1-python BuildRequires: dbus-1-python
BuildRequires: fdupes BuildRequires: fdupes
@ -726,6 +728,8 @@ translation-update-upstream
%patch12 -p1 %patch12 -p1
%patch13 -p1 %patch13 -p1
%patch14 -p1 %patch14 -p1
%patch15 -p1
%if !%build_core %if !%build_core
# Replace all .la references from local .la files to installed versions # Replace all .la references from local .la files to installed versions
# with exception of libavahi-glib.la. # with exception of libavahi-glib.la.

16
avahi-mono.spec
View File

@ -1,7 +1,7 @@
# #
# spec file for package avahi-mono # 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 # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -60,13 +60,13 @@ Source101: update_spec.pl
Source102: baselibs.conf Source102: baselibs.conf
# Copy of glib-2.0.m4 from glib2-devel to not depend on glib2-devel. # Copy of glib-2.0.m4 from glib2-devel to not depend on glib2-devel.
Source4: avahi-glib-gettext.m4 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 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 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 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 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 # 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 Patch11: avahi-gtk_box_new.patch
@ -74,8 +74,10 @@ Patch11: avahi-gtk_box_new.patch
Patch12: avahi-gir-fixup.patch Patch12: avahi-gir-fixup.patch
# PATCH-FIX-UPSTREAM avahi-fix-mkdir.diff coolo@suse.de -- Avoid obsolete automake macros # PATCH-FIX-UPSTREAM avahi-fix-mkdir.diff coolo@suse.de -- Avoid obsolete automake macros
Patch13: avahi-fix-mkdir.diff 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 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 BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: dbus-1-python BuildRequires: dbus-1-python
BuildRequires: fdupes BuildRequires: fdupes
@ -725,6 +727,8 @@ translation-update-upstream
%patch12 -p1 %patch12 -p1
%patch13 -p1 %patch13 -p1
%patch14 -p1 %patch14 -p1
%patch15 -p1
%if !%build_core %if !%build_core
# Replace all .la references from local .la files to installed versions # Replace all .la references from local .la files to installed versions
# with exception of libavahi-glib.la. # with exception of libavahi-glib.la.

26
avahi-move-everything-to-run.patch Normal file
View File

@ -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)

16
avahi-qt4.spec
View File

@ -1,7 +1,7 @@
# #
# spec file for package avahi-qt4 # 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 # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -60,13 +60,13 @@ Source101: update_spec.pl
Source102: baselibs.conf Source102: baselibs.conf
# Copy of glib-2.0.m4 from glib2-devel to not depend on glib2-devel. # Copy of glib-2.0.m4 from glib2-devel to not depend on glib2-devel.
Source4: avahi-glib-gettext.m4 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 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 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 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 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 # 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 Patch11: avahi-gtk_box_new.patch
@ -74,8 +74,10 @@ Patch11: avahi-gtk_box_new.patch
Patch12: avahi-gir-fixup.patch Patch12: avahi-gir-fixup.patch
# PATCH-FIX-UPSTREAM avahi-fix-mkdir.diff coolo@suse.de -- Avoid obsolete automake macros # PATCH-FIX-UPSTREAM avahi-fix-mkdir.diff coolo@suse.de -- Avoid obsolete automake macros
Patch13: avahi-fix-mkdir.diff 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 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 BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: dbus-1-python BuildRequires: dbus-1-python
BuildRequires: fdupes BuildRequires: fdupes
@ -728,6 +730,8 @@ translation-update-upstream
%patch12 -p1 %patch12 -p1
%patch13 -p1 %patch13 -p1
%patch14 -p1 %patch14 -p1
%patch15 -p1
%if !%build_core %if !%build_core
# Replace all .la references from local .la files to installed versions # Replace all .la references from local .la files to installed versions
# with exception of libavahi-glib.la. # with exception of libavahi-glib.la.

6
avahi.changes
View File

@ -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 Wed Nov 14 09:05:25 UTC 2012 - dimstar@opensuse.org

16
avahi.spec
View File

@ -1,7 +1,7 @@
# #
# spec file for package avahi # 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 # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -62,13 +62,13 @@ Source101: update_spec.pl
Source102: baselibs.conf Source102: baselibs.conf
# Copy of glib-2.0.m4 from glib2-devel to not depend on glib2-devel. # Copy of glib-2.0.m4 from glib2-devel to not depend on glib2-devel.
Source4: avahi-glib-gettext.m4 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 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 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 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 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 # 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 Patch11: avahi-gtk_box_new.patch
@ -76,8 +76,10 @@ Patch11: avahi-gtk_box_new.patch
Patch12: avahi-gir-fixup.patch Patch12: avahi-gir-fixup.patch
# PATCH-FIX-UPSTREAM avahi-fix-mkdir.diff coolo@suse.de -- Avoid obsolete automake macros # PATCH-FIX-UPSTREAM avahi-fix-mkdir.diff coolo@suse.de -- Avoid obsolete automake macros
Patch13: avahi-fix-mkdir.diff 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 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 BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: dbus-1-python BuildRequires: dbus-1-python
BuildRequires: fdupes BuildRequires: fdupes
@ -728,6 +730,8 @@ translation-update-upstream
%patch12 -p1 %patch12 -p1
%patch13 -p1 %patch13 -p1
%patch14 -p1 %patch14 -p1
%patch15 -p1
%if !%build_core %if !%build_core
# Replace all .la references from local .la files to installed versions # Replace all .la references from local .la files to installed versions
# with exception of libavahi-glib.la. # with exception of libavahi-glib.la.