Hello community, here is the log from the commit of package avahi for openSUSE:Factory checked in at 2012-01-06 11:43:05 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/avahi (Old) and /work/SRC/openSUSE:Factory/.avahi.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "avahi", Maintainer is "gnome-maintainers@suse.de" Changes: -------- avahi-mono.changes: same change avahi-qt4.changes: same change --- /work/SRC/openSUSE:Factory/avahi/avahi.changes 2011-10-13 12:18:04.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.avahi.new/avahi.changes 2012-01-06 11:43:07.000000000 +0100 @@ -1,0 +2,21 @@ +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 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 + +- 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. + +------------------------------------------------------------------- New: ---- avahi-gir-fixup.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ avahi-glib2.spec ++++++ --- /var/tmp/diff_new_pack.uEt5Lm/_old 2012-01-06 11:43:08.000000000 +0100 +++ /var/tmp/diff_new_pack.uEt5Lm/_new 2012-01-06 11:43:08.000000000 +0100 @@ -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,13 +28,14 @@ %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}) %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 @@ -48,9 +47,9 @@ %define debug_package_requires libavahi-ui%{avahi_ui_soname} = %{version}-%{release} %endif Url: http://www.avahi.org/ -Group: System/Daemons -License: LGPLv2.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 @@ -70,10 +69,23 @@ 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 +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 %define python_sitelib %{py_sitedir} %endif @@ -87,8 +99,11 @@ %endif %{?systemd_requires} Recommends: %{_name}-lang -BuildRequires: dbus-1-devel doxygen graphviz python-gdbm zlib-devel -BuildRequires: libtool +BuildRequires: dbus-1-devel +BuildRequires: doxygen +BuildRequires: graphviz +BuildRequires: python-gdbm +BuildRequires: zlib-devel %if %suse_version >= 1210 BuildRequires: systemd %endif @@ -106,7 +121,11 @@ 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 @@ -118,7 +137,10 @@ 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,7 +161,6 @@ %if %build_core %package -n libavahi-client3 -License: LGPLv2.1+ Summary: D-BUS Service for Zeroconf and Bonjour Group: System/Libraries @@ -157,7 +178,6 @@ across LAN segments. %package -n libavahi-common3 -License: LGPLv2.1+ Summary: D-BUS Service for Zeroconf and Bonjour Group: System/Libraries @@ -175,7 +195,6 @@ across LAN segments. %package -n libavahi-core7 -License: LGPLv2.1+ Summary: D-BUS Service for Zeroconf and Bonjour Group: System/Libraries @@ -193,7 +212,6 @@ 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 +249,6 @@ 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,11 +271,10 @@ correct mDNS reflection across LAN segments. %package -n python-avahi -License: LGPLv2.1+ 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} @@ -278,10 +294,9 @@ 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 +Requires: %{_name} >= %{version} %description utils Avahi is an implementation of the DNS Service Discovery and Multicast @@ -297,11 +312,10 @@ across LAN segments. %package -n libavahi-devel -License: LGPLv2.1+ 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} @@ -320,10 +334,9 @@ 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++ +Requires: libavahi-devel = %{version} libdns_sd = %{version} Provides: mDNSResponder-devel = 107.5 Obsoletes: mDNSResponder-devel < 107.5 @@ -343,10 +356,9 @@ 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++ +Requires: libavahi-devel = %{version} libhowl0 = %{version} %description compat-howl-devel Howl compatibility layer for avahi. @@ -367,8 +379,6 @@ %if %build_glib2 %package -n libavahi-ui0 - -License: LGPLv2.1+ Summary: D-BUS Service for Zeroconf and Bonjour Group: System/Libraries @@ -386,8 +396,6 @@ 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 +413,6 @@ 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 +435,6 @@ correct mDNS reflection across LAN segments. %package -n libavahi-gobject0 - -License: LGPLv2.1+ Summary: D-BUS Service for Zeroconf and Bonjour Group: System/Daemons @@ -447,12 +451,29 @@ addition, it supports some nifty things, like correct mDNS reflection across LAN segments. -%package -n avahi-utils-gtk +%package -n typelib-1_0-Avahi-0_6 +Summary: D-BUS Service for Zeroconf and Bonjour -- Introspection bindings +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. + +This package provides the GObject Introspection bindings for Avahi. -License: LGPLv2.1+ +%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. @@ -473,12 +494,10 @@ across LAN segments. %package -n python-avahi-gtk - -License: LGPLv2.1+ 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,14 +519,13 @@ elsewhere, like correct mDNS reflection across LAN segments. %package -n libavahi-glib-devel - -License: LGPLv2.1+ 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} -Group: Development/Libraries/C and C++ +Requires: typelib-1_0-Avahi-0_6 = %{version} # Last appeared in OpenSUSE 10.3: Provides: avahi-devel:%{_libdir}/libavahi-glib.so @@ -527,11 +545,9 @@ 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 +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 @@ -575,8 +591,8 @@ %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 @@ -599,8 +615,6 @@ %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,11 +637,9 @@ 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++ +Requires: libavahi-devel = %{version} libavahi-qt4-1 = %{version} libqt4-devel # Last appeared in OpenSUSE 10.3: Provides: avahi-devel:%{_libdir}/libavahi-qt4.so @@ -651,11 +663,9 @@ %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 +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 @@ -681,6 +691,7 @@ %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. @@ -868,7 +879,7 @@ %{_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 +887,14 @@ %{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 +903,7 @@ %{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 @@ -1121,6 +1132,9 @@ %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 ++++++ avahi-mono.spec ++++++ --- /var/tmp/diff_new_pack.uEt5Lm/_old 2012-01-06 11:43:08.000000000 +0100 +++ /var/tmp/diff_new_pack.uEt5Lm/_new 2012-01-06 11:43:08.000000000 +0100 @@ -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,13 +28,14 @@ %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}) %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 @@ -48,9 +47,9 @@ %define debug_package_requires libavahi-ui%{avahi_ui_soname} = %{version}-%{release} %endif Url: http://www.avahi.org/ -Group: Development/Languages/Mono -License: LGPLv2.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 @@ -70,10 +69,23 @@ 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 +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 %define python_sitelib %{py_sitedir} %endif @@ -87,8 +99,11 @@ %endif %{?systemd_requires} Recommends: %{_name}-lang -BuildRequires: dbus-1-devel doxygen graphviz python-gdbm zlib-devel -BuildRequires: libtool +BuildRequires: dbus-1-devel +BuildRequires: doxygen +BuildRequires: graphviz +BuildRequires: python-gdbm +BuildRequires: zlib-devel %if %suse_version >= 1210 BuildRequires: systemd %endif @@ -106,7 +121,11 @@ 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 @@ -118,7 +137,10 @@ 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 @@ -135,21 +157,9 @@ 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 +177,6 @@ across LAN segments. %package -n libavahi-common3 -License: LGPLv2.1+ Summary: D-BUS Service for Zeroconf and Bonjour Group: System/Libraries @@ -185,7 +194,6 @@ across LAN segments. %package -n libavahi-core7 -License: LGPLv2.1+ Summary: D-BUS Service for Zeroconf and Bonjour Group: System/Libraries @@ -203,7 +211,6 @@ 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 +248,6 @@ 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,11 +270,10 @@ correct mDNS reflection across LAN segments. %package -n python-avahi -License: LGPLv2.1+ 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} @@ -288,10 +293,9 @@ 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 +Requires: %{_name} >= %{version} %description utils Avahi is an implementation of the DNS Service Discovery and Multicast @@ -307,11 +311,10 @@ across LAN segments. %package -n libavahi-devel -License: LGPLv2.1+ 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} @@ -330,10 +333,9 @@ 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++ +Requires: libavahi-devel = %{version} libdns_sd = %{version} Provides: mDNSResponder-devel = 107.5 Obsoletes: mDNSResponder-devel < 107.5 @@ -353,10 +355,9 @@ 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++ +Requires: libavahi-devel = %{version} libhowl0 = %{version} %description compat-howl-devel Howl compatibility layer for avahi. @@ -377,8 +378,6 @@ %if %build_glib2 %package -n libavahi-ui0 - -License: LGPLv2.1+ Summary: D-BUS Service for Zeroconf and Bonjour Group: System/Libraries @@ -396,8 +395,6 @@ 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 +412,6 @@ 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 +434,6 @@ correct mDNS reflection across LAN segments. %package -n libavahi-gobject0 - -License: LGPLv2.1+ Summary: D-BUS Service for Zeroconf and Bonjour Group: System/Daemons @@ -457,12 +450,29 @@ addition, it supports some nifty things, like correct mDNS reflection across LAN segments. -%package -n avahi-utils-gtk +%package -n typelib-1_0-Avahi-0_6 +Summary: D-BUS Service for Zeroconf and Bonjour -- Introspection bindings +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. -License: LGPLv2.1+ +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. @@ -483,12 +493,10 @@ across LAN segments. %package -n python-avahi-gtk - -License: LGPLv2.1+ 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,14 +518,13 @@ elsewhere, like correct mDNS reflection across LAN segments. %package -n libavahi-glib-devel - -License: LGPLv2.1+ 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} -Group: Development/Libraries/C and C++ +Requires: typelib-1_0-Avahi-0_6 = %{version} # Last appeared in OpenSUSE 10.3: Provides: avahi-devel:%{_libdir}/libavahi-glib.so @@ -537,11 +544,9 @@ 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 +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 @@ -585,8 +590,8 @@ %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 @@ -609,8 +614,6 @@ %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,11 +636,9 @@ 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++ +Requires: libavahi-devel = %{version} libavahi-qt4-1 = %{version} libqt4-devel # Last appeared in OpenSUSE 10.3: Provides: avahi-devel:%{_libdir}/libavahi-qt4.so @@ -661,11 +662,9 @@ %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 +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 @@ -679,17 +678,6 @@ 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 @@ -702,6 +690,7 @@ %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. @@ -889,7 +878,7 @@ %{_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 +886,14 @@ %{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 +902,7 @@ %{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 @@ -1142,6 +1131,9 @@ %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 ++++++ avahi-qt4.spec ++++++ --- /var/tmp/diff_new_pack.uEt5Lm/_old 2012-01-06 11:43:08.000000000 +0100 +++ /var/tmp/diff_new_pack.uEt5Lm/_new 2012-01-06 11:43:08.000000000 +0100 @@ -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,13 +28,14 @@ %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}) %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 @@ -48,9 +47,9 @@ %define debug_package_requires libavahi-ui%{avahi_ui_soname} = %{version}-%{release} %endif Url: http://www.avahi.org/ -Group: System/GUI/KDE -License: LGPLv2.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 @@ -70,10 +69,23 @@ 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 +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 %define python_sitelib %{py_sitedir} %endif @@ -87,8 +99,11 @@ %endif %{?systemd_requires} Recommends: %{_name}-lang -BuildRequires: dbus-1-devel doxygen graphviz python-gdbm zlib-devel -BuildRequires: libtool +BuildRequires: dbus-1-devel +BuildRequires: doxygen +BuildRequires: graphviz +BuildRequires: python-gdbm +BuildRequires: zlib-devel %if %suse_version >= 1210 BuildRequires: systemd %endif @@ -106,7 +121,11 @@ 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 @@ -118,7 +137,10 @@ 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 @@ -141,7 +163,6 @@ %if %build_core %package -n libavahi-client3 -License: LGPLv2.1+ Summary: D-BUS Service for Zeroconf and Bonjour Group: System/Libraries @@ -159,7 +180,6 @@ across LAN segments. %package -n libavahi-common3 -License: LGPLv2.1+ Summary: D-BUS Service for Zeroconf and Bonjour Group: System/Libraries @@ -177,7 +197,6 @@ across LAN segments. %package -n libavahi-core7 -License: LGPLv2.1+ Summary: D-BUS Service for Zeroconf and Bonjour Group: System/Libraries @@ -195,7 +214,6 @@ 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 +251,6 @@ 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,11 +273,10 @@ correct mDNS reflection across LAN segments. %package -n python-avahi -License: LGPLv2.1+ 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} @@ -280,10 +296,9 @@ 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 +Requires: %{_name} >= %{version} %description utils Avahi is an implementation of the DNS Service Discovery and Multicast @@ -299,11 +314,10 @@ across LAN segments. %package -n libavahi-devel -License: LGPLv2.1+ 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} @@ -322,10 +336,9 @@ 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++ +Requires: libavahi-devel = %{version} libdns_sd = %{version} Provides: mDNSResponder-devel = 107.5 Obsoletes: mDNSResponder-devel < 107.5 @@ -345,10 +358,9 @@ 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++ +Requires: libavahi-devel = %{version} libhowl0 = %{version} %description compat-howl-devel Howl compatibility layer for avahi. @@ -369,8 +381,6 @@ %if %build_glib2 %package -n libavahi-ui0 - -License: LGPLv2.1+ Summary: D-BUS Service for Zeroconf and Bonjour Group: System/Libraries @@ -388,8 +398,6 @@ 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 +415,6 @@ 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 +437,6 @@ correct mDNS reflection across LAN segments. %package -n libavahi-gobject0 - -License: LGPLv2.1+ Summary: D-BUS Service for Zeroconf and Bonjour Group: System/Daemons @@ -449,12 +453,29 @@ addition, it supports some nifty things, like correct mDNS reflection across LAN segments. -%package -n avahi-utils-gtk +%package -n typelib-1_0-Avahi-0_6 +Summary: D-BUS Service for Zeroconf and Bonjour -- Introspection bindings +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. + +This package provides the GObject Introspection bindings for Avahi. -License: LGPLv2.1+ +%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,12 +496,10 @@ across LAN segments. %package -n python-avahi-gtk - -License: LGPLv2.1+ 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,14 +521,13 @@ elsewhere, like correct mDNS reflection across LAN segments. %package -n libavahi-glib-devel - -License: LGPLv2.1+ 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} -Group: Development/Libraries/C and C++ +Requires: typelib-1_0-Avahi-0_6 = %{version} # Last appeared in OpenSUSE 10.3: Provides: avahi-devel:%{_libdir}/libavahi-glib.so @@ -529,11 +547,9 @@ 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 +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 @@ -577,8 +593,8 @@ %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 @@ -601,8 +617,6 @@ %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,11 +639,9 @@ 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++ +Requires: libavahi-devel = %{version} libavahi-qt4-1 = %{version} libqt4-devel # Last appeared in OpenSUSE 10.3: Provides: avahi-devel:%{_libdir}/libavahi-qt4.so @@ -653,11 +665,9 @@ %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 +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 @@ -683,6 +693,7 @@ %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. @@ -870,7 +881,7 @@ %{_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 +889,14 @@ %{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 +905,7 @@ %{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 @@ -1123,6 +1134,9 @@ %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 ++++++ avahi.spec ++++++ --- /var/tmp/diff_new_pack.uEt5Lm/_old 2012-01-06 11:43:08.000000000 +0100 +++ /var/tmp/diff_new_pack.uEt5Lm/_new 2012-01-06 11:43:08.000000000 +0100 @@ -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,13 +30,14 @@ %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}) %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 @@ -50,9 +49,9 @@ %define debug_package_requires libavahi-ui%{avahi_ui_soname} = %{version}-%{release} %endif Url: http://www.avahi.org/ -Group: System/Daemons -License: LGPLv2.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 @@ -72,10 +71,23 @@ 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 +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 %define python_sitelib %{py_sitedir} %endif @@ -89,8 +101,11 @@ %endif %{?systemd_requires} Recommends: %{_name}-lang -BuildRequires: dbus-1-devel doxygen graphviz python-gdbm zlib-devel -BuildRequires: libtool +BuildRequires: dbus-1-devel +BuildRequires: doxygen +BuildRequires: graphviz +BuildRequires: python-gdbm +BuildRequires: zlib-devel %if %suse_version >= 1210 BuildRequires: systemd %endif @@ -108,7 +123,11 @@ 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 @@ -120,7 +139,10 @@ 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 @@ -141,7 +163,6 @@ %if %build_core %package -n libavahi-client3 -License: LGPLv2.1+ Summary: D-BUS Service for Zeroconf and Bonjour Group: System/Libraries @@ -159,7 +180,6 @@ across LAN segments. %package -n libavahi-common3 -License: LGPLv2.1+ Summary: D-BUS Service for Zeroconf and Bonjour Group: System/Libraries @@ -177,7 +197,6 @@ across LAN segments. %package -n libavahi-core7 -License: LGPLv2.1+ Summary: D-BUS Service for Zeroconf and Bonjour Group: System/Libraries @@ -195,7 +214,6 @@ 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 +251,6 @@ 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,11 +273,10 @@ correct mDNS reflection across LAN segments. %package -n python-avahi -License: LGPLv2.1+ 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} @@ -280,10 +296,9 @@ 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 +Requires: %{_name} >= %{version} %description utils Avahi is an implementation of the DNS Service Discovery and Multicast @@ -299,11 +314,10 @@ across LAN segments. %package -n libavahi-devel -License: LGPLv2.1+ 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} @@ -322,10 +336,9 @@ 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++ +Requires: libavahi-devel = %{version} libdns_sd = %{version} Provides: mDNSResponder-devel = 107.5 Obsoletes: mDNSResponder-devel < 107.5 @@ -345,10 +358,9 @@ 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++ +Requires: libavahi-devel = %{version} libhowl0 = %{version} %description compat-howl-devel Howl compatibility layer for avahi. @@ -369,8 +381,6 @@ %if %build_glib2 %package -n libavahi-ui0 - -License: LGPLv2.1+ Summary: D-BUS Service for Zeroconf and Bonjour Group: System/Libraries @@ -388,8 +398,6 @@ 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 +415,6 @@ 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 +437,6 @@ correct mDNS reflection across LAN segments. %package -n libavahi-gobject0 - -License: LGPLv2.1+ Summary: D-BUS Service for Zeroconf and Bonjour Group: System/Daemons @@ -449,12 +453,29 @@ addition, it supports some nifty things, like correct mDNS reflection across LAN segments. -%package -n avahi-utils-gtk +%package -n typelib-1_0-Avahi-0_6 +Summary: D-BUS Service for Zeroconf and Bonjour -- Introspection bindings +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. + +This package provides the GObject Introspection bindings for Avahi. -License: LGPLv2.1+ +%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,12 +496,10 @@ across LAN segments. %package -n python-avahi-gtk - -License: LGPLv2.1+ 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,14 +521,13 @@ elsewhere, like correct mDNS reflection across LAN segments. %package -n libavahi-glib-devel - -License: LGPLv2.1+ 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} -Group: Development/Libraries/C and C++ +Requires: typelib-1_0-Avahi-0_6 = %{version} # Last appeared in OpenSUSE 10.3: Provides: avahi-devel:%{_libdir}/libavahi-glib.so @@ -529,11 +547,9 @@ 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 +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 @@ -577,8 +593,8 @@ %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 @@ -601,8 +617,6 @@ %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,11 +639,9 @@ 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++ +Requires: libavahi-devel = %{version} libavahi-qt4-1 = %{version} libqt4-devel # Last appeared in OpenSUSE 10.3: Provides: avahi-devel:%{_libdir}/libavahi-qt4.so @@ -653,11 +665,9 @@ %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 +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 @@ -683,6 +693,7 @@ %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. @@ -1123,6 +1134,9 @@ %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 ++++++ avahi-gir-fixup.patch ++++++ 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"> - <namespace name="AvahiCore" version="0.6" shared-library="avahi-core"> + <namespace name="AvahiCore" version="0.6" shared-library="libavahi-core.so.7"> <alias name="IfIndex" c:type="AvahiIfIndex"> <type name="gint" c:type="int"/> </alias> -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org