From f553227a24a2c5db46dbdb12febd76bc543b20ebc20bccde508e898940b6430f Mon Sep 17 00:00:00 2001 From: Vincent Untz Date: Wed, 21 Dec 2011 04:14:17 +0000 Subject: [PATCH] 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