Accepting request 39920 from GNOME:Factory

checked in (request 39920)

OBS-URL: https://build.opensuse.org/request/show/39920
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/avahi?expand=0&rev=33
This commit is contained in:
OBS User autobuild 2010-05-13 22:16:00 +00:00 committed by Git OBS Bridge
parent f4cc7ebba3
commit 6c0c137bba
5 changed files with 56 additions and 70 deletions

View File

@ -23,7 +23,7 @@ Name: avahi-glib2
%define _name avahi
# In automatic build systems you want to enable just one of following options.
# For build all at once, set all to 1.
# If you set build_core to 0, you cannot set more than one other option to 1.
# If you set build_core to 0, you cannot set more than one other options to 1.
%define build_core 0
# NOTE: build_glib2 also controls build of gobject, gtk2 and pygtk code.
%define build_glib2 1
@ -86,7 +86,7 @@ Requires: %{_name}-lang = %{version}
BuildRequires: dbus-1-devel doxygen graphviz python-gdbm zlib-devel
# For update of avahi-discover.glade from == 11.0:
Conflicts: avahi-utils-gtk <= 0.6.22
# For python bindings and utilities:
# For python bindings and utilities:
#BuildRequires: dbus-1-python
#Requires: dbus-1
Requires: nss-mdns
@ -97,7 +97,7 @@ Obsoletes: mDNSResponder-64bit
#
# mDNSResponder was used for <= 10.2:
Provides: mDNSResponder = 107.5
Obsoletes: mDNSResponder < 107.5
Obsoletes: mDNSResponder <= 107.5
%endif
%if %build_glib2
BuildRequires: libglade2-devel python-gtk-devel update-desktop-files
@ -204,10 +204,10 @@ Obsoletes: mDNSResponder-lib-64bit
#
# mDNSResponder-lib was used for <= 10.2:
Provides: mDNSResponder-lib = 107.5
Obsoletes: mDNSResponder-lib < 107.5
Obsoletes: mDNSResponder-lib <= 107.5
# Old name used for <= 10.3:
Provides: avahi-compat-mDNSResponder = %{version}
Obsoletes: avahi-compat-mDNSResponder < %{version}
Obsoletes: avahi-compat-mDNSResponder <= %{version}
%description -n libdns_sd
Apple mDNSResponder compatibility layer for avahi.
@ -230,7 +230,7 @@ Summary: howl Compatibility Package for D-BUS Service for Zeroconf/Bonjou
Group: System/Libraries
# Old name used for <= 10.3:
Provides: avahi-compat-howl = %{version}
Obsoletes: avahi-compat-howl < %{version}
Obsoletes: avahi-compat-howl <= %{version}
%description -n libhowl0
howl compatibility layer for avahi.
@ -255,7 +255,7 @@ Requires: %{name} = %{version} python-gdbm dbus-1-python python-twisted py
Group: Development/Languages/Python
# Old name used for <= 10.3:
Provides: avahi-python = %{version}
Obsoletes: avahi-python < %{version}
Obsoletes: avahi-python <= %{version}
%py_requires
%description -n python-avahi
@ -298,7 +298,7 @@ Requires: %{_name} = %{version} libavahi-common3 = %{version} libavahi-cor
Group: Development/Libraries/C and C++
# Last appeared in OpenSUSE 10.3:
Provides: avahi-devel = %{version}
Obsoletes: avahi-devel < %{version}
Obsoletes: avahi-devel <= %{version}
%description -n libavahi-devel
Avahi is an Implementation the DNS Service Discovery and Multicast DNS
@ -319,7 +319,7 @@ Summary: mDNSResponder Compatibility Package for D-BUS Service for Zeroco
Requires: libavahi-devel = %{version} libdns_sd = %{version}
Group: Development/Libraries/C and C++
Provides: mDNSResponder-devel = 107.5
Obsoletes: mDNSResponder-devel < 107.5
Obsoletes: mDNSResponder-devel <= 107.5
%description compat-mDNSResponder-devel
Apple mDNSResponder compatibility layer for avahi.
@ -384,7 +384,7 @@ Summary: Glib Bindings for avahi, the D-BUS Service for Zeroconf and Bonj
Group: System/GUI/GNOME
# Old name used for <= 10.3:
Provides: avahi-glib = %{version}
Obsoletes: avahi-glib < %{version}
Obsoletes: avahi-glib <= %{version}
%description -n libavahi-glib1
GLib support for avahi.
@ -451,7 +451,7 @@ Requires: python-avahi = %{version} python-gtk
Group: Development/Languages/Python
# Old name used for <= 10.3:
Provides: avahi-python = %{version}
Obsoletes: avahi-python < %{version}
Obsoletes: avahi-python <= %{version}
# Provide split-provides for update from <= 11.0:
Provides: python-avahi:%{_bindir}/avahi-bookmarks
%py_requires
@ -521,7 +521,7 @@ Summary: Qt3 Bindings for avahi, the D-BUS Service for Zeroconf and Bonjo
Group: System/GUI/KDE
# Old name used for <= 10.3:
Provides: avahi-qt3 = %{version}
Obsoletes: avahi-qt3 < %{version}
Obsoletes: avahi-qt3 <= %{version}
%description -n libavahi-qt3-1
Qt3 bindings for avahi.
@ -571,7 +571,7 @@ Summary: Qt4 Bindings for avahi, the D-BUS Service for Zeroconf and Bonjo
Group: System/GUI/KDE
# Old name used for <= 10.3:
Provides: avahi-qt4 = %{version}
Obsoletes: avahi-qt4 < %{version}
Obsoletes: avahi-qt4 <= %{version}
%description -n libavahi-qt4-1
Qt4 bindings for avahi.
@ -927,9 +927,7 @@ fi
%doc LICENSE docs/*
# Note: This file is intentionally packaged here. It is needed for avahi-utils-gtk and python-avahi-gtk:
%{_datadir}/pixmaps/gnome-nettool2.png
# avahi creates the directory itself, we do not package it
# since it might be on tmpfs
%attr(-,avahi,avahi) %ghost %{_localstatedir}/run/avahi-daemon
%attr(-,avahi,avahi) %{_localstatedir}/run/avahi-daemon
%doc %{_mandir}/man5/*.5*
%doc %{_mandir}/man8/*.8*
%{_sbindir}/avahi-*

View File

@ -23,7 +23,7 @@ Name: avahi-mono
%define _name avahi
# In automatic build systems you want to enable just one of following options.
# For build all at once, set all to 1.
# If you set build_core to 0, you cannot set more than one other option to 1.
# If you set build_core to 0, you cannot set more than one other options to 1.
%define build_core 0
# NOTE: build_glib2 also controls build of gobject, gtk2 and pygtk code.
%define build_glib2 0
@ -86,7 +86,7 @@ Requires: %{_name}-lang = %{version}
BuildRequires: dbus-1-devel doxygen graphviz python-gdbm zlib-devel
# For update of avahi-discover.glade from == 11.0:
Conflicts: avahi-utils-gtk <= 0.6.22
# For python bindings and utilities:
# For python bindings and utilities:
#BuildRequires: dbus-1-python
#Requires: dbus-1
Requires: nss-mdns
@ -97,7 +97,7 @@ Obsoletes: mDNSResponder-64bit
#
# mDNSResponder was used for <= 10.2:
Provides: mDNSResponder = 107.5
Obsoletes: mDNSResponder < 107.5
Obsoletes: mDNSResponder <= 107.5
%endif
%if %build_glib2
BuildRequires: libglade2-devel python-gtk-devel update-desktop-files
@ -203,10 +203,10 @@ Obsoletes: mDNSResponder-lib-64bit
#
# mDNSResponder-lib was used for <= 10.2:
Provides: mDNSResponder-lib = 107.5
Obsoletes: mDNSResponder-lib < 107.5
Obsoletes: mDNSResponder-lib <= 107.5
# Old name used for <= 10.3:
Provides: avahi-compat-mDNSResponder = %{version}
Obsoletes: avahi-compat-mDNSResponder < %{version}
Obsoletes: avahi-compat-mDNSResponder <= %{version}
%description -n libdns_sd
Apple mDNSResponder compatibility layer for avahi.
@ -229,7 +229,7 @@ Summary: howl Compatibility Package for D-BUS Service for Zeroconf/Bonjou
Group: System/Libraries
# Old name used for <= 10.3:
Provides: avahi-compat-howl = %{version}
Obsoletes: avahi-compat-howl < %{version}
Obsoletes: avahi-compat-howl <= %{version}
%description -n libhowl0
howl compatibility layer for avahi.
@ -254,7 +254,7 @@ Requires: %{name} = %{version} python-gdbm dbus-1-python python-twisted py
Group: Development/Languages/Python
# Old name used for <= 10.3:
Provides: avahi-python = %{version}
Obsoletes: avahi-python < %{version}
Obsoletes: avahi-python <= %{version}
%py_requires
%description -n python-avahi
@ -297,7 +297,7 @@ Requires: %{_name} = %{version} libavahi-common3 = %{version} libavahi-cor
Group: Development/Libraries/C and C++
# Last appeared in OpenSUSE 10.3:
Provides: avahi-devel = %{version}
Obsoletes: avahi-devel < %{version}
Obsoletes: avahi-devel <= %{version}
%description -n libavahi-devel
Avahi is an Implementation the DNS Service Discovery and Multicast DNS
@ -318,7 +318,7 @@ Summary: mDNSResponder Compatibility Package for D-BUS Service for Zeroco
Requires: libavahi-devel = %{version} libdns_sd = %{version}
Group: Development/Libraries/C and C++
Provides: mDNSResponder-devel = 107.5
Obsoletes: mDNSResponder-devel < 107.5
Obsoletes: mDNSResponder-devel <= 107.5
%description compat-mDNSResponder-devel
Apple mDNSResponder compatibility layer for avahi.
@ -383,7 +383,7 @@ Summary: Glib Bindings for avahi, the D-BUS Service for Zeroconf and Bonj
Group: System/GUI/GNOME
# Old name used for <= 10.3:
Provides: avahi-glib = %{version}
Obsoletes: avahi-glib < %{version}
Obsoletes: avahi-glib <= %{version}
%description -n libavahi-glib1
GLib support for avahi.
@ -450,7 +450,7 @@ Requires: python-avahi = %{version} python-gtk
Group: Development/Languages/Python
# Old name used for <= 10.3:
Provides: avahi-python = %{version}
Obsoletes: avahi-python < %{version}
Obsoletes: avahi-python <= %{version}
# Provide split-provides for update from <= 11.0:
Provides: python-avahi:%{_bindir}/avahi-bookmarks
%py_requires
@ -520,7 +520,7 @@ Summary: Qt3 Bindings for avahi, the D-BUS Service for Zeroconf and Bonjo
Group: System/GUI/KDE
# Old name used for <= 10.3:
Provides: avahi-qt3 = %{version}
Obsoletes: avahi-qt3 < %{version}
Obsoletes: avahi-qt3 <= %{version}
%description -n libavahi-qt3-1
Qt3 bindings for avahi.
@ -570,7 +570,7 @@ Summary: Qt4 Bindings for avahi, the D-BUS Service for Zeroconf and Bonjo
Group: System/GUI/KDE
# Old name used for <= 10.3:
Provides: avahi-qt4 = %{version}
Obsoletes: avahi-qt4 < %{version}
Obsoletes: avahi-qt4 <= %{version}
%description -n libavahi-qt4-1
Qt4 bindings for avahi.
@ -926,9 +926,7 @@ fi
%doc LICENSE docs/*
# Note: This file is intentionally packaged here. It is needed for avahi-utils-gtk and python-avahi-gtk:
%{_datadir}/pixmaps/gnome-nettool2.png
# avahi creates the directory itself, we do not package it
# since it might be on tmpfs
%attr(-,avahi,avahi) %ghost %{_localstatedir}/run/avahi-daemon
%attr(-,avahi,avahi) %{_localstatedir}/run/avahi-daemon
%doc %{_mandir}/man5/*.5*
%doc %{_mandir}/man8/*.8*
%{_sbindir}/avahi-*

View File

@ -23,7 +23,7 @@ Name: avahi-qt4
%define _name avahi
# In automatic build systems you want to enable just one of following options.
# For build all at once, set all to 1.
# If you set build_core to 0, you cannot set more than one other option to 1.
# If you set build_core to 0, you cannot set more than one other options to 1.
%define build_core 0
# NOTE: build_glib2 also controls build of gobject, gtk2 and pygtk code.
%define build_glib2 0
@ -86,7 +86,7 @@ Requires: %{_name}-lang = %{version}
BuildRequires: dbus-1-devel doxygen graphviz python-gdbm zlib-devel
# For update of avahi-discover.glade from == 11.0:
Conflicts: avahi-utils-gtk <= 0.6.22
# For python bindings and utilities:
# For python bindings and utilities:
#BuildRequires: dbus-1-python
#Requires: dbus-1
Requires: nss-mdns
@ -97,7 +97,7 @@ Obsoletes: mDNSResponder-64bit
#
# mDNSResponder was used for <= 10.2:
Provides: mDNSResponder = 107.5
Obsoletes: mDNSResponder < 107.5
Obsoletes: mDNSResponder <= 107.5
%endif
%if %build_glib2
BuildRequires: libglade2-devel python-gtk-devel update-desktop-files
@ -206,10 +206,10 @@ Obsoletes: mDNSResponder-lib-64bit
#
# mDNSResponder-lib was used for <= 10.2:
Provides: mDNSResponder-lib = 107.5
Obsoletes: mDNSResponder-lib < 107.5
Obsoletes: mDNSResponder-lib <= 107.5
# Old name used for <= 10.3:
Provides: avahi-compat-mDNSResponder = %{version}
Obsoletes: avahi-compat-mDNSResponder < %{version}
Obsoletes: avahi-compat-mDNSResponder <= %{version}
%description -n libdns_sd
Apple mDNSResponder compatibility layer for avahi.
@ -232,7 +232,7 @@ Summary: howl Compatibility Package for D-BUS Service for Zeroconf/Bonjou
Group: System/Libraries
# Old name used for <= 10.3:
Provides: avahi-compat-howl = %{version}
Obsoletes: avahi-compat-howl < %{version}
Obsoletes: avahi-compat-howl <= %{version}
%description -n libhowl0
howl compatibility layer for avahi.
@ -257,7 +257,7 @@ Requires: %{name} = %{version} python-gdbm dbus-1-python python-twisted py
Group: Development/Languages/Python
# Old name used for <= 10.3:
Provides: avahi-python = %{version}
Obsoletes: avahi-python < %{version}
Obsoletes: avahi-python <= %{version}
%py_requires
%description -n python-avahi
@ -300,7 +300,7 @@ Requires: %{_name} = %{version} libavahi-common3 = %{version} libavahi-cor
Group: Development/Libraries/C and C++
# Last appeared in OpenSUSE 10.3:
Provides: avahi-devel = %{version}
Obsoletes: avahi-devel < %{version}
Obsoletes: avahi-devel <= %{version}
%description -n libavahi-devel
Avahi is an Implementation the DNS Service Discovery and Multicast DNS
@ -321,7 +321,7 @@ Summary: mDNSResponder Compatibility Package for D-BUS Service for Zeroco
Requires: libavahi-devel = %{version} libdns_sd = %{version}
Group: Development/Libraries/C and C++
Provides: mDNSResponder-devel = 107.5
Obsoletes: mDNSResponder-devel < 107.5
Obsoletes: mDNSResponder-devel <= 107.5
%description compat-mDNSResponder-devel
Apple mDNSResponder compatibility layer for avahi.
@ -386,7 +386,7 @@ Summary: Glib Bindings for avahi, the D-BUS Service for Zeroconf and Bonj
Group: System/GUI/GNOME
# Old name used for <= 10.3:
Provides: avahi-glib = %{version}
Obsoletes: avahi-glib < %{version}
Obsoletes: avahi-glib <= %{version}
%description -n libavahi-glib1
GLib support for avahi.
@ -453,7 +453,7 @@ Requires: python-avahi = %{version} python-gtk
Group: Development/Languages/Python
# Old name used for <= 10.3:
Provides: avahi-python = %{version}
Obsoletes: avahi-python < %{version}
Obsoletes: avahi-python <= %{version}
# Provide split-provides for update from <= 11.0:
Provides: python-avahi:%{_bindir}/avahi-bookmarks
%py_requires
@ -523,7 +523,7 @@ Summary: Qt3 Bindings for avahi, the D-BUS Service for Zeroconf and Bonjo
Group: System/GUI/KDE
# Old name used for <= 10.3:
Provides: avahi-qt3 = %{version}
Obsoletes: avahi-qt3 < %{version}
Obsoletes: avahi-qt3 <= %{version}
%description -n libavahi-qt3-1
Qt3 bindings for avahi.
@ -573,7 +573,7 @@ Summary: Qt4 Bindings for avahi, the D-BUS Service for Zeroconf and Bonjo
Group: System/GUI/KDE
# Old name used for <= 10.3:
Provides: avahi-qt4 = %{version}
Obsoletes: avahi-qt4 < %{version}
Obsoletes: avahi-qt4 <= %{version}
%description -n libavahi-qt4-1
Qt4 bindings for avahi.
@ -929,9 +929,7 @@ fi
%doc LICENSE docs/*
# Note: This file is intentionally packaged here. It is needed for avahi-utils-gtk and python-avahi-gtk:
%{_datadir}/pixmaps/gnome-nettool2.png
# avahi creates the directory itself, we do not package it
# since it might be on tmpfs
%attr(-,avahi,avahi) %ghost %{_localstatedir}/run/avahi-daemon
%attr(-,avahi,avahi) %{_localstatedir}/run/avahi-daemon
%doc %{_mandir}/man5/*.5*
%doc %{_mandir}/man8/*.8*
%{_sbindir}/avahi-*

View File

@ -1,9 +1,3 @@
-------------------------------------------------------------------
Sat May 1 01:54:24 UTC 2010 - aj@suse.de
- Handle /var/run on tmpfs.
- Avoid self-obsoletes.
-------------------------------------------------------------------
Mon Mar 15 17:10:10 CET 2010 - sbrabec@suse.cz

View File

@ -25,7 +25,7 @@ Name: avahi
%define _name avahi
# In automatic build systems you want to enable just one of following options.
# For build all at once, set all to 1.
# If you set build_core to 0, you cannot set more than one other option to 1.
# If you set build_core to 0, you cannot set more than one other options to 1.
%define build_core 1
# NOTE: build_glib2 also controls build of gobject, gtk2 and pygtk code.
%define build_glib2 0
@ -88,7 +88,7 @@ Requires: %{_name}-lang = %{version}
BuildRequires: dbus-1-devel doxygen graphviz python-gdbm zlib-devel
# For update of avahi-discover.glade from == 11.0:
Conflicts: avahi-utils-gtk <= 0.6.22
# For python bindings and utilities:
# For python bindings and utilities:
#BuildRequires: dbus-1-python
#Requires: dbus-1
Requires: nss-mdns
@ -99,7 +99,7 @@ Obsoletes: mDNSResponder-64bit
#
# mDNSResponder was used for <= 10.2:
Provides: mDNSResponder = 107.5
Obsoletes: mDNSResponder < 107.5
Obsoletes: mDNSResponder <= 107.5
%endif
%if %build_glib2
BuildRequires: libglade2-devel python-gtk-devel update-desktop-files
@ -206,10 +206,10 @@ Obsoletes: mDNSResponder-lib-64bit
#
# mDNSResponder-lib was used for <= 10.2:
Provides: mDNSResponder-lib = 107.5
Obsoletes: mDNSResponder-lib < 107.5
Obsoletes: mDNSResponder-lib <= 107.5
# Old name used for <= 10.3:
Provides: avahi-compat-mDNSResponder = %{version}
Obsoletes: avahi-compat-mDNSResponder < %{version}
Obsoletes: avahi-compat-mDNSResponder <= %{version}
%description -n libdns_sd
Apple mDNSResponder compatibility layer for avahi.
@ -232,7 +232,7 @@ Summary: howl Compatibility Package for D-BUS Service for Zeroconf/Bonjou
Group: System/Libraries
# Old name used for <= 10.3:
Provides: avahi-compat-howl = %{version}
Obsoletes: avahi-compat-howl < %{version}
Obsoletes: avahi-compat-howl <= %{version}
%description -n libhowl0
howl compatibility layer for avahi.
@ -257,7 +257,7 @@ Requires: %{name} = %{version} python-gdbm dbus-1-python python-twisted py
Group: Development/Languages/Python
# Old name used for <= 10.3:
Provides: avahi-python = %{version}
Obsoletes: avahi-python < %{version}
Obsoletes: avahi-python <= %{version}
%py_requires
%description -n python-avahi
@ -300,7 +300,7 @@ Requires: %{_name} = %{version} libavahi-common3 = %{version} libavahi-cor
Group: Development/Libraries/C and C++
# Last appeared in OpenSUSE 10.3:
Provides: avahi-devel = %{version}
Obsoletes: avahi-devel < %{version}
Obsoletes: avahi-devel <= %{version}
%description -n libavahi-devel
Avahi is an Implementation the DNS Service Discovery and Multicast DNS
@ -321,7 +321,7 @@ Summary: mDNSResponder Compatibility Package for D-BUS Service for Zeroco
Requires: libavahi-devel = %{version} libdns_sd = %{version}
Group: Development/Libraries/C and C++
Provides: mDNSResponder-devel = 107.5
Obsoletes: mDNSResponder-devel < 107.5
Obsoletes: mDNSResponder-devel <= 107.5
%description compat-mDNSResponder-devel
Apple mDNSResponder compatibility layer for avahi.
@ -386,7 +386,7 @@ Summary: Glib Bindings for avahi, the D-BUS Service for Zeroconf and Bonj
Group: System/GUI/GNOME
# Old name used for <= 10.3:
Provides: avahi-glib = %{version}
Obsoletes: avahi-glib < %{version}
Obsoletes: avahi-glib <= %{version}
%description -n libavahi-glib1
GLib support for avahi.
@ -453,7 +453,7 @@ Requires: python-avahi = %{version} python-gtk
Group: Development/Languages/Python
# Old name used for <= 10.3:
Provides: avahi-python = %{version}
Obsoletes: avahi-python < %{version}
Obsoletes: avahi-python <= %{version}
# Provide split-provides for update from <= 11.0:
Provides: python-avahi:%{_bindir}/avahi-bookmarks
%py_requires
@ -523,7 +523,7 @@ Summary: Qt3 Bindings for avahi, the D-BUS Service for Zeroconf and Bonjo
Group: System/GUI/KDE
# Old name used for <= 10.3:
Provides: avahi-qt3 = %{version}
Obsoletes: avahi-qt3 < %{version}
Obsoletes: avahi-qt3 <= %{version}
%description -n libavahi-qt3-1
Qt3 bindings for avahi.
@ -573,7 +573,7 @@ Summary: Qt4 Bindings for avahi, the D-BUS Service for Zeroconf and Bonjo
Group: System/GUI/KDE
# Old name used for <= 10.3:
Provides: avahi-qt4 = %{version}
Obsoletes: avahi-qt4 < %{version}
Obsoletes: avahi-qt4 <= %{version}
%description -n libavahi-qt4-1
Qt4 bindings for avahi.
@ -929,9 +929,7 @@ fi
%doc LICENSE docs/*
# Note: This file is intentionally packaged here. It is needed for avahi-utils-gtk and python-avahi-gtk:
%{_datadir}/pixmaps/gnome-nettool2.png
# avahi creates the directory itself, we do not package it
# since it might be on tmpfs
%attr(-,avahi,avahi) %ghost %{_localstatedir}/run/avahi-daemon
%attr(-,avahi,avahi) %{_localstatedir}/run/avahi-daemon
%doc %{_mandir}/man5/*.5*
%doc %{_mandir}/man8/*.8*
%{_sbindir}/avahi-*