From 6d49e0903db51423f7b61e2dffc7ec9ab85b9bf2a55cada02f6132801cd211bd Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Tue, 24 Jul 2007 07:31:52 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/avahi?expand=0&rev=23 --- avahi-mono.spec | 24 +++++++++++++----------- avahi.changes | 5 +++++ avahi.spec | 26 +++++++++++++++----------- 3 files changed, 33 insertions(+), 22 deletions(-) diff --git a/avahi-mono.spec b/avahi-mono.spec index 9c17969..5322ea1 100644 --- a/avahi-mono.spec +++ b/avahi-mono.spec @@ -16,7 +16,7 @@ Name: avahi-mono # avahi.spec and then run pre_checkin.sh which will create # avahi-mono.spec based upon avahi.spec. Version: 0.6.20 -Release: 8 +Release: 11 URL: http://www.avahi.org/ Group: Development/Libraries/Other License: LGPL v2 or later @@ -41,6 +41,14 @@ BuildRequires: libqt4-devel python-gtk-devel BuildRequires: python-gtk qt-devel %endif %endif +%if %build_mono +Requires: avahi = %{version} gtk-sharp2 +%else +Requires: dbus-1 +Requires: nss-mdns +Provides: mDNSResponder = 107.5 +Obsoletes: mDNSResponder <= 107.5 +%endif %description Mono bindings for avahi. @@ -65,13 +73,7 @@ Authors: Trent Lloyd Sebastien Estienne -%if %build_mono -Requires: avahi = %{version} gtk-sharp2 -%else -Requires: dbus-1 -Requires: nss-mdns -Provides: mDNSResponder = 107.5 -Obsoletes: mDNSResponder <= 107.5 +%if !%build_mono %package -n avahi-glib Summary: D-BUS Service for Zeroconf/Bonjour Requires: %{name} = %{version} @@ -109,7 +111,7 @@ Group: System/Daemons %py_requires -%description python +%description -n avahi-python Avahi is an implementation of the DNS Service Discovery and Multicast DNS specifications for Zeroconf Computing. It uses D-BUS for communication between user applications and a system daemon. The daemon @@ -233,7 +235,7 @@ Group: System/Daemons Provides: mDNSResponder-devel = 107.5 Obsoletes: mDNSResponder-devel <= 107.5 -%description compat-mDNSResponder-devel +%description -n avahi-compat-mDNSResponder-devel Apple mDNSResponder compatibility layer for avahi. Avahi is an Implementation the DNS Service Discovery and Multicast DNS @@ -291,7 +293,7 @@ Requires: %{name} = %{version} %{name}-compat-howl = %{version} Autoreqprov: on Group: System/Daemons -%description compat-howl-devel +%description -n avahi-compat-howl-devel howl compatibility layer for avahi. Avahi is an Implementation the DNS Service Discovery and Multicast DNS diff --git a/avahi.changes b/avahi.changes index bb5349c..a38eb8f 100644 --- a/avahi.changes +++ b/avahi.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Jul 24 08:40:29 CEST 2007 - aj@suse.de + +- Resort spec file so that mDNSResponder is provided again. + ------------------------------------------------------------------- Mon Jul 16 11:44:59 CEST 2007 - aj@suse.de diff --git a/avahi.spec b/avahi.spec index 01f6e2a..f2513bc 100644 --- a/avahi.spec +++ b/avahi.spec @@ -16,7 +16,7 @@ Name: avahi # avahi.spec and then run pre_checkin.sh which will create # avahi-mono.spec based upon avahi.spec. Version: 0.6.20 -Release: 8 +Release: 11 URL: http://www.avahi.org/ Group: System/Daemons License: LGPL v2 or later @@ -41,6 +41,14 @@ BuildRequires: libqt4-devel python-gtk-devel BuildRequires: python-gtk qt-devel %endif %endif +%if %build_mono +Requires: avahi = %{version} gtk-sharp2 +%else +Requires: dbus-1 +Requires: nss-mdns +Provides: mDNSResponder = 107.5 +Obsoletes: mDNSResponder <= 107.5 +%endif %description Avahi is an implementation of the DNS Service Discovery and Multicast @@ -63,13 +71,7 @@ Authors: Trent Lloyd Sebastien Estienne -%if %build_mono -Requires: avahi = %{version} gtk-sharp2 -%else -Requires: dbus-1 -Requires: nss-mdns -Provides: mDNSResponder = 107.5 -Obsoletes: mDNSResponder <= 107.5 +%if !%build_mono %package -n avahi-glib Summary: D-BUS Service for Zeroconf/Bonjour Requires: %{name} = %{version} @@ -107,7 +109,7 @@ Group: System/Daemons %py_requires -%description python +%description -n avahi-python Avahi is an implementation of the DNS Service Discovery and Multicast DNS specifications for Zeroconf Computing. It uses D-BUS for communication between user applications and a system daemon. The daemon @@ -231,7 +233,7 @@ Group: System/Daemons Provides: mDNSResponder-devel = 107.5 Obsoletes: mDNSResponder-devel <= 107.5 -%description compat-mDNSResponder-devel +%description -n avahi-compat-mDNSResponder-devel Apple mDNSResponder compatibility layer for avahi. Avahi is an Implementation the DNS Service Discovery and Multicast DNS @@ -289,7 +291,7 @@ Requires: %{name} = %{version} %{name}-compat-howl = %{version} Autoreqprov: on Group: System/Daemons -%description compat-howl-devel +%description -n avahi-compat-howl-devel howl compatibility layer for avahi. Avahi is an Implementation the DNS Service Discovery and Multicast DNS @@ -630,6 +632,8 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Tue Jul 24 2007 - aj@suse.de +- Resort spec file so that mDNSResponder is provided again. * Mon Jul 16 2007 - aj@suse.de - Fix spec file. * Mon Jul 16 2007 - aj@suse.de