From 5048b27b4cacd786950f1c0ba13f07f521482c2770087b07517c53f76a956e84 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Sun, 4 Dec 2011 13:43:57 +0000 Subject: [PATCH 1/3] Accepting request 95322 from home:dimstar:branches:GNOME:Factory Move libtool BR out of cond block / Change license tag OBS-URL: https://build.opensuse.org/request/show/95322 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/avahi?expand=0&rev=74 --- avahi-glib2.spec | 45 ++++-------------------- avahi-mono.spec | 89 +++++++++++++++++++++++++++--------------------- avahi-qt4.spec | 45 ++++-------------------- avahi.changes | 8 +++++ avahi.spec | 37 ++------------------ 5 files changed, 76 insertions(+), 148 deletions(-) diff --git a/avahi-glib2.spec b/avahi-glib2.spec index 2cd8d19..411fd24 100644 --- a/avahi-glib2.spec +++ b/avahi-glib2.spec @@ -49,7 +49,7 @@ Release: 5 %endif Url: http://www.avahi.org/ Group: System/Daemons -License: LGPLv2.1+ +License: LGPL-2.1+ Summary: D-BUS Service for Zeroconf and Bonjour Source: %{_name}-%{version}.tar.bz2 Source1: gnome-nettool2.png @@ -74,6 +74,8 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: dbus-1-python fdupes gcc-c++ gdbm-devel intltool libdaemon-devel libexpat-devel pkg-config translation-update-upstream # Even if we are not building python bindings, we need python to build service types database: BuildRequires: python-devel python-gdbm +# libtool is needed to build all variants: bootstrap is unconditional in the build section +BuildRequires: libtool %if %suse_version <= 1110 %define python_sitelib %{py_sitedir} %endif @@ -88,7 +90,6 @@ PreReq: sysconfig %{?systemd_requires} Recommends: %{_name}-lang BuildRequires: dbus-1-devel doxygen graphviz python-gdbm zlib-devel -BuildRequires: libtool %if %suse_version >= 1210 BuildRequires: systemd %endif @@ -139,7 +140,6 @@ across LAN segments. %if %build_core %package -n libavahi-client3 -License: LGPLv2.1+ Summary: D-BUS Service for Zeroconf and Bonjour Group: System/Libraries @@ -157,7 +157,6 @@ addition, it supports some nifty things, like correct mDNS reflection across LAN segments. %package -n libavahi-common3 -License: LGPLv2.1+ Summary: D-BUS Service for Zeroconf and Bonjour Group: System/Libraries @@ -175,7 +174,6 @@ addition, it supports some nifty things, like correct mDNS reflection across LAN segments. %package -n libavahi-core7 -License: LGPLv2.1+ Summary: D-BUS Service for Zeroconf and Bonjour Group: System/Libraries @@ -193,7 +191,6 @@ addition, it supports some nifty things, like correct mDNS reflection across LAN segments. %package -n libdns_sd -License: LGPLv2.1+ Summary: mDNSResponder Compatibility Package for D-BUS Service for Zeroconf/Bonjour Group: System/Libraries # mDNSResponder-lib used unversioned soname. @@ -231,7 +228,6 @@ supports some nifty things that have never been seen elsewhere like correct mDNS reflection across LAN segments. %package -n libhowl0 -License: LGPLv2.1+ Summary: Howl Compatibility Package for D-BUS Service for Zeroconf/Bonjour Group: System/Libraries # Old name used for <= 10.3: @@ -254,7 +250,6 @@ supports some nifty things that have never been seen elsewhere like correct mDNS reflection across LAN segments. %package -n python-avahi -License: LGPLv2.1+ Summary: A set of Avahi utilities written in Python PreReq: coreutils Requires: %{name} = %{version} python-gdbm dbus-1-python python-twisted python-twisted-web @@ -278,7 +273,6 @@ addition, it supports some nifty things that have never been seen elsewhere, like correct mDNS reflection across LAN segments. %package utils -License: LGPLv2.1+ Summary: Command Line Utilities for D-BUS Service for Zeroconf and Bonjour Requires: %{_name} >= %{version} Group: Productivity/Networking/Other @@ -297,7 +291,6 @@ addition, it supports some nifty things, like correct mDNS reflection across LAN segments. %package -n libavahi-devel -License: LGPLv2.1+ Summary: Include Files and Libraries Mandatory for Development # Requires: %{_name} = %{version} libavahi-common3 = %{version} libavahi-core7 = %{version} libavahi-client3 = %{version} dbus-1-devel glibc-devel @@ -320,7 +313,6 @@ supports some nifty things that have never been seen elsewhere like correct mDNS reflection across LAN segments. %package compat-mDNSResponder-devel -License: LGPLv2.1+ Summary: mDNSResponder Compatibility Package for D-BUS Service for Zeroconf/Bonjour Requires: libavahi-devel = %{version} libdns_sd = %{version} Group: Development/Libraries/C and C++ @@ -343,7 +335,6 @@ supports some nifty things that have never been seen elsewhere like correct mDNS reflection across LAN segments. %package compat-howl-devel -License: LGPLv2.1+ Summary: Howl Compatibility Package for D-BUS Service for Zeroconf/Bonjour Requires: libavahi-devel = %{version} libhowl0 = %{version} Group: Development/Libraries/C and C++ @@ -367,8 +358,6 @@ correct mDNS reflection across LAN segments. %if %build_glib2 %package -n libavahi-ui0 - -License: LGPLv2.1+ Summary: D-BUS Service for Zeroconf and Bonjour Group: System/Libraries @@ -386,8 +375,6 @@ addition, it supports some nifty things, like correct mDNS reflection across LAN segments. %package -n libavahi-ui-gtk3-%{avahi_gtk3_soname} - -License: LGPLv2.1+ Summary: D-BUS Service for Zeroconf and Bonjour Group: System/Libraries @@ -405,8 +392,6 @@ addition, it supports some nifty things, like correct mDNS reflection across LAN segments. %package -n libavahi-glib1 - -License: LGPLv2.1+ Summary: Glib Bindings for avahi, the D-BUS Service for Zeroconf and Bonjour Group: System/GUI/GNOME # Old name used for <= 10.3: @@ -429,8 +414,6 @@ supports some nifty things that have never been seen elsewhere like correct mDNS reflection across LAN segments. %package -n libavahi-gobject0 - -License: LGPLv2.1+ Summary: D-BUS Service for Zeroconf and Bonjour Group: System/Daemons @@ -448,8 +431,6 @@ addition, it supports some nifty things, like correct mDNS reflection across LAN segments. %package -n avahi-utils-gtk - -License: LGPLv2.1+ Summary: GTK+ Utilities for D-BUS Service for Zeroconf and Bonjour Requires: %{_name} >= %{version} Group: Productivity/Networking/Other @@ -473,8 +454,6 @@ addition, it supports some nifty things, like correct mDNS reflection across LAN segments. %package -n python-avahi-gtk - -License: LGPLv2.1+ Summary: A set of Avahi utilities written in Python Using python-gtk PreReq: coreutils Requires: python-avahi = %{version} python-gtk @@ -500,8 +479,6 @@ addition, it supports some nifty things that have never been seen elsewhere, like correct mDNS reflection across LAN segments. %package -n libavahi-glib-devel - -License: LGPLv2.1+ Summary: Include Files and Libraries Mandatory for Development Requires: libavahi-devel = %{version} Requires: libavahi-glib1 = %{version} @@ -527,8 +504,6 @@ supports some nifty things that have never been seen elsewhere like correct mDNS reflection across LAN segments. %package -n libavahi-gobject-devel - -License: LGPLv2.1+ Summary: D-BUS Service for Zeroconf and Bonjour Requires: libavahi-devel = %{version} libavahi-glib-devel libavahi-gobject0 = %{version} glib2-devel Group: System/Daemons @@ -599,8 +574,6 @@ correct mDNS reflection across LAN segments. %if %build_qt4 %package -n libavahi-qt4-1 - -License: LGPLv2.1+ Summary: Qt4 Bindings for avahi, the D-BUS Service for Zeroconf and Bonjour Group: System/GUI/KDE # Old name used for <= 10.3: @@ -623,8 +596,6 @@ supports some nifty things that have never been seen elsewhere like correct mDNS reflection across LAN segments. %package -n libavahi-qt4-devel - -License: LGPLv2.1+ Summary: Include Files and Libraries Mandatory for Development Requires: libavahi-devel = %{version} libavahi-qt4-1 = %{version} libqt4-devel Group: Development/Libraries/C and C++ @@ -651,8 +622,6 @@ correct mDNS reflection across LAN segments. %if %build_mono %package -n avahi-mono - -License: LGPLv2.1+ Summary: Mono Bindings for avahi, the D-BUS Service for Zeroconf and Bonjour Requires: gtk-sharp2 libavahi-client3 >= %{version} libavahi-common3 >= %{version} libavahi-ui0 >= %{version} libavahi-glib1 >= %{version} Group: Development/Languages/Mono @@ -868,7 +837,7 @@ rm $RPM_BUILD_ROOT%{_libdir}/pkgconfig/avahi-ui.pc %{_sbindir}/groupadd -r avahi 2> /dev/null || : %{_sbindir}/useradd -r -o -s /bin/false -c "User for Avahi" -d %{_localstatedir}/run/avahi-daemon -g avahi avahi 2> /dev/null || : %if %suse_version >= 1210 -%service_add_pre avahi-daemon.service avahi-dnsconfd.service +%service_add_pre avahi-dnsconfd.service avahi-daemon.service %endif %post @@ -876,14 +845,14 @@ rm $RPM_BUILD_ROOT%{_libdir}/pkgconfig/avahi-ui.pc %{fillup_and_insserv -f -y avahi-daemon} %{fillup_and_insserv -f avahi-dnsconfd} %if %suse_version >= 1210 -%service_add_post avahi-daemon.service avahi-dnsconfd.service +%service_add_post avahi-dnsconfd.service avahi-daemon.service %endif %preun %{stop_on_removal avahi-daemon} %{stop_on_removal avahi-dnsconfd} %if %suse_version >= 1210 -%service_del_preun avahi-daemon.service avahi-dnsconfd.service +%service_del_preun avahi-dnsconfd.service avahi-daemon.service %endif %postun @@ -892,7 +861,7 @@ rm $RPM_BUILD_ROOT%{_libdir}/pkgconfig/avahi-ui.pc %{restart_on_update avahi-dnsconfd} %insserv_cleanup %if %suse_version >= 1210 -%service_del_postun avahi-daemon.service avahi-dnsconfd.service +%service_del_postun avahi-dnsconfd.service avahi-daemon.service %endif %post -n libavahi-client3 -p /sbin/ldconfig diff --git a/avahi-mono.spec b/avahi-mono.spec index f605106..3aaf903 100644 --- a/avahi-mono.spec +++ b/avahi-mono.spec @@ -49,7 +49,7 @@ Release: 5 %endif Url: http://www.avahi.org/ Group: Development/Languages/Mono -License: LGPLv2.1+ +License: LGPL-2.1+ Summary: Mono Bindings for avahi, the D-BUS Service for Zeroconf and Bonjour Source: %{_name}-%{version}.tar.bz2 Source1: gnome-nettool2.png @@ -74,6 +74,8 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: dbus-1-python fdupes gcc-c++ gdbm-devel intltool libdaemon-devel libexpat-devel pkg-config translation-update-upstream # Even if we are not building python bindings, we need python to build service types database: BuildRequires: python-devel python-gdbm +# libtool is needed to build all variants: bootstrap is unconditional in the build section +BuildRequires: libtool %if %suse_version <= 1110 %define python_sitelib %{py_sitedir} %endif @@ -88,7 +90,6 @@ PreReq: sysconfig %{?systemd_requires} Recommends: %{_name}-lang BuildRequires: dbus-1-devel doxygen graphviz python-gdbm zlib-devel -BuildRequires: libtool %if %suse_version >= 1210 BuildRequires: systemd %endif @@ -146,10 +147,31 @@ SHOULDs of the mDNS and DNS-SD RFCs. It passes all tests in the Apple Bonjour conformance test suite. In addition, it supports some nifty things, like correct mDNS reflection across LAN segments. +This package provides Mono bindings for avahi. Avahi is an +implementation of the DNS Service Discovery and MulticastDNS +specifications for Zeroconf Computing. It uses D-BUS for communication +between user applications and a system daemon. The daemon is used to +coordinate application efforts in caching replies, necessary to +minimize the traffic imposed on networks. The Avahi mDNS responder is +now feature complete, implementing all MUSTs and the majority of the +SHOULDs of the mDNS and DNS-SD RFCs. It passes all tests in the Apple +Bonjour conformance test suite. In addition, it supports some nifty +things, like correct mDNS reflection across LAN segments. + +This package provides Mono bindings for avahi. Avahi is an +implementation of the DNS Service Discovery and MulticastDNS +specifications for Zeroconf Computing. It uses D-BUS for communication +between user applications and a system daemon. The daemon is used to +coordinate application efforts in caching replies, necessary to +minimize the traffic imposed on networks. The Avahi mDNS responder is +now feature complete, implementing all MUSTs and the majority of the +SHOULDs of the mDNS and DNS-SD RFCs. It passes all tests in the Apple +Bonjour conformance test suite. In addition, it supports some nifty +things, like correct mDNS reflection across LAN segments. + %if %build_core %package -n libavahi-client3 -License: LGPLv2.1+ Summary: D-BUS Service for Zeroconf and Bonjour Group: System/Libraries @@ -167,7 +189,6 @@ addition, it supports some nifty things, like correct mDNS reflection across LAN segments. %package -n libavahi-common3 -License: LGPLv2.1+ Summary: D-BUS Service for Zeroconf and Bonjour Group: System/Libraries @@ -185,7 +206,6 @@ addition, it supports some nifty things, like correct mDNS reflection across LAN segments. %package -n libavahi-core7 -License: LGPLv2.1+ Summary: D-BUS Service for Zeroconf and Bonjour Group: System/Libraries @@ -203,7 +223,6 @@ addition, it supports some nifty things, like correct mDNS reflection across LAN segments. %package -n libdns_sd -License: LGPLv2.1+ Summary: mDNSResponder Compatibility Package for D-BUS Service for Zeroconf/Bonjour Group: System/Libraries # mDNSResponder-lib used unversioned soname. @@ -241,7 +260,6 @@ supports some nifty things that have never been seen elsewhere like correct mDNS reflection across LAN segments. %package -n libhowl0 -License: LGPLv2.1+ Summary: Howl Compatibility Package for D-BUS Service for Zeroconf/Bonjour Group: System/Libraries # Old name used for <= 10.3: @@ -264,7 +282,6 @@ supports some nifty things that have never been seen elsewhere like correct mDNS reflection across LAN segments. %package -n python-avahi -License: LGPLv2.1+ Summary: A set of Avahi utilities written in Python PreReq: coreutils Requires: %{name} = %{version} python-gdbm dbus-1-python python-twisted python-twisted-web @@ -288,7 +305,6 @@ addition, it supports some nifty things that have never been seen elsewhere, like correct mDNS reflection across LAN segments. %package utils -License: LGPLv2.1+ Summary: Command Line Utilities for D-BUS Service for Zeroconf and Bonjour Requires: %{_name} >= %{version} Group: Productivity/Networking/Other @@ -307,7 +323,6 @@ addition, it supports some nifty things, like correct mDNS reflection across LAN segments. %package -n libavahi-devel -License: LGPLv2.1+ Summary: Include Files and Libraries Mandatory for Development # Requires: %{_name} = %{version} libavahi-common3 = %{version} libavahi-core7 = %{version} libavahi-client3 = %{version} dbus-1-devel glibc-devel @@ -330,7 +345,6 @@ supports some nifty things that have never been seen elsewhere like correct mDNS reflection across LAN segments. %package compat-mDNSResponder-devel -License: LGPLv2.1+ Summary: mDNSResponder Compatibility Package for D-BUS Service for Zeroconf/Bonjour Requires: libavahi-devel = %{version} libdns_sd = %{version} Group: Development/Libraries/C and C++ @@ -353,7 +367,6 @@ supports some nifty things that have never been seen elsewhere like correct mDNS reflection across LAN segments. %package compat-howl-devel -License: LGPLv2.1+ Summary: Howl Compatibility Package for D-BUS Service for Zeroconf/Bonjour Requires: libavahi-devel = %{version} libhowl0 = %{version} Group: Development/Libraries/C and C++ @@ -377,8 +390,6 @@ correct mDNS reflection across LAN segments. %if %build_glib2 %package -n libavahi-ui0 - -License: LGPLv2.1+ Summary: D-BUS Service for Zeroconf and Bonjour Group: System/Libraries @@ -396,8 +407,6 @@ addition, it supports some nifty things, like correct mDNS reflection across LAN segments. %package -n libavahi-ui-gtk3-%{avahi_gtk3_soname} - -License: LGPLv2.1+ Summary: D-BUS Service for Zeroconf and Bonjour Group: System/Libraries @@ -415,8 +424,6 @@ addition, it supports some nifty things, like correct mDNS reflection across LAN segments. %package -n libavahi-glib1 - -License: LGPLv2.1+ Summary: Glib Bindings for avahi, the D-BUS Service for Zeroconf and Bonjour Group: System/GUI/GNOME # Old name used for <= 10.3: @@ -439,8 +446,6 @@ supports some nifty things that have never been seen elsewhere like correct mDNS reflection across LAN segments. %package -n libavahi-gobject0 - -License: LGPLv2.1+ Summary: D-BUS Service for Zeroconf and Bonjour Group: System/Daemons @@ -458,8 +463,6 @@ addition, it supports some nifty things, like correct mDNS reflection across LAN segments. %package -n avahi-utils-gtk - -License: LGPLv2.1+ Summary: GTK+ Utilities for D-BUS Service for Zeroconf and Bonjour Requires: %{_name} >= %{version} Group: Productivity/Networking/Other @@ -483,8 +486,6 @@ addition, it supports some nifty things, like correct mDNS reflection across LAN segments. %package -n python-avahi-gtk - -License: LGPLv2.1+ Summary: A set of Avahi utilities written in Python Using python-gtk PreReq: coreutils Requires: python-avahi = %{version} python-gtk @@ -510,8 +511,6 @@ addition, it supports some nifty things that have never been seen elsewhere, like correct mDNS reflection across LAN segments. %package -n libavahi-glib-devel - -License: LGPLv2.1+ Summary: Include Files and Libraries Mandatory for Development Requires: libavahi-devel = %{version} Requires: libavahi-glib1 = %{version} @@ -537,8 +536,6 @@ supports some nifty things that have never been seen elsewhere like correct mDNS reflection across LAN segments. %package -n libavahi-gobject-devel - -License: LGPLv2.1+ Summary: D-BUS Service for Zeroconf and Bonjour Requires: libavahi-devel = %{version} libavahi-glib-devel libavahi-gobject0 = %{version} glib2-devel Group: System/Daemons @@ -609,8 +606,6 @@ correct mDNS reflection across LAN segments. %if %build_qt4 %package -n libavahi-qt4-1 - -License: LGPLv2.1+ Summary: Qt4 Bindings for avahi, the D-BUS Service for Zeroconf and Bonjour Group: System/GUI/KDE # Old name used for <= 10.3: @@ -633,8 +628,6 @@ supports some nifty things that have never been seen elsewhere like correct mDNS reflection across LAN segments. %package -n libavahi-qt4-devel - -License: LGPLv2.1+ Summary: Include Files and Libraries Mandatory for Development Requires: libavahi-devel = %{version} libavahi-qt4-1 = %{version} libqt4-devel Group: Development/Libraries/C and C++ @@ -661,8 +654,6 @@ correct mDNS reflection across LAN segments. %if %build_mono %package -n avahi-mono - -License: LGPLv2.1+ Summary: Mono Bindings for avahi, the D-BUS Service for Zeroconf and Bonjour Requires: gtk-sharp2 libavahi-client3 >= %{version} libavahi-common3 >= %{version} libavahi-ui0 >= %{version} libavahi-glib1 >= %{version} Group: Development/Languages/Mono @@ -690,6 +681,28 @@ SHOULDs of the mDNS and DNS-SD RFCs. It passes all tests in the Apple Bonjour conformance test suite. In addition, it supports some nifty things, like correct mDNS reflection across LAN segments. +This package provides Mono bindings for avahi. Avahi is an +implementation of the DNS Service Discovery and MulticastDNS +specifications for Zeroconf Computing. It uses D-BUS for communication +between user applications and a system daemon. The daemon is used to +coordinate application efforts in caching replies, necessary to +minimize the traffic imposed on networks. The Avahi mDNS responder is +now feature complete, implementing all MUSTs and the majority of the +SHOULDs of the mDNS and DNS-SD RFCs. It passes all tests in the Apple +Bonjour conformance test suite. In addition, it supports some nifty +things, like correct mDNS reflection across LAN segments. + +This package provides Mono bindings for avahi. Avahi is an +implementation of the DNS Service Discovery and MulticastDNS +specifications for Zeroconf Computing. It uses D-BUS for communication +between user applications and a system daemon. The daemon is used to +coordinate application efforts in caching replies, necessary to +minimize the traffic imposed on networks. The Avahi mDNS responder is +now feature complete, implementing all MUSTs and the majority of the +SHOULDs of the mDNS and DNS-SD RFCs. It passes all tests in the Apple +Bonjour conformance test suite. In addition, it supports some nifty +things, like correct mDNS reflection across LAN segments. + %endif %lang_package %endif @@ -889,7 +902,7 @@ rm $RPM_BUILD_ROOT%{_libdir}/pkgconfig/avahi-ui.pc %{_sbindir}/groupadd -r avahi 2> /dev/null || : %{_sbindir}/useradd -r -o -s /bin/false -c "User for Avahi" -d %{_localstatedir}/run/avahi-daemon -g avahi avahi 2> /dev/null || : %if %suse_version >= 1210 -%service_add_pre avahi-daemon.service avahi-dnsconfd.service +%service_add_pre avahi-dnsconfd.service avahi-daemon.service %endif %post @@ -897,14 +910,14 @@ rm $RPM_BUILD_ROOT%{_libdir}/pkgconfig/avahi-ui.pc %{fillup_and_insserv -f -y avahi-daemon} %{fillup_and_insserv -f avahi-dnsconfd} %if %suse_version >= 1210 -%service_add_post avahi-daemon.service avahi-dnsconfd.service +%service_add_post avahi-dnsconfd.service avahi-daemon.service %endif %preun %{stop_on_removal avahi-daemon} %{stop_on_removal avahi-dnsconfd} %if %suse_version >= 1210 -%service_del_preun avahi-daemon.service avahi-dnsconfd.service +%service_del_preun avahi-dnsconfd.service avahi-daemon.service %endif %postun @@ -913,7 +926,7 @@ rm $RPM_BUILD_ROOT%{_libdir}/pkgconfig/avahi-ui.pc %{restart_on_update avahi-dnsconfd} %insserv_cleanup %if %suse_version >= 1210 -%service_del_postun avahi-daemon.service avahi-dnsconfd.service +%service_del_postun avahi-dnsconfd.service avahi-daemon.service %endif %post -n libavahi-client3 -p /sbin/ldconfig diff --git a/avahi-qt4.spec b/avahi-qt4.spec index 982f06b..988ad59 100644 --- a/avahi-qt4.spec +++ b/avahi-qt4.spec @@ -49,7 +49,7 @@ Release: 5 %endif Url: http://www.avahi.org/ Group: System/GUI/KDE -License: LGPLv2.1+ +License: LGPL-2.1+ Summary: Qt4 Bindings for avahi, the D-BUS Service for Zeroconf and Bonjour Source: %{_name}-%{version}.tar.bz2 Source1: gnome-nettool2.png @@ -74,6 +74,8 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: dbus-1-python fdupes gcc-c++ gdbm-devel intltool libdaemon-devel libexpat-devel pkg-config translation-update-upstream # Even if we are not building python bindings, we need python to build service types database: BuildRequires: python-devel python-gdbm +# libtool is needed to build all variants: bootstrap is unconditional in the build section +BuildRequires: libtool %if %suse_version <= 1110 %define python_sitelib %{py_sitedir} %endif @@ -88,7 +90,6 @@ PreReq: sysconfig %{?systemd_requires} Recommends: %{_name}-lang BuildRequires: dbus-1-devel doxygen graphviz python-gdbm zlib-devel -BuildRequires: libtool %if %suse_version >= 1210 BuildRequires: systemd %endif @@ -141,7 +142,6 @@ correct mDNS reflection accross LAN segments. %if %build_core %package -n libavahi-client3 -License: LGPLv2.1+ Summary: D-BUS Service for Zeroconf and Bonjour Group: System/Libraries @@ -159,7 +159,6 @@ addition, it supports some nifty things, like correct mDNS reflection across LAN segments. %package -n libavahi-common3 -License: LGPLv2.1+ Summary: D-BUS Service for Zeroconf and Bonjour Group: System/Libraries @@ -177,7 +176,6 @@ addition, it supports some nifty things, like correct mDNS reflection across LAN segments. %package -n libavahi-core7 -License: LGPLv2.1+ Summary: D-BUS Service for Zeroconf and Bonjour Group: System/Libraries @@ -195,7 +193,6 @@ addition, it supports some nifty things, like correct mDNS reflection across LAN segments. %package -n libdns_sd -License: LGPLv2.1+ Summary: mDNSResponder Compatibility Package for D-BUS Service for Zeroconf/Bonjour Group: System/Libraries # mDNSResponder-lib used unversioned soname. @@ -233,7 +230,6 @@ supports some nifty things that have never been seen elsewhere like correct mDNS reflection across LAN segments. %package -n libhowl0 -License: LGPLv2.1+ Summary: Howl Compatibility Package for D-BUS Service for Zeroconf/Bonjour Group: System/Libraries # Old name used for <= 10.3: @@ -256,7 +252,6 @@ supports some nifty things that have never been seen elsewhere like correct mDNS reflection across LAN segments. %package -n python-avahi -License: LGPLv2.1+ Summary: A set of Avahi utilities written in Python PreReq: coreutils Requires: %{name} = %{version} python-gdbm dbus-1-python python-twisted python-twisted-web @@ -280,7 +275,6 @@ addition, it supports some nifty things that have never been seen elsewhere, like correct mDNS reflection across LAN segments. %package utils -License: LGPLv2.1+ Summary: Command Line Utilities for D-BUS Service for Zeroconf and Bonjour Requires: %{_name} >= %{version} Group: Productivity/Networking/Other @@ -299,7 +293,6 @@ addition, it supports some nifty things, like correct mDNS reflection across LAN segments. %package -n libavahi-devel -License: LGPLv2.1+ Summary: Include Files and Libraries Mandatory for Development # Requires: %{_name} = %{version} libavahi-common3 = %{version} libavahi-core7 = %{version} libavahi-client3 = %{version} dbus-1-devel glibc-devel @@ -322,7 +315,6 @@ supports some nifty things that have never been seen elsewhere like correct mDNS reflection across LAN segments. %package compat-mDNSResponder-devel -License: LGPLv2.1+ Summary: mDNSResponder Compatibility Package for D-BUS Service for Zeroconf/Bonjour Requires: libavahi-devel = %{version} libdns_sd = %{version} Group: Development/Libraries/C and C++ @@ -345,7 +337,6 @@ supports some nifty things that have never been seen elsewhere like correct mDNS reflection across LAN segments. %package compat-howl-devel -License: LGPLv2.1+ Summary: Howl Compatibility Package for D-BUS Service for Zeroconf/Bonjour Requires: libavahi-devel = %{version} libhowl0 = %{version} Group: Development/Libraries/C and C++ @@ -369,8 +360,6 @@ correct mDNS reflection across LAN segments. %if %build_glib2 %package -n libavahi-ui0 - -License: LGPLv2.1+ Summary: D-BUS Service for Zeroconf and Bonjour Group: System/Libraries @@ -388,8 +377,6 @@ addition, it supports some nifty things, like correct mDNS reflection across LAN segments. %package -n libavahi-ui-gtk3-%{avahi_gtk3_soname} - -License: LGPLv2.1+ Summary: D-BUS Service for Zeroconf and Bonjour Group: System/Libraries @@ -407,8 +394,6 @@ addition, it supports some nifty things, like correct mDNS reflection across LAN segments. %package -n libavahi-glib1 - -License: LGPLv2.1+ Summary: Glib Bindings for avahi, the D-BUS Service for Zeroconf and Bonjour Group: System/GUI/GNOME # Old name used for <= 10.3: @@ -431,8 +416,6 @@ supports some nifty things that have never been seen elsewhere like correct mDNS reflection across LAN segments. %package -n libavahi-gobject0 - -License: LGPLv2.1+ Summary: D-BUS Service for Zeroconf and Bonjour Group: System/Daemons @@ -450,8 +433,6 @@ addition, it supports some nifty things, like correct mDNS reflection across LAN segments. %package -n avahi-utils-gtk - -License: LGPLv2.1+ Summary: GTK+ Utilities for D-BUS Service for Zeroconf and Bonjour Requires: %{_name} >= %{version} Group: Productivity/Networking/Other @@ -475,8 +456,6 @@ addition, it supports some nifty things, like correct mDNS reflection across LAN segments. %package -n python-avahi-gtk - -License: LGPLv2.1+ Summary: A set of Avahi utilities written in Python Using python-gtk PreReq: coreutils Requires: python-avahi = %{version} python-gtk @@ -502,8 +481,6 @@ addition, it supports some nifty things that have never been seen elsewhere, like correct mDNS reflection across LAN segments. %package -n libavahi-glib-devel - -License: LGPLv2.1+ Summary: Include Files and Libraries Mandatory for Development Requires: libavahi-devel = %{version} Requires: libavahi-glib1 = %{version} @@ -529,8 +506,6 @@ supports some nifty things that have never been seen elsewhere like correct mDNS reflection across LAN segments. %package -n libavahi-gobject-devel - -License: LGPLv2.1+ Summary: D-BUS Service for Zeroconf and Bonjour Requires: libavahi-devel = %{version} libavahi-glib-devel libavahi-gobject0 = %{version} glib2-devel Group: System/Daemons @@ -601,8 +576,6 @@ correct mDNS reflection across LAN segments. %if %build_qt4 %package -n libavahi-qt4-1 - -License: LGPLv2.1+ Summary: Qt4 Bindings for avahi, the D-BUS Service for Zeroconf and Bonjour Group: System/GUI/KDE # Old name used for <= 10.3: @@ -625,8 +598,6 @@ supports some nifty things that have never been seen elsewhere like correct mDNS reflection across LAN segments. %package -n libavahi-qt4-devel - -License: LGPLv2.1+ Summary: Include Files and Libraries Mandatory for Development Requires: libavahi-devel = %{version} libavahi-qt4-1 = %{version} libqt4-devel Group: Development/Libraries/C and C++ @@ -653,8 +624,6 @@ correct mDNS reflection across LAN segments. %if %build_mono %package -n avahi-mono - -License: LGPLv2.1+ Summary: Mono Bindings for avahi, the D-BUS Service for Zeroconf and Bonjour Requires: gtk-sharp2 libavahi-client3 >= %{version} libavahi-common3 >= %{version} libavahi-ui0 >= %{version} libavahi-glib1 >= %{version} Group: Development/Languages/Mono @@ -870,7 +839,7 @@ rm $RPM_BUILD_ROOT%{_libdir}/pkgconfig/avahi-ui.pc %{_sbindir}/groupadd -r avahi 2> /dev/null || : %{_sbindir}/useradd -r -o -s /bin/false -c "User for Avahi" -d %{_localstatedir}/run/avahi-daemon -g avahi avahi 2> /dev/null || : %if %suse_version >= 1210 -%service_add_pre avahi-daemon.service avahi-dnsconfd.service +%service_add_pre avahi-dnsconfd.service avahi-daemon.service %endif %post @@ -878,14 +847,14 @@ rm $RPM_BUILD_ROOT%{_libdir}/pkgconfig/avahi-ui.pc %{fillup_and_insserv -f -y avahi-daemon} %{fillup_and_insserv -f avahi-dnsconfd} %if %suse_version >= 1210 -%service_add_post avahi-daemon.service avahi-dnsconfd.service +%service_add_post avahi-dnsconfd.service avahi-daemon.service %endif %preun %{stop_on_removal avahi-daemon} %{stop_on_removal avahi-dnsconfd} %if %suse_version >= 1210 -%service_del_preun avahi-daemon.service avahi-dnsconfd.service +%service_del_preun avahi-dnsconfd.service avahi-daemon.service %endif %postun @@ -894,7 +863,7 @@ rm $RPM_BUILD_ROOT%{_libdir}/pkgconfig/avahi-ui.pc %{restart_on_update avahi-dnsconfd} %insserv_cleanup %if %suse_version >= 1210 -%service_del_postun avahi-daemon.service avahi-dnsconfd.service +%service_del_postun avahi-dnsconfd.service avahi-daemon.service %endif %post -n libavahi-client3 -p /sbin/ldconfig diff --git a/avahi.changes b/avahi.changes index 5d2020c..ce869ad 100644 --- a/avahi.changes +++ b/avahi.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Sun Dec 4 13:40:54 UTC 2011 - dimstar@opensuse.org + +- Change libtool BuildRequires to be unconditional: it is needed to + build all submodules as well. +- Change License tag to spdx identifier (LGPL-2.1+) and remove + duplicate mentions of the License tag. + ------------------------------------------------------------------- Mon Oct 10 08:44:41 UTC 2011 - fcrozat@suse.com diff --git a/avahi.spec b/avahi.spec index ede89ba..b811723 100644 --- a/avahi.spec +++ b/avahi.spec @@ -51,7 +51,7 @@ Release: 5 %endif Url: http://www.avahi.org/ Group: System/Daemons -License: LGPLv2.1+ +License: LGPL-2.1+ Summary: D-BUS Service for Zeroconf and Bonjour Source: %{_name}-%{version}.tar.bz2 Source1: gnome-nettool2.png @@ -76,6 +76,8 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: dbus-1-python fdupes gcc-c++ gdbm-devel intltool libdaemon-devel libexpat-devel pkg-config translation-update-upstream # Even if we are not building python bindings, we need python to build service types database: BuildRequires: python-devel python-gdbm +# libtool is needed to build all variants: bootstrap is unconditional in the build section +BuildRequires: libtool %if %suse_version <= 1110 %define python_sitelib %{py_sitedir} %endif @@ -90,7 +92,6 @@ PreReq: sysconfig %{?systemd_requires} Recommends: %{_name}-lang BuildRequires: dbus-1-devel doxygen graphviz python-gdbm zlib-devel -BuildRequires: libtool %if %suse_version >= 1210 BuildRequires: systemd %endif @@ -141,7 +142,6 @@ across LAN segments. %if %build_core %package -n libavahi-client3 -License: LGPLv2.1+ Summary: D-BUS Service for Zeroconf and Bonjour Group: System/Libraries @@ -159,7 +159,6 @@ addition, it supports some nifty things, like correct mDNS reflection across LAN segments. %package -n libavahi-common3 -License: LGPLv2.1+ Summary: D-BUS Service for Zeroconf and Bonjour Group: System/Libraries @@ -177,7 +176,6 @@ addition, it supports some nifty things, like correct mDNS reflection across LAN segments. %package -n libavahi-core7 -License: LGPLv2.1+ Summary: D-BUS Service for Zeroconf and Bonjour Group: System/Libraries @@ -195,7 +193,6 @@ addition, it supports some nifty things, like correct mDNS reflection across LAN segments. %package -n libdns_sd -License: LGPLv2.1+ Summary: mDNSResponder Compatibility Package for D-BUS Service for Zeroconf/Bonjour Group: System/Libraries # mDNSResponder-lib used unversioned soname. @@ -233,7 +230,6 @@ supports some nifty things that have never been seen elsewhere like correct mDNS reflection across LAN segments. %package -n libhowl0 -License: LGPLv2.1+ Summary: Howl Compatibility Package for D-BUS Service for Zeroconf/Bonjour Group: System/Libraries # Old name used for <= 10.3: @@ -256,7 +252,6 @@ supports some nifty things that have never been seen elsewhere like correct mDNS reflection across LAN segments. %package -n python-avahi -License: LGPLv2.1+ Summary: A set of Avahi utilities written in Python PreReq: coreutils Requires: %{name} = %{version} python-gdbm dbus-1-python python-twisted python-twisted-web @@ -280,7 +275,6 @@ addition, it supports some nifty things that have never been seen elsewhere, like correct mDNS reflection across LAN segments. %package utils -License: LGPLv2.1+ Summary: Command Line Utilities for D-BUS Service for Zeroconf and Bonjour Requires: %{_name} >= %{version} Group: Productivity/Networking/Other @@ -299,7 +293,6 @@ addition, it supports some nifty things, like correct mDNS reflection across LAN segments. %package -n libavahi-devel -License: LGPLv2.1+ Summary: Include Files and Libraries Mandatory for Development # Requires: %{_name} = %{version} libavahi-common3 = %{version} libavahi-core7 = %{version} libavahi-client3 = %{version} dbus-1-devel glibc-devel @@ -322,7 +315,6 @@ supports some nifty things that have never been seen elsewhere like correct mDNS reflection across LAN segments. %package compat-mDNSResponder-devel -License: LGPLv2.1+ Summary: mDNSResponder Compatibility Package for D-BUS Service for Zeroconf/Bonjour Requires: libavahi-devel = %{version} libdns_sd = %{version} Group: Development/Libraries/C and C++ @@ -345,7 +337,6 @@ supports some nifty things that have never been seen elsewhere like correct mDNS reflection across LAN segments. %package compat-howl-devel -License: LGPLv2.1+ Summary: Howl Compatibility Package for D-BUS Service for Zeroconf/Bonjour Requires: libavahi-devel = %{version} libhowl0 = %{version} Group: Development/Libraries/C and C++ @@ -369,8 +360,6 @@ correct mDNS reflection across LAN segments. %if %build_glib2 %package -n libavahi-ui0 - -License: LGPLv2.1+ Summary: D-BUS Service for Zeroconf and Bonjour Group: System/Libraries @@ -388,8 +377,6 @@ addition, it supports some nifty things, like correct mDNS reflection across LAN segments. %package -n libavahi-ui-gtk3-%{avahi_gtk3_soname} - -License: LGPLv2.1+ Summary: D-BUS Service for Zeroconf and Bonjour Group: System/Libraries @@ -407,8 +394,6 @@ addition, it supports some nifty things, like correct mDNS reflection across LAN segments. %package -n libavahi-glib1 - -License: LGPLv2.1+ Summary: Glib Bindings for avahi, the D-BUS Service for Zeroconf and Bonjour Group: System/GUI/GNOME # Old name used for <= 10.3: @@ -431,8 +416,6 @@ supports some nifty things that have never been seen elsewhere like correct mDNS reflection across LAN segments. %package -n libavahi-gobject0 - -License: LGPLv2.1+ Summary: D-BUS Service for Zeroconf and Bonjour Group: System/Daemons @@ -450,8 +433,6 @@ addition, it supports some nifty things, like correct mDNS reflection across LAN segments. %package -n avahi-utils-gtk - -License: LGPLv2.1+ Summary: GTK+ Utilities for D-BUS Service for Zeroconf and Bonjour Requires: %{_name} >= %{version} Group: Productivity/Networking/Other @@ -475,8 +456,6 @@ addition, it supports some nifty things, like correct mDNS reflection across LAN segments. %package -n python-avahi-gtk - -License: LGPLv2.1+ Summary: A set of Avahi utilities written in Python Using python-gtk PreReq: coreutils Requires: python-avahi = %{version} python-gtk @@ -502,8 +481,6 @@ addition, it supports some nifty things that have never been seen elsewhere, like correct mDNS reflection across LAN segments. %package -n libavahi-glib-devel - -License: LGPLv2.1+ Summary: Include Files and Libraries Mandatory for Development Requires: libavahi-devel = %{version} Requires: libavahi-glib1 = %{version} @@ -529,8 +506,6 @@ supports some nifty things that have never been seen elsewhere like correct mDNS reflection across LAN segments. %package -n libavahi-gobject-devel - -License: LGPLv2.1+ Summary: D-BUS Service for Zeroconf and Bonjour Requires: libavahi-devel = %{version} libavahi-glib-devel libavahi-gobject0 = %{version} glib2-devel Group: System/Daemons @@ -601,8 +576,6 @@ correct mDNS reflection across LAN segments. %if %build_qt4 %package -n libavahi-qt4-1 - -License: LGPLv2.1+ Summary: Qt4 Bindings for avahi, the D-BUS Service for Zeroconf and Bonjour Group: System/GUI/KDE # Old name used for <= 10.3: @@ -625,8 +598,6 @@ supports some nifty things that have never been seen elsewhere like correct mDNS reflection across LAN segments. %package -n libavahi-qt4-devel - -License: LGPLv2.1+ Summary: Include Files and Libraries Mandatory for Development Requires: libavahi-devel = %{version} libavahi-qt4-1 = %{version} libqt4-devel Group: Development/Libraries/C and C++ @@ -653,8 +624,6 @@ correct mDNS reflection across LAN segments. %if %build_mono %package -n avahi-mono - -License: LGPLv2.1+ Summary: Mono Bindings for avahi, the D-BUS Service for Zeroconf and Bonjour Requires: gtk-sharp2 libavahi-client3 >= %{version} libavahi-common3 >= %{version} libavahi-ui0 >= %{version} libavahi-glib1 >= %{version} Group: Development/Languages/Mono From 9c68f214736dd326dc4f0845b0adbffe012c680df5d00d5d86f2de6bb2ef1ba1 Mon Sep 17 00:00:00 2001 From: Vincent Untz Date: Tue, 20 Dec 2011 08:57:06 +0000 Subject: [PATCH 2/3] Accepting request 96133 from home:dimstar:branches:GNOME:Factory Push typelib change branch OBS-URL: https://build.opensuse.org/request/show/96133 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/avahi?expand=0&rev=75 --- avahi-gir-fixup.patch | 13 ++++++++ avahi-glib2.spec | 25 ++++++++++++++++ avahi-mono.spec | 69 ++++++++++++++++--------------------------- avahi-qt4.spec | 25 ++++++++++++++++ avahi.changes | 11 +++++++ avahi.spec | 25 ++++++++++++++++ 6 files changed, 124 insertions(+), 44 deletions(-) create mode 100644 avahi-gir-fixup.patch diff --git a/avahi-gir-fixup.patch b/avahi-gir-fixup.patch new file mode 100644 index 0000000..d5a877f --- /dev/null +++ b/avahi-gir-fixup.patch @@ -0,0 +1,13 @@ +Index: avahi-0.6.30/avahi-gobject/AvahiCore-0.6.gir +=================================================================== +--- avahi-0.6.30.orig/avahi-gobject/AvahiCore-0.6.gir ++++ avahi-0.6.30/avahi-gobject/AvahiCore-0.6.gir +@@ -3,7 +3,7 @@ + xmlns="http://www.gtk.org/introspection/core/1.0" + xmlns:c="http://www.gtk.org/introspection/c/1.0" + xmlns:glib="http://www.gtk.org/introspection/glib/1.0"> +- ++ + + + diff --git a/avahi-glib2.spec b/avahi-glib2.spec index 411fd24..9acbe20 100644 --- a/avahi-glib2.spec +++ b/avahi-glib2.spec @@ -37,6 +37,7 @@ Release: 5 %endif %define avahi_client_soname 3 %define avahi_common_soname 3 +# If avahi_core_soname changes, make sure to update avahi-gir-fixup.patch %define avahi_core_soname 7 %define avahi_ui_soname 0 %define avahi_glib_soname 1 @@ -70,6 +71,8 @@ Patch3: avahi-empty-share-dir.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 Patch11: avahi-gtk_box_new.patch +# PATCH-FIX-UPSTREAM avahi-gir-fixup.patch dimstar@opensnse.org -- Use complete shared library name in gir file for dependency +Patch12: avahi-gir-fixup.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: dbus-1-python fdupes gcc-c++ gdbm-devel intltool libdaemon-devel libexpat-devel pkg-config translation-update-upstream # Even if we are not building python bindings, we need python to build service types database: @@ -430,6 +433,23 @@ It passes all tests in the Apple Bonjour conformance test suite. In addition, it supports some nifty things, like correct mDNS reflection across LAN segments. +%package -n typelib-1_0-Avahi-0_6 +Summary: D-BUS Service for Zeroconf and Bonjour +Group: System/Libraries + +%description -n typelib-1_0-Avahi-0_6 +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 +is used to coordinate application efforts in caching replies, necessary +to minimize the traffic imposed on networks. + +The Avahi mDNS responder is now complete with features, implementing +all MUSTs and the majority of the SHOULDs of the mDNS and DNS-SD RFCs. +It passes all tests in the Apple Bonjour conformance test suite. In +addition, it supports some nifty things, like correct mDNS reflection +across LAN segments. + %package -n avahi-utils-gtk Summary: GTK+ Utilities for D-BUS Service for Zeroconf and Bonjour Requires: %{_name} >= %{version} @@ -484,6 +504,7 @@ Requires: libavahi-devel = %{version} Requires: libavahi-glib1 = %{version} Requires: libavahi-ui0 = %{version} Requires: libavahi-ui-gtk3-%{avahi_gtk3_soname} = %{version} +Requires: typelib-1_0-Avahi-0_6 = %{version} Group: Development/Libraries/C and C++ # Last appeared in OpenSUSE 10.3: Provides: avahi-devel:%{_libdir}/libavahi-glib.so @@ -650,6 +671,7 @@ translation-update-upstream %patch3 %patch10 -p1 %patch11 -p1 +%patch12 -p1 %if !%build_core # Replace all .la references from local .la files to installed versions # with exception of libavahi-glib.la. @@ -1090,6 +1112,9 @@ fi %files -n libavahi-gobject0 %defattr(-,root,root) %{_libdir}/libavahi-gobject*.so.* + +%files -n typelib-1_0-Avahi-0_6 +%defattr(-,root,root) %{_libdir}/girepository-1.0/Avahi-0.6.typelib %{_libdir}/girepository-1.0/AvahiCore-0.6.typelib diff --git a/avahi-mono.spec b/avahi-mono.spec index 3aaf903..bf3e3d4 100644 --- a/avahi-mono.spec +++ b/avahi-mono.spec @@ -37,6 +37,7 @@ Release: 5 %endif %define avahi_client_soname 3 %define avahi_common_soname 3 +# If avahi_core_soname changes, make sure to update avahi-gir-fixup.patch %define avahi_core_soname 7 %define avahi_ui_soname 0 %define avahi_glib_soname 1 @@ -70,6 +71,8 @@ Patch3: avahi-empty-share-dir.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 Patch11: avahi-gtk_box_new.patch +# PATCH-FIX-UPSTREAM avahi-gir-fixup.patch dimstar@opensnse.org -- Use complete shared library name in gir file for dependency +Patch12: avahi-gir-fixup.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: dbus-1-python fdupes gcc-c++ gdbm-devel intltool libdaemon-devel libexpat-devel pkg-config translation-update-upstream # Even if we are not building python bindings, we need python to build service types database: @@ -147,28 +150,6 @@ SHOULDs of the mDNS and DNS-SD RFCs. It passes all tests in the Apple Bonjour conformance test suite. In addition, it supports some nifty things, like correct mDNS reflection across LAN segments. -This package provides Mono bindings for avahi. Avahi is an -implementation of the DNS Service Discovery and MulticastDNS -specifications for Zeroconf Computing. It uses D-BUS for communication -between user applications and a system daemon. The daemon is used to -coordinate application efforts in caching replies, necessary to -minimize the traffic imposed on networks. The Avahi mDNS responder is -now feature complete, implementing all MUSTs and the majority of the -SHOULDs of the mDNS and DNS-SD RFCs. It passes all tests in the Apple -Bonjour conformance test suite. In addition, it supports some nifty -things, like correct mDNS reflection across LAN segments. - -This package provides Mono bindings for avahi. Avahi is an -implementation of the DNS Service Discovery and MulticastDNS -specifications for Zeroconf Computing. It uses D-BUS for communication -between user applications and a system daemon. The daemon is used to -coordinate application efforts in caching replies, necessary to -minimize the traffic imposed on networks. The Avahi mDNS responder is -now feature complete, implementing all MUSTs and the majority of the -SHOULDs of the mDNS and DNS-SD RFCs. It passes all tests in the Apple -Bonjour conformance test suite. In addition, it supports some nifty -things, like correct mDNS reflection across LAN segments. - %if %build_core %package -n libavahi-client3 @@ -462,6 +443,23 @@ It passes all tests in the Apple Bonjour conformance test suite. In addition, it supports some nifty things, like correct mDNS reflection across LAN segments. +%package -n typelib-1_0-Avahi-0_6 +Summary: D-BUS Service for Zeroconf and Bonjour +Group: System/Libraries + +%description -n typelib-1_0-Avahi-0_6 +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 +is used to coordinate application efforts in caching replies, necessary +to minimize the traffic imposed on networks. + +The Avahi mDNS responder is now complete with features, implementing +all MUSTs and the majority of the SHOULDs of the mDNS and DNS-SD RFCs. +It passes all tests in the Apple Bonjour conformance test suite. In +addition, it supports some nifty things, like correct mDNS reflection +across LAN segments. + %package -n avahi-utils-gtk Summary: GTK+ Utilities for D-BUS Service for Zeroconf and Bonjour Requires: %{_name} >= %{version} @@ -516,6 +514,7 @@ Requires: libavahi-devel = %{version} Requires: libavahi-glib1 = %{version} Requires: libavahi-ui0 = %{version} Requires: libavahi-ui-gtk3-%{avahi_gtk3_soname} = %{version} +Requires: typelib-1_0-Avahi-0_6 = %{version} Group: Development/Libraries/C and C++ # Last appeared in OpenSUSE 10.3: Provides: avahi-devel:%{_libdir}/libavahi-glib.so @@ -681,28 +680,6 @@ SHOULDs of the mDNS and DNS-SD RFCs. It passes all tests in the Apple Bonjour conformance test suite. In addition, it supports some nifty things, like correct mDNS reflection across LAN segments. -This package provides Mono bindings for avahi. Avahi is an -implementation of the DNS Service Discovery and MulticastDNS -specifications for Zeroconf Computing. It uses D-BUS for communication -between user applications and a system daemon. The daemon is used to -coordinate application efforts in caching replies, necessary to -minimize the traffic imposed on networks. The Avahi mDNS responder is -now feature complete, implementing all MUSTs and the majority of the -SHOULDs of the mDNS and DNS-SD RFCs. It passes all tests in the Apple -Bonjour conformance test suite. In addition, it supports some nifty -things, like correct mDNS reflection across LAN segments. - -This package provides Mono bindings for avahi. Avahi is an -implementation of the DNS Service Discovery and MulticastDNS -specifications for Zeroconf Computing. It uses D-BUS for communication -between user applications and a system daemon. The daemon is used to -coordinate application efforts in caching replies, necessary to -minimize the traffic imposed on networks. The Avahi mDNS responder is -now feature complete, implementing all MUSTs and the majority of the -SHOULDs of the mDNS and DNS-SD RFCs. It passes all tests in the Apple -Bonjour conformance test suite. In addition, it supports some nifty -things, like correct mDNS reflection across LAN segments. - %endif %lang_package %endif @@ -715,6 +692,7 @@ translation-update-upstream %patch3 %patch10 -p1 %patch11 -p1 +%patch12 -p1 %if !%build_core # Replace all .la references from local .la files to installed versions # with exception of libavahi-glib.la. @@ -1155,6 +1133,9 @@ fi %files -n libavahi-gobject0 %defattr(-,root,root) %{_libdir}/libavahi-gobject*.so.* + +%files -n typelib-1_0-Avahi-0_6 +%defattr(-,root,root) %{_libdir}/girepository-1.0/Avahi-0.6.typelib %{_libdir}/girepository-1.0/AvahiCore-0.6.typelib diff --git a/avahi-qt4.spec b/avahi-qt4.spec index 988ad59..7bd077c 100644 --- a/avahi-qt4.spec +++ b/avahi-qt4.spec @@ -37,6 +37,7 @@ Release: 5 %endif %define avahi_client_soname 3 %define avahi_common_soname 3 +# If avahi_core_soname changes, make sure to update avahi-gir-fixup.patch %define avahi_core_soname 7 %define avahi_ui_soname 0 %define avahi_glib_soname 1 @@ -70,6 +71,8 @@ Patch3: avahi-empty-share-dir.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 Patch11: avahi-gtk_box_new.patch +# PATCH-FIX-UPSTREAM avahi-gir-fixup.patch dimstar@opensnse.org -- Use complete shared library name in gir file for dependency +Patch12: avahi-gir-fixup.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: dbus-1-python fdupes gcc-c++ gdbm-devel intltool libdaemon-devel libexpat-devel pkg-config translation-update-upstream # Even if we are not building python bindings, we need python to build service types database: @@ -432,6 +435,23 @@ It passes all tests in the Apple Bonjour conformance test suite. In addition, it supports some nifty things, like correct mDNS reflection across LAN segments. +%package -n typelib-1_0-Avahi-0_6 +Summary: D-BUS Service for Zeroconf and Bonjour +Group: System/Libraries + +%description -n typelib-1_0-Avahi-0_6 +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 +is used to coordinate application efforts in caching replies, necessary +to minimize the traffic imposed on networks. + +The Avahi mDNS responder is now complete with features, implementing +all MUSTs and the majority of the SHOULDs of the mDNS and DNS-SD RFCs. +It passes all tests in the Apple Bonjour conformance test suite. In +addition, it supports some nifty things, like correct mDNS reflection +across LAN segments. + %package -n avahi-utils-gtk Summary: GTK+ Utilities for D-BUS Service for Zeroconf and Bonjour Requires: %{_name} >= %{version} @@ -486,6 +506,7 @@ Requires: libavahi-devel = %{version} Requires: libavahi-glib1 = %{version} Requires: libavahi-ui0 = %{version} Requires: libavahi-ui-gtk3-%{avahi_gtk3_soname} = %{version} +Requires: typelib-1_0-Avahi-0_6 = %{version} Group: Development/Libraries/C and C++ # Last appeared in OpenSUSE 10.3: Provides: avahi-devel:%{_libdir}/libavahi-glib.so @@ -652,6 +673,7 @@ translation-update-upstream %patch3 %patch10 -p1 %patch11 -p1 +%patch12 -p1 %if !%build_core # Replace all .la references from local .la files to installed versions # with exception of libavahi-glib.la. @@ -1092,6 +1114,9 @@ fi %files -n libavahi-gobject0 %defattr(-,root,root) %{_libdir}/libavahi-gobject*.so.* + +%files -n typelib-1_0-Avahi-0_6 +%defattr(-,root,root) %{_libdir}/girepository-1.0/Avahi-0.6.typelib %{_libdir}/girepository-1.0/AvahiCore-0.6.typelib diff --git a/avahi.changes b/avahi.changes index ce869ad..4701f11 100644 --- a/avahi.changes +++ b/avahi.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Thu Dec 8 17:16:31 UTC 2011 - dimstar@opensuse.org + +- Add avahi-gir-fixup.patch: Change the gir/typelib dependency to + be correctly libavahi-core.so.7 instead of avahi-core. + +------------------------------------------------------------------- +Wed Dec 7 10:52:27 UTC 2011 - dimstar@opensuse.org + +- Split the typelib files in typelib-1_0-Avahi-0_6. + ------------------------------------------------------------------- Sun Dec 4 13:40:54 UTC 2011 - dimstar@opensuse.org diff --git a/avahi.spec b/avahi.spec index b811723..db74a9c 100644 --- a/avahi.spec +++ b/avahi.spec @@ -39,6 +39,7 @@ Release: 5 %endif %define avahi_client_soname 3 %define avahi_common_soname 3 +# If avahi_core_soname changes, make sure to update avahi-gir-fixup.patch %define avahi_core_soname 7 %define avahi_ui_soname 0 %define avahi_glib_soname 1 @@ -72,6 +73,8 @@ Patch3: avahi-empty-share-dir.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 Patch11: avahi-gtk_box_new.patch +# PATCH-FIX-UPSTREAM avahi-gir-fixup.patch dimstar@opensnse.org -- Use complete shared library name in gir file for dependency +Patch12: avahi-gir-fixup.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: dbus-1-python fdupes gcc-c++ gdbm-devel intltool libdaemon-devel libexpat-devel pkg-config translation-update-upstream # Even if we are not building python bindings, we need python to build service types database: @@ -432,6 +435,23 @@ It passes all tests in the Apple Bonjour conformance test suite. In addition, it supports some nifty things, like correct mDNS reflection across LAN segments. +%package -n typelib-1_0-Avahi-0_6 +Summary: D-BUS Service for Zeroconf and Bonjour +Group: System/Libraries + +%description -n typelib-1_0-Avahi-0_6 +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 +is used to coordinate application efforts in caching replies, necessary +to minimize the traffic imposed on networks. + +The Avahi mDNS responder is now complete with features, implementing +all MUSTs and the majority of the SHOULDs of the mDNS and DNS-SD RFCs. +It passes all tests in the Apple Bonjour conformance test suite. In +addition, it supports some nifty things, like correct mDNS reflection +across LAN segments. + %package -n avahi-utils-gtk Summary: GTK+ Utilities for D-BUS Service for Zeroconf and Bonjour Requires: %{_name} >= %{version} @@ -486,6 +506,7 @@ Requires: libavahi-devel = %{version} Requires: libavahi-glib1 = %{version} Requires: libavahi-ui0 = %{version} Requires: libavahi-ui-gtk3-%{avahi_gtk3_soname} = %{version} +Requires: typelib-1_0-Avahi-0_6 = %{version} Group: Development/Libraries/C and C++ # Last appeared in OpenSUSE 10.3: Provides: avahi-devel:%{_libdir}/libavahi-glib.so @@ -652,6 +673,7 @@ translation-update-upstream %patch3 %patch10 -p1 %patch11 -p1 +%patch12 -p1 %if !%build_core # Replace all .la references from local .la files to installed versions # with exception of libavahi-glib.la. @@ -1092,6 +1114,9 @@ fi %files -n libavahi-gobject0 %defattr(-,root,root) %{_libdir}/libavahi-gobject*.so.* + +%files -n typelib-1_0-Avahi-0_6 +%defattr(-,root,root) %{_libdir}/girepository-1.0/Avahi-0.6.typelib %{_libdir}/girepository-1.0/AvahiCore-0.6.typelib From f553227a24a2c5db46dbdb12febd76bc543b20ebc20bccde508e898940b6430f Mon Sep 17 00:00:00 2001 From: Vincent Untz Date: Wed, 21 Dec 2011 04:14:17 +0000 Subject: [PATCH 3/3] Accepting request 97445 from home:vuntz:branches:GNOME:Factory tweak OBS-URL: https://build.opensuse.org/request/show/97445 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/avahi?expand=0&rev=76 --- avahi-glib2.spec | 66 +++++++++++++++++++++++------------- avahi-mono.spec | 88 +++++++++++++++++++++++------------------------- avahi-qt4.spec | 66 +++++++++++++++++++++++------------- avahi.changes | 4 ++- avahi.spec | 66 +++++++++++++++++++++++------------- 5 files changed, 175 insertions(+), 115 deletions(-) diff --git a/avahi-glib2.spec b/avahi-glib2.spec index 9acbe20..09da67c 100644 --- a/avahi-glib2.spec +++ b/avahi-glib2.spec @@ -15,8 +15,6 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # - - Name: avahi-glib2 # Do not edit this auto generated file! Edit avahi.spec. %define _name avahi @@ -30,7 +28,7 @@ Name: avahi-glib2 %define build_qt3 0 %define build_qt4 0 Version: 0.6.30 -Release: 5 +Release: 0 %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}) @@ -49,9 +47,9 @@ Release: 5 %define debug_package_requires libavahi-ui%{avahi_ui_soname} = %{version}-%{release} %endif Url: http://www.avahi.org/ -Group: System/Daemons -License: LGPL-2.1+ Summary: D-BUS Service for Zeroconf and Bonjour +License: LGPL-2.1+ +Group: System/Daemons Source: %{_name}-%{version}.tar.bz2 Source1: gnome-nettool2.png Source2: avahi-bookmarks.init @@ -74,9 +72,18 @@ Patch11: avahi-gtk_box_new.patch # PATCH-FIX-UPSTREAM avahi-gir-fixup.patch dimstar@opensnse.org -- Use complete shared library name in gir file for dependency Patch12: avahi-gir-fixup.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildRequires: dbus-1-python fdupes gcc-c++ gdbm-devel intltool libdaemon-devel libexpat-devel pkg-config translation-update-upstream +BuildRequires: dbus-1-python +BuildRequires: fdupes +BuildRequires: gcc-c++ +BuildRequires: gdbm-devel +BuildRequires: intltool +BuildRequires: libdaemon-devel +BuildRequires: libexpat-devel +BuildRequires: pkg-config +BuildRequires: translation-update-upstream # Even if we are not building python bindings, we need python to build service types database: -BuildRequires: python-devel python-gdbm +BuildRequires: python-devel +BuildRequires: python-gdbm # libtool is needed to build all variants: bootstrap is unconditional in the build section BuildRequires: libtool %if %suse_version <= 1110 @@ -92,7 +99,11 @@ PreReq: sysconfig %endif %{?systemd_requires} Recommends: %{_name}-lang -BuildRequires: dbus-1-devel doxygen graphviz python-gdbm zlib-devel +BuildRequires: dbus-1-devel +BuildRequires: doxygen +BuildRequires: graphviz +BuildRequires: python-gdbm +BuildRequires: zlib-devel %if %suse_version >= 1210 BuildRequires: systemd %endif @@ -110,7 +121,11 @@ Provides: mDNSResponder = 107.5 Obsoletes: mDNSResponder < 107.5 %endif %if %build_glib2 -BuildRequires: gobject-introspection-devel gtk2-devel gtk3-devel python-gtk-devel update-desktop-files +BuildRequires: gobject-introspection-devel +BuildRequires: gtk2-devel +BuildRequires: gtk3-devel +BuildRequires: python-gtk-devel +BuildRequires: update-desktop-files BuildRequires: libavahi-devel %endif %if %build_qt3 @@ -122,7 +137,10 @@ BuildRequires: libqt4-devel BuildRequires: libavahi-devel %endif %if %build_mono -BuildRequires: gtk-sharp2 libavahi-glib-devel mono-devel monodoc-core +BuildRequires: gtk-sharp2 +BuildRequires: libavahi-glib-devel +BuildRequires: mono-devel +BuildRequires: monodoc-core # Please copy this line to avahi-mono definition below for build all-in-once: Requires: gtk-sharp2 libavahi-client3 >= %{version} libavahi-common3 >= %{version} libavahi-ui0 >= %{version} libavahi-glib1 >= %{version} %endif @@ -254,9 +272,9 @@ correct mDNS reflection across LAN segments. %package -n python-avahi Summary: A set of Avahi utilities written in Python +Group: Development/Languages/Python PreReq: coreutils Requires: %{name} = %{version} python-gdbm dbus-1-python python-twisted python-twisted-web -Group: Development/Languages/Python # Old name used for <= 10.3: Provides: avahi-python = %{version} Obsoletes: avahi-python < %{version} @@ -277,8 +295,8 @@ elsewhere, like correct mDNS reflection across LAN segments. %package utils Summary: Command Line Utilities for D-BUS Service for Zeroconf and Bonjour -Requires: %{_name} >= %{version} Group: Productivity/Networking/Other +Requires: %{_name} >= %{version} %description utils Avahi is an implementation of the DNS Service Discovery and Multicast @@ -295,9 +313,9 @@ across LAN segments. %package -n libavahi-devel Summary: Include Files and Libraries Mandatory for Development +Group: Development/Libraries/C and C++ # Requires: %{_name} = %{version} libavahi-common3 = %{version} libavahi-core7 = %{version} libavahi-client3 = %{version} dbus-1-devel glibc-devel -Group: Development/Libraries/C and C++ # Last appeared in OpenSUSE 10.3: Provides: avahi-devel = %{version} Obsoletes: avahi-devel < %{version} @@ -317,8 +335,8 @@ correct mDNS reflection across LAN segments. %package compat-mDNSResponder-devel Summary: mDNSResponder Compatibility Package for D-BUS Service for Zeroconf/Bonjour -Requires: libavahi-devel = %{version} libdns_sd = %{version} Group: Development/Libraries/C and C++ +Requires: libavahi-devel = %{version} libdns_sd = %{version} Provides: mDNSResponder-devel = 107.5 Obsoletes: mDNSResponder-devel < 107.5 @@ -339,8 +357,8 @@ correct mDNS reflection across LAN segments. %package compat-howl-devel Summary: Howl Compatibility Package for D-BUS Service for Zeroconf/Bonjour -Requires: libavahi-devel = %{version} libhowl0 = %{version} Group: Development/Libraries/C and C++ +Requires: libavahi-devel = %{version} libhowl0 = %{version} %description compat-howl-devel Howl compatibility layer for avahi. @@ -434,7 +452,7 @@ addition, it supports some nifty things, like correct mDNS reflection across LAN segments. %package -n typelib-1_0-Avahi-0_6 -Summary: D-BUS Service for Zeroconf and Bonjour +Summary: D-BUS Service for Zeroconf and Bonjour -- Introspection bindings Group: System/Libraries %description -n typelib-1_0-Avahi-0_6 @@ -450,10 +468,12 @@ It passes all tests in the Apple Bonjour conformance test suite. In addition, it supports some nifty things, like correct mDNS reflection across LAN segments. +This package provides the GObject Introspection bindings for Avahi. + %package -n avahi-utils-gtk Summary: GTK+ Utilities for D-BUS Service for Zeroconf and Bonjour -Requires: %{_name} >= %{version} Group: Productivity/Networking/Other +Requires: %{_name} >= %{version} # Due to a mistake in the spec file build staging, this package had # name avahi-glib2-utils-gtk in 11.1 and SLE11 and avahi-utils-gtk in # all other products. @@ -475,9 +495,9 @@ across LAN segments. %package -n python-avahi-gtk Summary: A set of Avahi utilities written in Python Using python-gtk +Group: Development/Languages/Python PreReq: coreutils Requires: python-avahi = %{version} python-gtk -Group: Development/Languages/Python # Old name used for <= 10.3: Provides: avahi-python = %{version} Obsoletes: avahi-python < %{version} @@ -500,12 +520,12 @@ elsewhere, like correct mDNS reflection across LAN segments. %package -n libavahi-glib-devel Summary: Include Files and Libraries Mandatory for Development +Group: Development/Libraries/C and C++ Requires: libavahi-devel = %{version} Requires: libavahi-glib1 = %{version} Requires: libavahi-ui0 = %{version} Requires: libavahi-ui-gtk3-%{avahi_gtk3_soname} = %{version} Requires: typelib-1_0-Avahi-0_6 = %{version} -Group: Development/Libraries/C and C++ # Last appeared in OpenSUSE 10.3: Provides: avahi-devel:%{_libdir}/libavahi-glib.so @@ -526,8 +546,8 @@ correct mDNS reflection across LAN segments. %package -n libavahi-gobject-devel Summary: D-BUS Service for Zeroconf and Bonjour -Requires: libavahi-devel = %{version} libavahi-glib-devel libavahi-gobject0 = %{version} glib2-devel Group: System/Daemons +Requires: libavahi-devel = %{version} libavahi-glib-devel libavahi-gobject0 = %{version} glib2-devel %description -n libavahi-gobject-devel Avahi is an implementation of the DNS Service Discovery and Multicast @@ -571,8 +591,8 @@ correct mDNS reflection across LAN segments. %package -n libavahi-qt3-devel Summary: Include Files and Libraries Mandatory for Development -Requires: libavahi-devel = %{version} libavahi-qt3-1 = %{version} qt3-devel Group: Development/Libraries/C and C++ +Requires: libavahi-devel = %{version} libavahi-qt3-1 = %{version} qt3-devel # Last appeared in OpenSUSE 10.3: Provides: avahi-devel:%{_libdir}/libavahi-qt3.so @@ -618,8 +638,8 @@ correct mDNS reflection across LAN segments. %package -n libavahi-qt4-devel Summary: Include Files and Libraries Mandatory for Development -Requires: libavahi-devel = %{version} libavahi-qt4-1 = %{version} libqt4-devel Group: Development/Libraries/C and C++ +Requires: libavahi-devel = %{version} libavahi-qt4-1 = %{version} libqt4-devel # Last appeared in OpenSUSE 10.3: Provides: avahi-devel:%{_libdir}/libavahi-qt4.so @@ -644,8 +664,8 @@ correct mDNS reflection across LAN segments. %package -n avahi-mono Summary: Mono Bindings for avahi, the D-BUS Service for Zeroconf and Bonjour -Requires: gtk-sharp2 libavahi-client3 >= %{version} libavahi-common3 >= %{version} libavahi-ui0 >= %{version} libavahi-glib1 >= %{version} Group: Development/Languages/Mono +Requires: gtk-sharp2 libavahi-client3 >= %{version} libavahi-common3 >= %{version} libavahi-ui0 >= %{version} libavahi-glib1 >= %{version} %description -n avahi-mono This package provides Mono bindings for avahi. Avahi is an diff --git a/avahi-mono.spec b/avahi-mono.spec index bf3e3d4..c98b5d2 100644 --- a/avahi-mono.spec +++ b/avahi-mono.spec @@ -15,8 +15,6 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # - - Name: avahi-mono # Do not edit this auto generated file! Edit avahi.spec. %define _name avahi @@ -30,7 +28,7 @@ Name: avahi-mono %define build_qt3 0 %define build_qt4 0 Version: 0.6.30 -Release: 5 +Release: 0 %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}) @@ -49,9 +47,9 @@ Release: 5 %define debug_package_requires libavahi-ui%{avahi_ui_soname} = %{version}-%{release} %endif Url: http://www.avahi.org/ -Group: Development/Languages/Mono -License: LGPL-2.1+ Summary: Mono Bindings for avahi, the D-BUS Service for Zeroconf and Bonjour +License: LGPL-2.1+ +Group: Development/Languages/Mono Source: %{_name}-%{version}.tar.bz2 Source1: gnome-nettool2.png Source2: avahi-bookmarks.init @@ -74,9 +72,18 @@ Patch11: avahi-gtk_box_new.patch # PATCH-FIX-UPSTREAM avahi-gir-fixup.patch dimstar@opensnse.org -- Use complete shared library name in gir file for dependency Patch12: avahi-gir-fixup.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildRequires: dbus-1-python fdupes gcc-c++ gdbm-devel intltool libdaemon-devel libexpat-devel pkg-config translation-update-upstream +BuildRequires: dbus-1-python +BuildRequires: fdupes +BuildRequires: gcc-c++ +BuildRequires: gdbm-devel +BuildRequires: intltool +BuildRequires: libdaemon-devel +BuildRequires: libexpat-devel +BuildRequires: pkg-config +BuildRequires: translation-update-upstream # Even if we are not building python bindings, we need python to build service types database: -BuildRequires: python-devel python-gdbm +BuildRequires: python-devel +BuildRequires: python-gdbm # libtool is needed to build all variants: bootstrap is unconditional in the build section BuildRequires: libtool %if %suse_version <= 1110 @@ -92,7 +99,11 @@ PreReq: sysconfig %endif %{?systemd_requires} Recommends: %{_name}-lang -BuildRequires: dbus-1-devel doxygen graphviz python-gdbm zlib-devel +BuildRequires: dbus-1-devel +BuildRequires: doxygen +BuildRequires: graphviz +BuildRequires: python-gdbm +BuildRequires: zlib-devel %if %suse_version >= 1210 BuildRequires: systemd %endif @@ -110,7 +121,11 @@ Provides: mDNSResponder = 107.5 Obsoletes: mDNSResponder < 107.5 %endif %if %build_glib2 -BuildRequires: gobject-introspection-devel gtk2-devel gtk3-devel python-gtk-devel update-desktop-files +BuildRequires: gobject-introspection-devel +BuildRequires: gtk2-devel +BuildRequires: gtk3-devel +BuildRequires: python-gtk-devel +BuildRequires: update-desktop-files BuildRequires: libavahi-devel %endif %if %build_qt3 @@ -122,7 +137,10 @@ BuildRequires: libqt4-devel BuildRequires: libavahi-devel %endif %if %build_mono -BuildRequires: gtk-sharp2 libavahi-glib-devel mono-devel monodoc-core +BuildRequires: gtk-sharp2 +BuildRequires: libavahi-glib-devel +BuildRequires: mono-devel +BuildRequires: monodoc-core # Please copy this line to avahi-mono definition below for build all-in-once: Requires: gtk-sharp2 libavahi-client3 >= %{version} libavahi-common3 >= %{version} libavahi-ui0 >= %{version} libavahi-glib1 >= %{version} %endif @@ -139,17 +157,6 @@ SHOULDs of the mDNS and DNS-SD RFCs. It passes all tests in the Apple Bonjour conformance test suite. In addition, it supports some nifty things, like correct mDNS reflection across LAN segments. -This package provides Mono bindings for avahi. Avahi is an -implementation of the DNS Service Discovery and MulticastDNS -specifications for Zeroconf Computing. It uses D-BUS for communication -between user applications and a system daemon. The daemon is used to -coordinate application efforts in caching replies, necessary to -minimize the traffic imposed on networks. The Avahi mDNS responder is -now feature complete, implementing all MUSTs and the majority of the -SHOULDs of the mDNS and DNS-SD RFCs. It passes all tests in the Apple -Bonjour conformance test suite. In addition, it supports some nifty -things, like correct mDNS reflection across LAN segments. - %if %build_core %package -n libavahi-client3 @@ -264,9 +271,9 @@ correct mDNS reflection across LAN segments. %package -n python-avahi Summary: A set of Avahi utilities written in Python +Group: Development/Languages/Python PreReq: coreutils Requires: %{name} = %{version} python-gdbm dbus-1-python python-twisted python-twisted-web -Group: Development/Languages/Python # Old name used for <= 10.3: Provides: avahi-python = %{version} Obsoletes: avahi-python < %{version} @@ -287,8 +294,8 @@ elsewhere, like correct mDNS reflection across LAN segments. %package utils Summary: Command Line Utilities for D-BUS Service for Zeroconf and Bonjour -Requires: %{_name} >= %{version} Group: Productivity/Networking/Other +Requires: %{_name} >= %{version} %description utils Avahi is an implementation of the DNS Service Discovery and Multicast @@ -305,9 +312,9 @@ across LAN segments. %package -n libavahi-devel Summary: Include Files and Libraries Mandatory for Development +Group: Development/Libraries/C and C++ # Requires: %{_name} = %{version} libavahi-common3 = %{version} libavahi-core7 = %{version} libavahi-client3 = %{version} dbus-1-devel glibc-devel -Group: Development/Libraries/C and C++ # Last appeared in OpenSUSE 10.3: Provides: avahi-devel = %{version} Obsoletes: avahi-devel < %{version} @@ -327,8 +334,8 @@ correct mDNS reflection across LAN segments. %package compat-mDNSResponder-devel Summary: mDNSResponder Compatibility Package for D-BUS Service for Zeroconf/Bonjour -Requires: libavahi-devel = %{version} libdns_sd = %{version} Group: Development/Libraries/C and C++ +Requires: libavahi-devel = %{version} libdns_sd = %{version} Provides: mDNSResponder-devel = 107.5 Obsoletes: mDNSResponder-devel < 107.5 @@ -349,8 +356,8 @@ correct mDNS reflection across LAN segments. %package compat-howl-devel Summary: Howl Compatibility Package for D-BUS Service for Zeroconf/Bonjour -Requires: libavahi-devel = %{version} libhowl0 = %{version} Group: Development/Libraries/C and C++ +Requires: libavahi-devel = %{version} libhowl0 = %{version} %description compat-howl-devel Howl compatibility layer for avahi. @@ -444,7 +451,7 @@ addition, it supports some nifty things, like correct mDNS reflection across LAN segments. %package -n typelib-1_0-Avahi-0_6 -Summary: D-BUS Service for Zeroconf and Bonjour +Summary: D-BUS Service for Zeroconf and Bonjour -- Introspection bindings Group: System/Libraries %description -n typelib-1_0-Avahi-0_6 @@ -460,10 +467,12 @@ It passes all tests in the Apple Bonjour conformance test suite. In addition, it supports some nifty things, like correct mDNS reflection across LAN segments. +This package provides the GObject Introspection bindings for Avahi. + %package -n avahi-utils-gtk Summary: GTK+ Utilities for D-BUS Service for Zeroconf and Bonjour -Requires: %{_name} >= %{version} Group: Productivity/Networking/Other +Requires: %{_name} >= %{version} # Due to a mistake in the spec file build staging, this package had # name avahi-glib2-utils-gtk in 11.1 and SLE11 and avahi-utils-gtk in # all other products. @@ -485,9 +494,9 @@ across LAN segments. %package -n python-avahi-gtk Summary: A set of Avahi utilities written in Python Using python-gtk +Group: Development/Languages/Python PreReq: coreutils Requires: python-avahi = %{version} python-gtk -Group: Development/Languages/Python # Old name used for <= 10.3: Provides: avahi-python = %{version} Obsoletes: avahi-python < %{version} @@ -510,12 +519,12 @@ elsewhere, like correct mDNS reflection across LAN segments. %package -n libavahi-glib-devel Summary: Include Files and Libraries Mandatory for Development +Group: Development/Libraries/C and C++ Requires: libavahi-devel = %{version} Requires: libavahi-glib1 = %{version} Requires: libavahi-ui0 = %{version} Requires: libavahi-ui-gtk3-%{avahi_gtk3_soname} = %{version} Requires: typelib-1_0-Avahi-0_6 = %{version} -Group: Development/Libraries/C and C++ # Last appeared in OpenSUSE 10.3: Provides: avahi-devel:%{_libdir}/libavahi-glib.so @@ -536,8 +545,8 @@ correct mDNS reflection across LAN segments. %package -n libavahi-gobject-devel Summary: D-BUS Service for Zeroconf and Bonjour -Requires: libavahi-devel = %{version} libavahi-glib-devel libavahi-gobject0 = %{version} glib2-devel Group: System/Daemons +Requires: libavahi-devel = %{version} libavahi-glib-devel libavahi-gobject0 = %{version} glib2-devel %description -n libavahi-gobject-devel Avahi is an implementation of the DNS Service Discovery and Multicast @@ -581,8 +590,8 @@ correct mDNS reflection across LAN segments. %package -n libavahi-qt3-devel Summary: Include Files and Libraries Mandatory for Development -Requires: libavahi-devel = %{version} libavahi-qt3-1 = %{version} qt3-devel Group: Development/Libraries/C and C++ +Requires: libavahi-devel = %{version} libavahi-qt3-1 = %{version} qt3-devel # Last appeared in OpenSUSE 10.3: Provides: avahi-devel:%{_libdir}/libavahi-qt3.so @@ -628,8 +637,8 @@ correct mDNS reflection across LAN segments. %package -n libavahi-qt4-devel Summary: Include Files and Libraries Mandatory for Development -Requires: libavahi-devel = %{version} libavahi-qt4-1 = %{version} libqt4-devel Group: Development/Libraries/C and C++ +Requires: libavahi-devel = %{version} libavahi-qt4-1 = %{version} libqt4-devel # Last appeared in OpenSUSE 10.3: Provides: avahi-devel:%{_libdir}/libavahi-qt4.so @@ -654,8 +663,8 @@ correct mDNS reflection across LAN segments. %package -n avahi-mono Summary: Mono Bindings for avahi, the D-BUS Service for Zeroconf and Bonjour -Requires: gtk-sharp2 libavahi-client3 >= %{version} libavahi-common3 >= %{version} libavahi-ui0 >= %{version} libavahi-glib1 >= %{version} Group: Development/Languages/Mono +Requires: gtk-sharp2 libavahi-client3 >= %{version} libavahi-common3 >= %{version} libavahi-ui0 >= %{version} libavahi-glib1 >= %{version} %description -n avahi-mono This package provides Mono bindings for avahi. Avahi is an @@ -669,17 +678,6 @@ SHOULDs of the mDNS and DNS-SD RFCs. It passes all tests in the Apple Bonjour conformance test suite. In addition, it supports some nifty things, like correct mDNS reflection across LAN segments. -This package provides Mono bindings for avahi. Avahi is an -implementation of the DNS Service Discovery and MulticastDNS -specifications for Zeroconf Computing. It uses D-BUS for communication -between user applications and a system daemon. The daemon is used to -coordinate application efforts in caching replies, necessary to -minimize the traffic imposed on networks. The Avahi mDNS responder is -now feature complete, implementing all MUSTs and the majority of the -SHOULDs of the mDNS and DNS-SD RFCs. It passes all tests in the Apple -Bonjour conformance test suite. In addition, it supports some nifty -things, like correct mDNS reflection across LAN segments. - %endif %lang_package %endif diff --git a/avahi-qt4.spec b/avahi-qt4.spec index 7bd077c..28cd4ea 100644 --- a/avahi-qt4.spec +++ b/avahi-qt4.spec @@ -15,8 +15,6 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # - - Name: avahi-qt4 # Do not edit this auto generated file! Edit avahi.spec. %define _name avahi @@ -30,7 +28,7 @@ Name: avahi-qt4 %define build_qt3 0 %define build_qt4 1 Version: 0.6.30 -Release: 5 +Release: 0 %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}) @@ -49,9 +47,9 @@ Release: 5 %define debug_package_requires libavahi-ui%{avahi_ui_soname} = %{version}-%{release} %endif Url: http://www.avahi.org/ -Group: System/GUI/KDE -License: LGPL-2.1+ Summary: Qt4 Bindings for avahi, the D-BUS Service for Zeroconf and Bonjour +License: LGPL-2.1+ +Group: System/GUI/KDE Source: %{_name}-%{version}.tar.bz2 Source1: gnome-nettool2.png Source2: avahi-bookmarks.init @@ -74,9 +72,18 @@ Patch11: avahi-gtk_box_new.patch # PATCH-FIX-UPSTREAM avahi-gir-fixup.patch dimstar@opensnse.org -- Use complete shared library name in gir file for dependency Patch12: avahi-gir-fixup.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildRequires: dbus-1-python fdupes gcc-c++ gdbm-devel intltool libdaemon-devel libexpat-devel pkg-config translation-update-upstream +BuildRequires: dbus-1-python +BuildRequires: fdupes +BuildRequires: gcc-c++ +BuildRequires: gdbm-devel +BuildRequires: intltool +BuildRequires: libdaemon-devel +BuildRequires: libexpat-devel +BuildRequires: pkg-config +BuildRequires: translation-update-upstream # Even if we are not building python bindings, we need python to build service types database: -BuildRequires: python-devel python-gdbm +BuildRequires: python-devel +BuildRequires: python-gdbm # libtool is needed to build all variants: bootstrap is unconditional in the build section BuildRequires: libtool %if %suse_version <= 1110 @@ -92,7 +99,11 @@ PreReq: sysconfig %endif %{?systemd_requires} Recommends: %{_name}-lang -BuildRequires: dbus-1-devel doxygen graphviz python-gdbm zlib-devel +BuildRequires: dbus-1-devel +BuildRequires: doxygen +BuildRequires: graphviz +BuildRequires: python-gdbm +BuildRequires: zlib-devel %if %suse_version >= 1210 BuildRequires: systemd %endif @@ -110,7 +121,11 @@ Provides: mDNSResponder = 107.5 Obsoletes: mDNSResponder < 107.5 %endif %if %build_glib2 -BuildRequires: gobject-introspection-devel gtk2-devel gtk3-devel python-gtk-devel update-desktop-files +BuildRequires: gobject-introspection-devel +BuildRequires: gtk2-devel +BuildRequires: gtk3-devel +BuildRequires: python-gtk-devel +BuildRequires: update-desktop-files BuildRequires: libavahi-devel %endif %if %build_qt3 @@ -122,7 +137,10 @@ BuildRequires: libqt4-devel BuildRequires: libavahi-devel %endif %if %build_mono -BuildRequires: gtk-sharp2 libavahi-glib-devel mono-devel monodoc-core +BuildRequires: gtk-sharp2 +BuildRequires: libavahi-glib-devel +BuildRequires: mono-devel +BuildRequires: monodoc-core # Please copy this line to avahi-mono definition below for build all-in-once: Requires: gtk-sharp2 libavahi-client3 >= %{version} libavahi-common3 >= %{version} libavahi-ui0 >= %{version} libavahi-glib1 >= %{version} %endif @@ -256,9 +274,9 @@ correct mDNS reflection across LAN segments. %package -n python-avahi Summary: A set of Avahi utilities written in Python +Group: Development/Languages/Python PreReq: coreutils Requires: %{name} = %{version} python-gdbm dbus-1-python python-twisted python-twisted-web -Group: Development/Languages/Python # Old name used for <= 10.3: Provides: avahi-python = %{version} Obsoletes: avahi-python < %{version} @@ -279,8 +297,8 @@ elsewhere, like correct mDNS reflection across LAN segments. %package utils Summary: Command Line Utilities for D-BUS Service for Zeroconf and Bonjour -Requires: %{_name} >= %{version} Group: Productivity/Networking/Other +Requires: %{_name} >= %{version} %description utils Avahi is an implementation of the DNS Service Discovery and Multicast @@ -297,9 +315,9 @@ across LAN segments. %package -n libavahi-devel Summary: Include Files and Libraries Mandatory for Development +Group: Development/Libraries/C and C++ # Requires: %{_name} = %{version} libavahi-common3 = %{version} libavahi-core7 = %{version} libavahi-client3 = %{version} dbus-1-devel glibc-devel -Group: Development/Libraries/C and C++ # Last appeared in OpenSUSE 10.3: Provides: avahi-devel = %{version} Obsoletes: avahi-devel < %{version} @@ -319,8 +337,8 @@ correct mDNS reflection across LAN segments. %package compat-mDNSResponder-devel Summary: mDNSResponder Compatibility Package for D-BUS Service for Zeroconf/Bonjour -Requires: libavahi-devel = %{version} libdns_sd = %{version} Group: Development/Libraries/C and C++ +Requires: libavahi-devel = %{version} libdns_sd = %{version} Provides: mDNSResponder-devel = 107.5 Obsoletes: mDNSResponder-devel < 107.5 @@ -341,8 +359,8 @@ correct mDNS reflection across LAN segments. %package compat-howl-devel Summary: Howl Compatibility Package for D-BUS Service for Zeroconf/Bonjour -Requires: libavahi-devel = %{version} libhowl0 = %{version} Group: Development/Libraries/C and C++ +Requires: libavahi-devel = %{version} libhowl0 = %{version} %description compat-howl-devel Howl compatibility layer for avahi. @@ -436,7 +454,7 @@ addition, it supports some nifty things, like correct mDNS reflection across LAN segments. %package -n typelib-1_0-Avahi-0_6 -Summary: D-BUS Service for Zeroconf and Bonjour +Summary: D-BUS Service for Zeroconf and Bonjour -- Introspection bindings Group: System/Libraries %description -n typelib-1_0-Avahi-0_6 @@ -452,10 +470,12 @@ It passes all tests in the Apple Bonjour conformance test suite. In addition, it supports some nifty things, like correct mDNS reflection across LAN segments. +This package provides the GObject Introspection bindings for Avahi. + %package -n avahi-utils-gtk Summary: GTK+ Utilities for D-BUS Service for Zeroconf and Bonjour -Requires: %{_name} >= %{version} Group: Productivity/Networking/Other +Requires: %{_name} >= %{version} # Due to a mistake in the spec file build staging, this package had # name avahi-glib2-utils-gtk in 11.1 and SLE11 and avahi-utils-gtk in # all other products. @@ -477,9 +497,9 @@ across LAN segments. %package -n python-avahi-gtk Summary: A set of Avahi utilities written in Python Using python-gtk +Group: Development/Languages/Python PreReq: coreutils Requires: python-avahi = %{version} python-gtk -Group: Development/Languages/Python # Old name used for <= 10.3: Provides: avahi-python = %{version} Obsoletes: avahi-python < %{version} @@ -502,12 +522,12 @@ elsewhere, like correct mDNS reflection across LAN segments. %package -n libavahi-glib-devel Summary: Include Files and Libraries Mandatory for Development +Group: Development/Libraries/C and C++ Requires: libavahi-devel = %{version} Requires: libavahi-glib1 = %{version} Requires: libavahi-ui0 = %{version} Requires: libavahi-ui-gtk3-%{avahi_gtk3_soname} = %{version} Requires: typelib-1_0-Avahi-0_6 = %{version} -Group: Development/Libraries/C and C++ # Last appeared in OpenSUSE 10.3: Provides: avahi-devel:%{_libdir}/libavahi-glib.so @@ -528,8 +548,8 @@ correct mDNS reflection across LAN segments. %package -n libavahi-gobject-devel Summary: D-BUS Service for Zeroconf and Bonjour -Requires: libavahi-devel = %{version} libavahi-glib-devel libavahi-gobject0 = %{version} glib2-devel Group: System/Daemons +Requires: libavahi-devel = %{version} libavahi-glib-devel libavahi-gobject0 = %{version} glib2-devel %description -n libavahi-gobject-devel Avahi is an implementation of the DNS Service Discovery and Multicast @@ -573,8 +593,8 @@ correct mDNS reflection across LAN segments. %package -n libavahi-qt3-devel Summary: Include Files and Libraries Mandatory for Development -Requires: libavahi-devel = %{version} libavahi-qt3-1 = %{version} qt3-devel Group: Development/Libraries/C and C++ +Requires: libavahi-devel = %{version} libavahi-qt3-1 = %{version} qt3-devel # Last appeared in OpenSUSE 10.3: Provides: avahi-devel:%{_libdir}/libavahi-qt3.so @@ -620,8 +640,8 @@ correct mDNS reflection across LAN segments. %package -n libavahi-qt4-devel Summary: Include Files and Libraries Mandatory for Development -Requires: libavahi-devel = %{version} libavahi-qt4-1 = %{version} libqt4-devel Group: Development/Libraries/C and C++ +Requires: libavahi-devel = %{version} libavahi-qt4-1 = %{version} libqt4-devel # Last appeared in OpenSUSE 10.3: Provides: avahi-devel:%{_libdir}/libavahi-qt4.so @@ -646,8 +666,8 @@ correct mDNS reflection across LAN segments. %package -n avahi-mono Summary: Mono Bindings for avahi, the D-BUS Service for Zeroconf and Bonjour -Requires: gtk-sharp2 libavahi-client3 >= %{version} libavahi-common3 >= %{version} libavahi-ui0 >= %{version} libavahi-glib1 >= %{version} Group: Development/Languages/Mono +Requires: gtk-sharp2 libavahi-client3 >= %{version} libavahi-common3 >= %{version} libavahi-ui0 >= %{version} libavahi-glib1 >= %{version} %description -n avahi-mono This package provides Mono bindings for avahi. Avahi is an diff --git a/avahi.changes b/avahi.changes index 4701f11..3665a89 100644 --- a/avahi.changes +++ b/avahi.changes @@ -7,7 +7,9 @@ Thu Dec 8 17:16:31 UTC 2011 - dimstar@opensuse.org ------------------------------------------------------------------- Wed Dec 7 10:52:27 UTC 2011 - dimstar@opensuse.org -- Split the typelib files in typelib-1_0-Avahi-0_6. +- Split the typelib files in typelib-1_0-Avahi-0_6 subpackage. +- Add typelib-1_0-Avahi-0_6 Requires to libavahi-glib-devel + subpackage. ------------------------------------------------------------------- Sun Dec 4 13:40:54 UTC 2011 - dimstar@opensuse.org diff --git a/avahi.spec b/avahi.spec index db74a9c..e7000f3 100644 --- a/avahi.spec +++ b/avahi.spec @@ -15,8 +15,6 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # - - Name: avahi # WARNING: After editing this file please call Re, rpmbuild or # bash avahi_spec-prepare.sh "$PWD" avahi @@ -32,7 +30,7 @@ Name: avahi %define build_qt3 0 %define build_qt4 0 Version: 0.6.30 -Release: 5 +Release: 0 %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}) @@ -51,9 +49,9 @@ Release: 5 %define debug_package_requires libavahi-ui%{avahi_ui_soname} = %{version}-%{release} %endif Url: http://www.avahi.org/ -Group: System/Daemons -License: LGPL-2.1+ Summary: D-BUS Service for Zeroconf and Bonjour +License: LGPL-2.1+ +Group: System/Daemons Source: %{_name}-%{version}.tar.bz2 Source1: gnome-nettool2.png Source2: avahi-bookmarks.init @@ -76,9 +74,18 @@ Patch11: avahi-gtk_box_new.patch # PATCH-FIX-UPSTREAM avahi-gir-fixup.patch dimstar@opensnse.org -- Use complete shared library name in gir file for dependency Patch12: avahi-gir-fixup.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildRequires: dbus-1-python fdupes gcc-c++ gdbm-devel intltool libdaemon-devel libexpat-devel pkg-config translation-update-upstream +BuildRequires: dbus-1-python +BuildRequires: fdupes +BuildRequires: gcc-c++ +BuildRequires: gdbm-devel +BuildRequires: intltool +BuildRequires: libdaemon-devel +BuildRequires: libexpat-devel +BuildRequires: pkg-config +BuildRequires: translation-update-upstream # Even if we are not building python bindings, we need python to build service types database: -BuildRequires: python-devel python-gdbm +BuildRequires: python-devel +BuildRequires: python-gdbm # libtool is needed to build all variants: bootstrap is unconditional in the build section BuildRequires: libtool %if %suse_version <= 1110 @@ -94,7 +101,11 @@ PreReq: sysconfig %endif %{?systemd_requires} Recommends: %{_name}-lang -BuildRequires: dbus-1-devel doxygen graphviz python-gdbm zlib-devel +BuildRequires: dbus-1-devel +BuildRequires: doxygen +BuildRequires: graphviz +BuildRequires: python-gdbm +BuildRequires: zlib-devel %if %suse_version >= 1210 BuildRequires: systemd %endif @@ -112,7 +123,11 @@ Provides: mDNSResponder = 107.5 Obsoletes: mDNSResponder < 107.5 %endif %if %build_glib2 -BuildRequires: gobject-introspection-devel gtk2-devel gtk3-devel python-gtk-devel update-desktop-files +BuildRequires: gobject-introspection-devel +BuildRequires: gtk2-devel +BuildRequires: gtk3-devel +BuildRequires: python-gtk-devel +BuildRequires: update-desktop-files BuildRequires: libavahi-devel %endif %if %build_qt3 @@ -124,7 +139,10 @@ BuildRequires: libqt4-devel BuildRequires: libavahi-devel %endif %if %build_mono -BuildRequires: gtk-sharp2 libavahi-glib-devel mono-devel monodoc-core +BuildRequires: gtk-sharp2 +BuildRequires: libavahi-glib-devel +BuildRequires: mono-devel +BuildRequires: monodoc-core # Please copy this line to avahi-mono definition below for build all-in-once: Requires: gtk-sharp2 libavahi-client3 >= %{version} libavahi-common3 >= %{version} libavahi-ui0 >= %{version} libavahi-glib1 >= %{version} %endif @@ -256,9 +274,9 @@ correct mDNS reflection across LAN segments. %package -n python-avahi Summary: A set of Avahi utilities written in Python +Group: Development/Languages/Python PreReq: coreutils Requires: %{name} = %{version} python-gdbm dbus-1-python python-twisted python-twisted-web -Group: Development/Languages/Python # Old name used for <= 10.3: Provides: avahi-python = %{version} Obsoletes: avahi-python < %{version} @@ -279,8 +297,8 @@ elsewhere, like correct mDNS reflection across LAN segments. %package utils Summary: Command Line Utilities for D-BUS Service for Zeroconf and Bonjour -Requires: %{_name} >= %{version} Group: Productivity/Networking/Other +Requires: %{_name} >= %{version} %description utils Avahi is an implementation of the DNS Service Discovery and Multicast @@ -297,9 +315,9 @@ across LAN segments. %package -n libavahi-devel Summary: Include Files and Libraries Mandatory for Development +Group: Development/Libraries/C and C++ # Requires: %{_name} = %{version} libavahi-common3 = %{version} libavahi-core7 = %{version} libavahi-client3 = %{version} dbus-1-devel glibc-devel -Group: Development/Libraries/C and C++ # Last appeared in OpenSUSE 10.3: Provides: avahi-devel = %{version} Obsoletes: avahi-devel < %{version} @@ -319,8 +337,8 @@ correct mDNS reflection across LAN segments. %package compat-mDNSResponder-devel Summary: mDNSResponder Compatibility Package for D-BUS Service for Zeroconf/Bonjour -Requires: libavahi-devel = %{version} libdns_sd = %{version} Group: Development/Libraries/C and C++ +Requires: libavahi-devel = %{version} libdns_sd = %{version} Provides: mDNSResponder-devel = 107.5 Obsoletes: mDNSResponder-devel < 107.5 @@ -341,8 +359,8 @@ correct mDNS reflection across LAN segments. %package compat-howl-devel Summary: Howl Compatibility Package for D-BUS Service for Zeroconf/Bonjour -Requires: libavahi-devel = %{version} libhowl0 = %{version} Group: Development/Libraries/C and C++ +Requires: libavahi-devel = %{version} libhowl0 = %{version} %description compat-howl-devel Howl compatibility layer for avahi. @@ -436,7 +454,7 @@ addition, it supports some nifty things, like correct mDNS reflection across LAN segments. %package -n typelib-1_0-Avahi-0_6 -Summary: D-BUS Service for Zeroconf and Bonjour +Summary: D-BUS Service for Zeroconf and Bonjour -- Introspection bindings Group: System/Libraries %description -n typelib-1_0-Avahi-0_6 @@ -452,10 +470,12 @@ It passes all tests in the Apple Bonjour conformance test suite. In addition, it supports some nifty things, like correct mDNS reflection across LAN segments. +This package provides the GObject Introspection bindings for Avahi. + %package -n avahi-utils-gtk Summary: GTK+ Utilities for D-BUS Service for Zeroconf and Bonjour -Requires: %{_name} >= %{version} Group: Productivity/Networking/Other +Requires: %{_name} >= %{version} # Due to a mistake in the spec file build staging, this package had # name avahi-glib2-utils-gtk in 11.1 and SLE11 and avahi-utils-gtk in # all other products. @@ -477,9 +497,9 @@ across LAN segments. %package -n python-avahi-gtk Summary: A set of Avahi utilities written in Python Using python-gtk +Group: Development/Languages/Python PreReq: coreutils Requires: python-avahi = %{version} python-gtk -Group: Development/Languages/Python # Old name used for <= 10.3: Provides: avahi-python = %{version} Obsoletes: avahi-python < %{version} @@ -502,12 +522,12 @@ elsewhere, like correct mDNS reflection across LAN segments. %package -n libavahi-glib-devel Summary: Include Files and Libraries Mandatory for Development +Group: Development/Libraries/C and C++ Requires: libavahi-devel = %{version} Requires: libavahi-glib1 = %{version} Requires: libavahi-ui0 = %{version} Requires: libavahi-ui-gtk3-%{avahi_gtk3_soname} = %{version} Requires: typelib-1_0-Avahi-0_6 = %{version} -Group: Development/Libraries/C and C++ # Last appeared in OpenSUSE 10.3: Provides: avahi-devel:%{_libdir}/libavahi-glib.so @@ -528,8 +548,8 @@ correct mDNS reflection across LAN segments. %package -n libavahi-gobject-devel Summary: D-BUS Service for Zeroconf and Bonjour -Requires: libavahi-devel = %{version} libavahi-glib-devel libavahi-gobject0 = %{version} glib2-devel Group: System/Daemons +Requires: libavahi-devel = %{version} libavahi-glib-devel libavahi-gobject0 = %{version} glib2-devel %description -n libavahi-gobject-devel Avahi is an implementation of the DNS Service Discovery and Multicast @@ -573,8 +593,8 @@ correct mDNS reflection across LAN segments. %package -n libavahi-qt3-devel Summary: Include Files and Libraries Mandatory for Development -Requires: libavahi-devel = %{version} libavahi-qt3-1 = %{version} qt3-devel Group: Development/Libraries/C and C++ +Requires: libavahi-devel = %{version} libavahi-qt3-1 = %{version} qt3-devel # Last appeared in OpenSUSE 10.3: Provides: avahi-devel:%{_libdir}/libavahi-qt3.so @@ -620,8 +640,8 @@ correct mDNS reflection across LAN segments. %package -n libavahi-qt4-devel Summary: Include Files and Libraries Mandatory for Development -Requires: libavahi-devel = %{version} libavahi-qt4-1 = %{version} libqt4-devel Group: Development/Libraries/C and C++ +Requires: libavahi-devel = %{version} libavahi-qt4-1 = %{version} libqt4-devel # Last appeared in OpenSUSE 10.3: Provides: avahi-devel:%{_libdir}/libavahi-qt4.so @@ -646,8 +666,8 @@ correct mDNS reflection across LAN segments. %package -n avahi-mono Summary: Mono Bindings for avahi, the D-BUS Service for Zeroconf and Bonjour -Requires: gtk-sharp2 libavahi-client3 >= %{version} libavahi-common3 >= %{version} libavahi-ui0 >= %{version} libavahi-glib1 >= %{version} Group: Development/Languages/Mono +Requires: gtk-sharp2 libavahi-client3 >= %{version} libavahi-common3 >= %{version} libavahi-ui0 >= %{version} libavahi-glib1 >= %{version} %description -n avahi-mono This package provides Mono bindings for avahi. Avahi is an