From 5048b27b4cacd786950f1c0ba13f07f521482c2770087b07517c53f76a956e84 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Sun, 4 Dec 2011 13:43:57 +0000 Subject: [PATCH] Accepting request 95322 from home:dimstar:branches:GNOME:Factory Move libtool BR out of cond block / Change license tag OBS-URL: https://build.opensuse.org/request/show/95322 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/avahi?expand=0&rev=74 --- avahi-glib2.spec | 45 ++++-------------------- avahi-mono.spec | 89 +++++++++++++++++++++++++++--------------------- avahi-qt4.spec | 45 ++++-------------------- avahi.changes | 8 +++++ avahi.spec | 37 ++------------------ 5 files changed, 76 insertions(+), 148 deletions(-) diff --git a/avahi-glib2.spec b/avahi-glib2.spec index 2cd8d19..411fd24 100644 --- a/avahi-glib2.spec +++ b/avahi-glib2.spec @@ -49,7 +49,7 @@ Release: 5 %endif Url: http://www.avahi.org/ Group: System/Daemons -License: LGPLv2.1+ +License: LGPL-2.1+ Summary: D-BUS Service for Zeroconf and Bonjour Source: %{_name}-%{version}.tar.bz2 Source1: gnome-nettool2.png @@ -74,6 +74,8 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: dbus-1-python fdupes gcc-c++ gdbm-devel intltool libdaemon-devel libexpat-devel pkg-config translation-update-upstream # Even if we are not building python bindings, we need python to build service types database: BuildRequires: python-devel python-gdbm +# libtool is needed to build all variants: bootstrap is unconditional in the build section +BuildRequires: libtool %if %suse_version <= 1110 %define python_sitelib %{py_sitedir} %endif @@ -88,7 +90,6 @@ PreReq: sysconfig %{?systemd_requires} Recommends: %{_name}-lang BuildRequires: dbus-1-devel doxygen graphviz python-gdbm zlib-devel -BuildRequires: libtool %if %suse_version >= 1210 BuildRequires: systemd %endif @@ -139,7 +140,6 @@ across LAN segments. %if %build_core %package -n libavahi-client3 -License: LGPLv2.1+ Summary: D-BUS Service for Zeroconf and Bonjour Group: System/Libraries @@ -157,7 +157,6 @@ addition, it supports some nifty things, like correct mDNS reflection across LAN segments. %package -n libavahi-common3 -License: LGPLv2.1+ Summary: D-BUS Service for Zeroconf and Bonjour Group: System/Libraries @@ -175,7 +174,6 @@ addition, it supports some nifty things, like correct mDNS reflection across LAN segments. %package -n libavahi-core7 -License: LGPLv2.1+ Summary: D-BUS Service for Zeroconf and Bonjour Group: System/Libraries @@ -193,7 +191,6 @@ addition, it supports some nifty things, like correct mDNS reflection across LAN segments. %package -n libdns_sd -License: LGPLv2.1+ Summary: mDNSResponder Compatibility Package for D-BUS Service for Zeroconf/Bonjour Group: System/Libraries # mDNSResponder-lib used unversioned soname. @@ -231,7 +228,6 @@ supports some nifty things that have never been seen elsewhere like correct mDNS reflection across LAN segments. %package -n libhowl0 -License: LGPLv2.1+ Summary: Howl Compatibility Package for D-BUS Service for Zeroconf/Bonjour Group: System/Libraries # Old name used for <= 10.3: @@ -254,7 +250,6 @@ supports some nifty things that have never been seen elsewhere like correct mDNS reflection across LAN segments. %package -n python-avahi -License: LGPLv2.1+ Summary: A set of Avahi utilities written in Python PreReq: coreutils Requires: %{name} = %{version} python-gdbm dbus-1-python python-twisted python-twisted-web @@ -278,7 +273,6 @@ addition, it supports some nifty things that have never been seen elsewhere, like correct mDNS reflection across LAN segments. %package utils -License: LGPLv2.1+ Summary: Command Line Utilities for D-BUS Service for Zeroconf and Bonjour Requires: %{_name} >= %{version} Group: Productivity/Networking/Other @@ -297,7 +291,6 @@ addition, it supports some nifty things, like correct mDNS reflection across LAN segments. %package -n libavahi-devel -License: LGPLv2.1+ Summary: Include Files and Libraries Mandatory for Development # Requires: %{_name} = %{version} libavahi-common3 = %{version} libavahi-core7 = %{version} libavahi-client3 = %{version} dbus-1-devel glibc-devel @@ -320,7 +313,6 @@ supports some nifty things that have never been seen elsewhere like correct mDNS reflection across LAN segments. %package compat-mDNSResponder-devel -License: LGPLv2.1+ Summary: mDNSResponder Compatibility Package for D-BUS Service for Zeroconf/Bonjour Requires: libavahi-devel = %{version} libdns_sd = %{version} Group: Development/Libraries/C and C++ @@ -343,7 +335,6 @@ supports some nifty things that have never been seen elsewhere like correct mDNS reflection across LAN segments. %package compat-howl-devel -License: LGPLv2.1+ Summary: Howl Compatibility Package for D-BUS Service for Zeroconf/Bonjour Requires: libavahi-devel = %{version} libhowl0 = %{version} Group: Development/Libraries/C and C++ @@ -367,8 +358,6 @@ correct mDNS reflection across LAN segments. %if %build_glib2 %package -n libavahi-ui0 - -License: LGPLv2.1+ Summary: D-BUS Service for Zeroconf and Bonjour Group: System/Libraries @@ -386,8 +375,6 @@ addition, it supports some nifty things, like correct mDNS reflection across LAN segments. %package -n libavahi-ui-gtk3-%{avahi_gtk3_soname} - -License: LGPLv2.1+ Summary: D-BUS Service for Zeroconf and Bonjour Group: System/Libraries @@ -405,8 +392,6 @@ addition, it supports some nifty things, like correct mDNS reflection across LAN segments. %package -n libavahi-glib1 - -License: LGPLv2.1+ Summary: Glib Bindings for avahi, the D-BUS Service for Zeroconf and Bonjour Group: System/GUI/GNOME # Old name used for <= 10.3: @@ -429,8 +414,6 @@ supports some nifty things that have never been seen elsewhere like correct mDNS reflection across LAN segments. %package -n libavahi-gobject0 - -License: LGPLv2.1+ Summary: D-BUS Service for Zeroconf and Bonjour Group: System/Daemons @@ -448,8 +431,6 @@ addition, it supports some nifty things, like correct mDNS reflection across LAN segments. %package -n avahi-utils-gtk - -License: LGPLv2.1+ Summary: GTK+ Utilities for D-BUS Service for Zeroconf and Bonjour Requires: %{_name} >= %{version} Group: Productivity/Networking/Other @@ -473,8 +454,6 @@ addition, it supports some nifty things, like correct mDNS reflection across LAN segments. %package -n python-avahi-gtk - -License: LGPLv2.1+ Summary: A set of Avahi utilities written in Python Using python-gtk PreReq: coreutils Requires: python-avahi = %{version} python-gtk @@ -500,8 +479,6 @@ addition, it supports some nifty things that have never been seen elsewhere, like correct mDNS reflection across LAN segments. %package -n libavahi-glib-devel - -License: LGPLv2.1+ Summary: Include Files and Libraries Mandatory for Development Requires: libavahi-devel = %{version} Requires: libavahi-glib1 = %{version} @@ -527,8 +504,6 @@ supports some nifty things that have never been seen elsewhere like correct mDNS reflection across LAN segments. %package -n libavahi-gobject-devel - -License: LGPLv2.1+ Summary: D-BUS Service for Zeroconf and Bonjour Requires: libavahi-devel = %{version} libavahi-glib-devel libavahi-gobject0 = %{version} glib2-devel Group: System/Daemons @@ -599,8 +574,6 @@ correct mDNS reflection across LAN segments. %if %build_qt4 %package -n libavahi-qt4-1 - -License: LGPLv2.1+ Summary: Qt4 Bindings for avahi, the D-BUS Service for Zeroconf and Bonjour Group: System/GUI/KDE # Old name used for <= 10.3: @@ -623,8 +596,6 @@ supports some nifty things that have never been seen elsewhere like correct mDNS reflection across LAN segments. %package -n libavahi-qt4-devel - -License: LGPLv2.1+ Summary: Include Files and Libraries Mandatory for Development Requires: libavahi-devel = %{version} libavahi-qt4-1 = %{version} libqt4-devel Group: Development/Libraries/C and C++ @@ -651,8 +622,6 @@ correct mDNS reflection across LAN segments. %if %build_mono %package -n avahi-mono - -License: LGPLv2.1+ Summary: Mono Bindings for avahi, the D-BUS Service for Zeroconf and Bonjour Requires: gtk-sharp2 libavahi-client3 >= %{version} libavahi-common3 >= %{version} libavahi-ui0 >= %{version} libavahi-glib1 >= %{version} Group: Development/Languages/Mono @@ -868,7 +837,7 @@ rm $RPM_BUILD_ROOT%{_libdir}/pkgconfig/avahi-ui.pc %{_sbindir}/groupadd -r avahi 2> /dev/null || : %{_sbindir}/useradd -r -o -s /bin/false -c "User for Avahi" -d %{_localstatedir}/run/avahi-daemon -g avahi avahi 2> /dev/null || : %if %suse_version >= 1210 -%service_add_pre avahi-daemon.service avahi-dnsconfd.service +%service_add_pre avahi-dnsconfd.service avahi-daemon.service %endif %post @@ -876,14 +845,14 @@ rm $RPM_BUILD_ROOT%{_libdir}/pkgconfig/avahi-ui.pc %{fillup_and_insserv -f -y avahi-daemon} %{fillup_and_insserv -f avahi-dnsconfd} %if %suse_version >= 1210 -%service_add_post avahi-daemon.service avahi-dnsconfd.service +%service_add_post avahi-dnsconfd.service avahi-daemon.service %endif %preun %{stop_on_removal avahi-daemon} %{stop_on_removal avahi-dnsconfd} %if %suse_version >= 1210 -%service_del_preun avahi-daemon.service avahi-dnsconfd.service +%service_del_preun avahi-dnsconfd.service avahi-daemon.service %endif %postun @@ -892,7 +861,7 @@ rm $RPM_BUILD_ROOT%{_libdir}/pkgconfig/avahi-ui.pc %{restart_on_update avahi-dnsconfd} %insserv_cleanup %if %suse_version >= 1210 -%service_del_postun avahi-daemon.service avahi-dnsconfd.service +%service_del_postun avahi-dnsconfd.service avahi-daemon.service %endif %post -n libavahi-client3 -p /sbin/ldconfig diff --git a/avahi-mono.spec b/avahi-mono.spec index f605106..3aaf903 100644 --- a/avahi-mono.spec +++ b/avahi-mono.spec @@ -49,7 +49,7 @@ Release: 5 %endif Url: http://www.avahi.org/ Group: Development/Languages/Mono -License: LGPLv2.1+ +License: LGPL-2.1+ Summary: Mono Bindings for avahi, the D-BUS Service for Zeroconf and Bonjour Source: %{_name}-%{version}.tar.bz2 Source1: gnome-nettool2.png @@ -74,6 +74,8 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: dbus-1-python fdupes gcc-c++ gdbm-devel intltool libdaemon-devel libexpat-devel pkg-config translation-update-upstream # Even if we are not building python bindings, we need python to build service types database: BuildRequires: python-devel python-gdbm +# libtool is needed to build all variants: bootstrap is unconditional in the build section +BuildRequires: libtool %if %suse_version <= 1110 %define python_sitelib %{py_sitedir} %endif @@ -88,7 +90,6 @@ PreReq: sysconfig %{?systemd_requires} Recommends: %{_name}-lang BuildRequires: dbus-1-devel doxygen graphviz python-gdbm zlib-devel -BuildRequires: libtool %if %suse_version >= 1210 BuildRequires: systemd %endif @@ -146,10 +147,31 @@ SHOULDs of the mDNS and DNS-SD RFCs. It passes all tests in the Apple Bonjour conformance test suite. In addition, it supports some nifty things, like correct mDNS reflection across LAN segments. +This package provides Mono bindings for avahi. Avahi is an +implementation of the DNS Service Discovery and MulticastDNS +specifications for Zeroconf Computing. It uses D-BUS for communication +between user applications and a system daemon. The daemon is used to +coordinate application efforts in caching replies, necessary to +minimize the traffic imposed on networks. The Avahi mDNS responder is +now feature complete, implementing all MUSTs and the majority of the +SHOULDs of the mDNS and DNS-SD RFCs. It passes all tests in the Apple +Bonjour conformance test suite. In addition, it supports some nifty +things, like correct mDNS reflection across LAN segments. + +This package provides Mono bindings for avahi. Avahi is an +implementation of the DNS Service Discovery and MulticastDNS +specifications for Zeroconf Computing. It uses D-BUS for communication +between user applications and a system daemon. The daemon is used to +coordinate application efforts in caching replies, necessary to +minimize the traffic imposed on networks. The Avahi mDNS responder is +now feature complete, implementing all MUSTs and the majority of the +SHOULDs of the mDNS and DNS-SD RFCs. It passes all tests in the Apple +Bonjour conformance test suite. In addition, it supports some nifty +things, like correct mDNS reflection across LAN segments. + %if %build_core %package -n libavahi-client3 -License: LGPLv2.1+ Summary: D-BUS Service for Zeroconf and Bonjour Group: System/Libraries @@ -167,7 +189,6 @@ addition, it supports some nifty things, like correct mDNS reflection across LAN segments. %package -n libavahi-common3 -License: LGPLv2.1+ Summary: D-BUS Service for Zeroconf and Bonjour Group: System/Libraries @@ -185,7 +206,6 @@ addition, it supports some nifty things, like correct mDNS reflection across LAN segments. %package -n libavahi-core7 -License: LGPLv2.1+ Summary: D-BUS Service for Zeroconf and Bonjour Group: System/Libraries @@ -203,7 +223,6 @@ addition, it supports some nifty things, like correct mDNS reflection across LAN segments. %package -n libdns_sd -License: LGPLv2.1+ Summary: mDNSResponder Compatibility Package for D-BUS Service for Zeroconf/Bonjour Group: System/Libraries # mDNSResponder-lib used unversioned soname. @@ -241,7 +260,6 @@ supports some nifty things that have never been seen elsewhere like correct mDNS reflection across LAN segments. %package -n libhowl0 -License: LGPLv2.1+ Summary: Howl Compatibility Package for D-BUS Service for Zeroconf/Bonjour Group: System/Libraries # Old name used for <= 10.3: @@ -264,7 +282,6 @@ supports some nifty things that have never been seen elsewhere like correct mDNS reflection across LAN segments. %package -n python-avahi -License: LGPLv2.1+ Summary: A set of Avahi utilities written in Python PreReq: coreutils Requires: %{name} = %{version} python-gdbm dbus-1-python python-twisted python-twisted-web @@ -288,7 +305,6 @@ addition, it supports some nifty things that have never been seen elsewhere, like correct mDNS reflection across LAN segments. %package utils -License: LGPLv2.1+ Summary: Command Line Utilities for D-BUS Service for Zeroconf and Bonjour Requires: %{_name} >= %{version} Group: Productivity/Networking/Other @@ -307,7 +323,6 @@ addition, it supports some nifty things, like correct mDNS reflection across LAN segments. %package -n libavahi-devel -License: LGPLv2.1+ Summary: Include Files and Libraries Mandatory for Development # Requires: %{_name} = %{version} libavahi-common3 = %{version} libavahi-core7 = %{version} libavahi-client3 = %{version} dbus-1-devel glibc-devel @@ -330,7 +345,6 @@ supports some nifty things that have never been seen elsewhere like correct mDNS reflection across LAN segments. %package compat-mDNSResponder-devel -License: LGPLv2.1+ Summary: mDNSResponder Compatibility Package for D-BUS Service for Zeroconf/Bonjour Requires: libavahi-devel = %{version} libdns_sd = %{version} Group: Development/Libraries/C and C++ @@ -353,7 +367,6 @@ supports some nifty things that have never been seen elsewhere like correct mDNS reflection across LAN segments. %package compat-howl-devel -License: LGPLv2.1+ Summary: Howl Compatibility Package for D-BUS Service for Zeroconf/Bonjour Requires: libavahi-devel = %{version} libhowl0 = %{version} Group: Development/Libraries/C and C++ @@ -377,8 +390,6 @@ correct mDNS reflection across LAN segments. %if %build_glib2 %package -n libavahi-ui0 - -License: LGPLv2.1+ Summary: D-BUS Service for Zeroconf and Bonjour Group: System/Libraries @@ -396,8 +407,6 @@ addition, it supports some nifty things, like correct mDNS reflection across LAN segments. %package -n libavahi-ui-gtk3-%{avahi_gtk3_soname} - -License: LGPLv2.1+ Summary: D-BUS Service for Zeroconf and Bonjour Group: System/Libraries @@ -415,8 +424,6 @@ addition, it supports some nifty things, like correct mDNS reflection across LAN segments. %package -n libavahi-glib1 - -License: LGPLv2.1+ Summary: Glib Bindings for avahi, the D-BUS Service for Zeroconf and Bonjour Group: System/GUI/GNOME # Old name used for <= 10.3: @@ -439,8 +446,6 @@ supports some nifty things that have never been seen elsewhere like correct mDNS reflection across LAN segments. %package -n libavahi-gobject0 - -License: LGPLv2.1+ Summary: D-BUS Service for Zeroconf and Bonjour Group: System/Daemons @@ -458,8 +463,6 @@ addition, it supports some nifty things, like correct mDNS reflection across LAN segments. %package -n avahi-utils-gtk - -License: LGPLv2.1+ Summary: GTK+ Utilities for D-BUS Service for Zeroconf and Bonjour Requires: %{_name} >= %{version} Group: Productivity/Networking/Other @@ -483,8 +486,6 @@ addition, it supports some nifty things, like correct mDNS reflection across LAN segments. %package -n python-avahi-gtk - -License: LGPLv2.1+ Summary: A set of Avahi utilities written in Python Using python-gtk PreReq: coreutils Requires: python-avahi = %{version} python-gtk @@ -510,8 +511,6 @@ addition, it supports some nifty things that have never been seen elsewhere, like correct mDNS reflection across LAN segments. %package -n libavahi-glib-devel - -License: LGPLv2.1+ Summary: Include Files and Libraries Mandatory for Development Requires: libavahi-devel = %{version} Requires: libavahi-glib1 = %{version} @@ -537,8 +536,6 @@ supports some nifty things that have never been seen elsewhere like correct mDNS reflection across LAN segments. %package -n libavahi-gobject-devel - -License: LGPLv2.1+ Summary: D-BUS Service for Zeroconf and Bonjour Requires: libavahi-devel = %{version} libavahi-glib-devel libavahi-gobject0 = %{version} glib2-devel Group: System/Daemons @@ -609,8 +606,6 @@ correct mDNS reflection across LAN segments. %if %build_qt4 %package -n libavahi-qt4-1 - -License: LGPLv2.1+ Summary: Qt4 Bindings for avahi, the D-BUS Service for Zeroconf and Bonjour Group: System/GUI/KDE # Old name used for <= 10.3: @@ -633,8 +628,6 @@ supports some nifty things that have never been seen elsewhere like correct mDNS reflection across LAN segments. %package -n libavahi-qt4-devel - -License: LGPLv2.1+ Summary: Include Files and Libraries Mandatory for Development Requires: libavahi-devel = %{version} libavahi-qt4-1 = %{version} libqt4-devel Group: Development/Libraries/C and C++ @@ -661,8 +654,6 @@ correct mDNS reflection across LAN segments. %if %build_mono %package -n avahi-mono - -License: LGPLv2.1+ Summary: Mono Bindings for avahi, the D-BUS Service for Zeroconf and Bonjour Requires: gtk-sharp2 libavahi-client3 >= %{version} libavahi-common3 >= %{version} libavahi-ui0 >= %{version} libavahi-glib1 >= %{version} Group: Development/Languages/Mono @@ -690,6 +681,28 @@ SHOULDs of the mDNS and DNS-SD RFCs. It passes all tests in the Apple Bonjour conformance test suite. In addition, it supports some nifty things, like correct mDNS reflection across LAN segments. +This package provides Mono bindings for avahi. Avahi is an +implementation of the DNS Service Discovery and MulticastDNS +specifications for Zeroconf Computing. It uses D-BUS for communication +between user applications and a system daemon. The daemon is used to +coordinate application efforts in caching replies, necessary to +minimize the traffic imposed on networks. The Avahi mDNS responder is +now feature complete, implementing all MUSTs and the majority of the +SHOULDs of the mDNS and DNS-SD RFCs. It passes all tests in the Apple +Bonjour conformance test suite. In addition, it supports some nifty +things, like correct mDNS reflection across LAN segments. + +This package provides Mono bindings for avahi. Avahi is an +implementation of the DNS Service Discovery and MulticastDNS +specifications for Zeroconf Computing. It uses D-BUS for communication +between user applications and a system daemon. The daemon is used to +coordinate application efforts in caching replies, necessary to +minimize the traffic imposed on networks. The Avahi mDNS responder is +now feature complete, implementing all MUSTs and the majority of the +SHOULDs of the mDNS and DNS-SD RFCs. It passes all tests in the Apple +Bonjour conformance test suite. In addition, it supports some nifty +things, like correct mDNS reflection across LAN segments. + %endif %lang_package %endif @@ -889,7 +902,7 @@ rm $RPM_BUILD_ROOT%{_libdir}/pkgconfig/avahi-ui.pc %{_sbindir}/groupadd -r avahi 2> /dev/null || : %{_sbindir}/useradd -r -o -s /bin/false -c "User for Avahi" -d %{_localstatedir}/run/avahi-daemon -g avahi avahi 2> /dev/null || : %if %suse_version >= 1210 -%service_add_pre avahi-daemon.service avahi-dnsconfd.service +%service_add_pre avahi-dnsconfd.service avahi-daemon.service %endif %post @@ -897,14 +910,14 @@ rm $RPM_BUILD_ROOT%{_libdir}/pkgconfig/avahi-ui.pc %{fillup_and_insserv -f -y avahi-daemon} %{fillup_and_insserv -f avahi-dnsconfd} %if %suse_version >= 1210 -%service_add_post avahi-daemon.service avahi-dnsconfd.service +%service_add_post avahi-dnsconfd.service avahi-daemon.service %endif %preun %{stop_on_removal avahi-daemon} %{stop_on_removal avahi-dnsconfd} %if %suse_version >= 1210 -%service_del_preun avahi-daemon.service avahi-dnsconfd.service +%service_del_preun avahi-dnsconfd.service avahi-daemon.service %endif %postun @@ -913,7 +926,7 @@ rm $RPM_BUILD_ROOT%{_libdir}/pkgconfig/avahi-ui.pc %{restart_on_update avahi-dnsconfd} %insserv_cleanup %if %suse_version >= 1210 -%service_del_postun avahi-daemon.service avahi-dnsconfd.service +%service_del_postun avahi-dnsconfd.service avahi-daemon.service %endif %post -n libavahi-client3 -p /sbin/ldconfig diff --git a/avahi-qt4.spec b/avahi-qt4.spec index 982f06b..988ad59 100644 --- a/avahi-qt4.spec +++ b/avahi-qt4.spec @@ -49,7 +49,7 @@ Release: 5 %endif Url: http://www.avahi.org/ Group: System/GUI/KDE -License: LGPLv2.1+ +License: LGPL-2.1+ Summary: Qt4 Bindings for avahi, the D-BUS Service for Zeroconf and Bonjour Source: %{_name}-%{version}.tar.bz2 Source1: gnome-nettool2.png @@ -74,6 +74,8 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: dbus-1-python fdupes gcc-c++ gdbm-devel intltool libdaemon-devel libexpat-devel pkg-config translation-update-upstream # Even if we are not building python bindings, we need python to build service types database: BuildRequires: python-devel python-gdbm +# libtool is needed to build all variants: bootstrap is unconditional in the build section +BuildRequires: libtool %if %suse_version <= 1110 %define python_sitelib %{py_sitedir} %endif @@ -88,7 +90,6 @@ PreReq: sysconfig %{?systemd_requires} Recommends: %{_name}-lang BuildRequires: dbus-1-devel doxygen graphviz python-gdbm zlib-devel -BuildRequires: libtool %if %suse_version >= 1210 BuildRequires: systemd %endif @@ -141,7 +142,6 @@ correct mDNS reflection accross LAN segments. %if %build_core %package -n libavahi-client3 -License: LGPLv2.1+ Summary: D-BUS Service for Zeroconf and Bonjour Group: System/Libraries @@ -159,7 +159,6 @@ addition, it supports some nifty things, like correct mDNS reflection across LAN segments. %package -n libavahi-common3 -License: LGPLv2.1+ Summary: D-BUS Service for Zeroconf and Bonjour Group: System/Libraries @@ -177,7 +176,6 @@ addition, it supports some nifty things, like correct mDNS reflection across LAN segments. %package -n libavahi-core7 -License: LGPLv2.1+ Summary: D-BUS Service for Zeroconf and Bonjour Group: System/Libraries @@ -195,7 +193,6 @@ addition, it supports some nifty things, like correct mDNS reflection across LAN segments. %package -n libdns_sd -License: LGPLv2.1+ Summary: mDNSResponder Compatibility Package for D-BUS Service for Zeroconf/Bonjour Group: System/Libraries # mDNSResponder-lib used unversioned soname. @@ -233,7 +230,6 @@ supports some nifty things that have never been seen elsewhere like correct mDNS reflection across LAN segments. %package -n libhowl0 -License: LGPLv2.1+ Summary: Howl Compatibility Package for D-BUS Service for Zeroconf/Bonjour Group: System/Libraries # Old name used for <= 10.3: @@ -256,7 +252,6 @@ supports some nifty things that have never been seen elsewhere like correct mDNS reflection across LAN segments. %package -n python-avahi -License: LGPLv2.1+ Summary: A set of Avahi utilities written in Python PreReq: coreutils Requires: %{name} = %{version} python-gdbm dbus-1-python python-twisted python-twisted-web @@ -280,7 +275,6 @@ addition, it supports some nifty things that have never been seen elsewhere, like correct mDNS reflection across LAN segments. %package utils -License: LGPLv2.1+ Summary: Command Line Utilities for D-BUS Service for Zeroconf and Bonjour Requires: %{_name} >= %{version} Group: Productivity/Networking/Other @@ -299,7 +293,6 @@ addition, it supports some nifty things, like correct mDNS reflection across LAN segments. %package -n libavahi-devel -License: LGPLv2.1+ Summary: Include Files and Libraries Mandatory for Development # Requires: %{_name} = %{version} libavahi-common3 = %{version} libavahi-core7 = %{version} libavahi-client3 = %{version} dbus-1-devel glibc-devel @@ -322,7 +315,6 @@ supports some nifty things that have never been seen elsewhere like correct mDNS reflection across LAN segments. %package compat-mDNSResponder-devel -License: LGPLv2.1+ Summary: mDNSResponder Compatibility Package for D-BUS Service for Zeroconf/Bonjour Requires: libavahi-devel = %{version} libdns_sd = %{version} Group: Development/Libraries/C and C++ @@ -345,7 +337,6 @@ supports some nifty things that have never been seen elsewhere like correct mDNS reflection across LAN segments. %package compat-howl-devel -License: LGPLv2.1+ Summary: Howl Compatibility Package for D-BUS Service for Zeroconf/Bonjour Requires: libavahi-devel = %{version} libhowl0 = %{version} Group: Development/Libraries/C and C++ @@ -369,8 +360,6 @@ correct mDNS reflection across LAN segments. %if %build_glib2 %package -n libavahi-ui0 - -License: LGPLv2.1+ Summary: D-BUS Service for Zeroconf and Bonjour Group: System/Libraries @@ -388,8 +377,6 @@ addition, it supports some nifty things, like correct mDNS reflection across LAN segments. %package -n libavahi-ui-gtk3-%{avahi_gtk3_soname} - -License: LGPLv2.1+ Summary: D-BUS Service for Zeroconf and Bonjour Group: System/Libraries @@ -407,8 +394,6 @@ addition, it supports some nifty things, like correct mDNS reflection across LAN segments. %package -n libavahi-glib1 - -License: LGPLv2.1+ Summary: Glib Bindings for avahi, the D-BUS Service for Zeroconf and Bonjour Group: System/GUI/GNOME # Old name used for <= 10.3: @@ -431,8 +416,6 @@ supports some nifty things that have never been seen elsewhere like correct mDNS reflection across LAN segments. %package -n libavahi-gobject0 - -License: LGPLv2.1+ Summary: D-BUS Service for Zeroconf and Bonjour Group: System/Daemons @@ -450,8 +433,6 @@ addition, it supports some nifty things, like correct mDNS reflection across LAN segments. %package -n avahi-utils-gtk - -License: LGPLv2.1+ Summary: GTK+ Utilities for D-BUS Service for Zeroconf and Bonjour Requires: %{_name} >= %{version} Group: Productivity/Networking/Other @@ -475,8 +456,6 @@ addition, it supports some nifty things, like correct mDNS reflection across LAN segments. %package -n python-avahi-gtk - -License: LGPLv2.1+ Summary: A set of Avahi utilities written in Python Using python-gtk PreReq: coreutils Requires: python-avahi = %{version} python-gtk @@ -502,8 +481,6 @@ addition, it supports some nifty things that have never been seen elsewhere, like correct mDNS reflection across LAN segments. %package -n libavahi-glib-devel - -License: LGPLv2.1+ Summary: Include Files and Libraries Mandatory for Development Requires: libavahi-devel = %{version} Requires: libavahi-glib1 = %{version} @@ -529,8 +506,6 @@ supports some nifty things that have never been seen elsewhere like correct mDNS reflection across LAN segments. %package -n libavahi-gobject-devel - -License: LGPLv2.1+ Summary: D-BUS Service for Zeroconf and Bonjour Requires: libavahi-devel = %{version} libavahi-glib-devel libavahi-gobject0 = %{version} glib2-devel Group: System/Daemons @@ -601,8 +576,6 @@ correct mDNS reflection across LAN segments. %if %build_qt4 %package -n libavahi-qt4-1 - -License: LGPLv2.1+ Summary: Qt4 Bindings for avahi, the D-BUS Service for Zeroconf and Bonjour Group: System/GUI/KDE # Old name used for <= 10.3: @@ -625,8 +598,6 @@ supports some nifty things that have never been seen elsewhere like correct mDNS reflection across LAN segments. %package -n libavahi-qt4-devel - -License: LGPLv2.1+ Summary: Include Files and Libraries Mandatory for Development Requires: libavahi-devel = %{version} libavahi-qt4-1 = %{version} libqt4-devel Group: Development/Libraries/C and C++ @@ -653,8 +624,6 @@ correct mDNS reflection across LAN segments. %if %build_mono %package -n avahi-mono - -License: LGPLv2.1+ Summary: Mono Bindings for avahi, the D-BUS Service for Zeroconf and Bonjour Requires: gtk-sharp2 libavahi-client3 >= %{version} libavahi-common3 >= %{version} libavahi-ui0 >= %{version} libavahi-glib1 >= %{version} Group: Development/Languages/Mono @@ -870,7 +839,7 @@ rm $RPM_BUILD_ROOT%{_libdir}/pkgconfig/avahi-ui.pc %{_sbindir}/groupadd -r avahi 2> /dev/null || : %{_sbindir}/useradd -r -o -s /bin/false -c "User for Avahi" -d %{_localstatedir}/run/avahi-daemon -g avahi avahi 2> /dev/null || : %if %suse_version >= 1210 -%service_add_pre avahi-daemon.service avahi-dnsconfd.service +%service_add_pre avahi-dnsconfd.service avahi-daemon.service %endif %post @@ -878,14 +847,14 @@ rm $RPM_BUILD_ROOT%{_libdir}/pkgconfig/avahi-ui.pc %{fillup_and_insserv -f -y avahi-daemon} %{fillup_and_insserv -f avahi-dnsconfd} %if %suse_version >= 1210 -%service_add_post avahi-daemon.service avahi-dnsconfd.service +%service_add_post avahi-dnsconfd.service avahi-daemon.service %endif %preun %{stop_on_removal avahi-daemon} %{stop_on_removal avahi-dnsconfd} %if %suse_version >= 1210 -%service_del_preun avahi-daemon.service avahi-dnsconfd.service +%service_del_preun avahi-dnsconfd.service avahi-daemon.service %endif %postun @@ -894,7 +863,7 @@ rm $RPM_BUILD_ROOT%{_libdir}/pkgconfig/avahi-ui.pc %{restart_on_update avahi-dnsconfd} %insserv_cleanup %if %suse_version >= 1210 -%service_del_postun avahi-daemon.service avahi-dnsconfd.service +%service_del_postun avahi-dnsconfd.service avahi-daemon.service %endif %post -n libavahi-client3 -p /sbin/ldconfig diff --git a/avahi.changes b/avahi.changes index 5d2020c..ce869ad 100644 --- a/avahi.changes +++ b/avahi.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Sun Dec 4 13:40:54 UTC 2011 - dimstar@opensuse.org + +- Change libtool BuildRequires to be unconditional: it is needed to + build all submodules as well. +- Change License tag to spdx identifier (LGPL-2.1+) and remove + duplicate mentions of the License tag. + ------------------------------------------------------------------- Mon Oct 10 08:44:41 UTC 2011 - fcrozat@suse.com diff --git a/avahi.spec b/avahi.spec index ede89ba..b811723 100644 --- a/avahi.spec +++ b/avahi.spec @@ -51,7 +51,7 @@ Release: 5 %endif Url: http://www.avahi.org/ Group: System/Daemons -License: LGPLv2.1+ +License: LGPL-2.1+ Summary: D-BUS Service for Zeroconf and Bonjour Source: %{_name}-%{version}.tar.bz2 Source1: gnome-nettool2.png @@ -76,6 +76,8 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: dbus-1-python fdupes gcc-c++ gdbm-devel intltool libdaemon-devel libexpat-devel pkg-config translation-update-upstream # Even if we are not building python bindings, we need python to build service types database: BuildRequires: python-devel python-gdbm +# libtool is needed to build all variants: bootstrap is unconditional in the build section +BuildRequires: libtool %if %suse_version <= 1110 %define python_sitelib %{py_sitedir} %endif @@ -90,7 +92,6 @@ PreReq: sysconfig %{?systemd_requires} Recommends: %{_name}-lang BuildRequires: dbus-1-devel doxygen graphviz python-gdbm zlib-devel -BuildRequires: libtool %if %suse_version >= 1210 BuildRequires: systemd %endif @@ -141,7 +142,6 @@ across LAN segments. %if %build_core %package -n libavahi-client3 -License: LGPLv2.1+ Summary: D-BUS Service for Zeroconf and Bonjour Group: System/Libraries @@ -159,7 +159,6 @@ addition, it supports some nifty things, like correct mDNS reflection across LAN segments. %package -n libavahi-common3 -License: LGPLv2.1+ Summary: D-BUS Service for Zeroconf and Bonjour Group: System/Libraries @@ -177,7 +176,6 @@ addition, it supports some nifty things, like correct mDNS reflection across LAN segments. %package -n libavahi-core7 -License: LGPLv2.1+ Summary: D-BUS Service for Zeroconf and Bonjour Group: System/Libraries @@ -195,7 +193,6 @@ addition, it supports some nifty things, like correct mDNS reflection across LAN segments. %package -n libdns_sd -License: LGPLv2.1+ Summary: mDNSResponder Compatibility Package for D-BUS Service for Zeroconf/Bonjour Group: System/Libraries # mDNSResponder-lib used unversioned soname. @@ -233,7 +230,6 @@ supports some nifty things that have never been seen elsewhere like correct mDNS reflection across LAN segments. %package -n libhowl0 -License: LGPLv2.1+ Summary: Howl Compatibility Package for D-BUS Service for Zeroconf/Bonjour Group: System/Libraries # Old name used for <= 10.3: @@ -256,7 +252,6 @@ supports some nifty things that have never been seen elsewhere like correct mDNS reflection across LAN segments. %package -n python-avahi -License: LGPLv2.1+ Summary: A set of Avahi utilities written in Python PreReq: coreutils Requires: %{name} = %{version} python-gdbm dbus-1-python python-twisted python-twisted-web @@ -280,7 +275,6 @@ addition, it supports some nifty things that have never been seen elsewhere, like correct mDNS reflection across LAN segments. %package utils -License: LGPLv2.1+ Summary: Command Line Utilities for D-BUS Service for Zeroconf and Bonjour Requires: %{_name} >= %{version} Group: Productivity/Networking/Other @@ -299,7 +293,6 @@ addition, it supports some nifty things, like correct mDNS reflection across LAN segments. %package -n libavahi-devel -License: LGPLv2.1+ Summary: Include Files and Libraries Mandatory for Development # Requires: %{_name} = %{version} libavahi-common3 = %{version} libavahi-core7 = %{version} libavahi-client3 = %{version} dbus-1-devel glibc-devel @@ -322,7 +315,6 @@ supports some nifty things that have never been seen elsewhere like correct mDNS reflection across LAN segments. %package compat-mDNSResponder-devel -License: LGPLv2.1+ Summary: mDNSResponder Compatibility Package for D-BUS Service for Zeroconf/Bonjour Requires: libavahi-devel = %{version} libdns_sd = %{version} Group: Development/Libraries/C and C++ @@ -345,7 +337,6 @@ supports some nifty things that have never been seen elsewhere like correct mDNS reflection across LAN segments. %package compat-howl-devel -License: LGPLv2.1+ Summary: Howl Compatibility Package for D-BUS Service for Zeroconf/Bonjour Requires: libavahi-devel = %{version} libhowl0 = %{version} Group: Development/Libraries/C and C++ @@ -369,8 +360,6 @@ correct mDNS reflection across LAN segments. %if %build_glib2 %package -n libavahi-ui0 - -License: LGPLv2.1+ Summary: D-BUS Service for Zeroconf and Bonjour Group: System/Libraries @@ -388,8 +377,6 @@ addition, it supports some nifty things, like correct mDNS reflection across LAN segments. %package -n libavahi-ui-gtk3-%{avahi_gtk3_soname} - -License: LGPLv2.1+ Summary: D-BUS Service for Zeroconf and Bonjour Group: System/Libraries @@ -407,8 +394,6 @@ addition, it supports some nifty things, like correct mDNS reflection across LAN segments. %package -n libavahi-glib1 - -License: LGPLv2.1+ Summary: Glib Bindings for avahi, the D-BUS Service for Zeroconf and Bonjour Group: System/GUI/GNOME # Old name used for <= 10.3: @@ -431,8 +416,6 @@ supports some nifty things that have never been seen elsewhere like correct mDNS reflection across LAN segments. %package -n libavahi-gobject0 - -License: LGPLv2.1+ Summary: D-BUS Service for Zeroconf and Bonjour Group: System/Daemons @@ -450,8 +433,6 @@ addition, it supports some nifty things, like correct mDNS reflection across LAN segments. %package -n avahi-utils-gtk - -License: LGPLv2.1+ Summary: GTK+ Utilities for D-BUS Service for Zeroconf and Bonjour Requires: %{_name} >= %{version} Group: Productivity/Networking/Other @@ -475,8 +456,6 @@ addition, it supports some nifty things, like correct mDNS reflection across LAN segments. %package -n python-avahi-gtk - -License: LGPLv2.1+ Summary: A set of Avahi utilities written in Python Using python-gtk PreReq: coreutils Requires: python-avahi = %{version} python-gtk @@ -502,8 +481,6 @@ addition, it supports some nifty things that have never been seen elsewhere, like correct mDNS reflection across LAN segments. %package -n libavahi-glib-devel - -License: LGPLv2.1+ Summary: Include Files and Libraries Mandatory for Development Requires: libavahi-devel = %{version} Requires: libavahi-glib1 = %{version} @@ -529,8 +506,6 @@ supports some nifty things that have never been seen elsewhere like correct mDNS reflection across LAN segments. %package -n libavahi-gobject-devel - -License: LGPLv2.1+ Summary: D-BUS Service for Zeroconf and Bonjour Requires: libavahi-devel = %{version} libavahi-glib-devel libavahi-gobject0 = %{version} glib2-devel Group: System/Daemons @@ -601,8 +576,6 @@ correct mDNS reflection across LAN segments. %if %build_qt4 %package -n libavahi-qt4-1 - -License: LGPLv2.1+ Summary: Qt4 Bindings for avahi, the D-BUS Service for Zeroconf and Bonjour Group: System/GUI/KDE # Old name used for <= 10.3: @@ -625,8 +598,6 @@ supports some nifty things that have never been seen elsewhere like correct mDNS reflection across LAN segments. %package -n libavahi-qt4-devel - -License: LGPLv2.1+ Summary: Include Files and Libraries Mandatory for Development Requires: libavahi-devel = %{version} libavahi-qt4-1 = %{version} libqt4-devel Group: Development/Libraries/C and C++ @@ -653,8 +624,6 @@ correct mDNS reflection across LAN segments. %if %build_mono %package -n avahi-mono - -License: LGPLv2.1+ Summary: Mono Bindings for avahi, the D-BUS Service for Zeroconf and Bonjour Requires: gtk-sharp2 libavahi-client3 >= %{version} libavahi-common3 >= %{version} libavahi-ui0 >= %{version} libavahi-glib1 >= %{version} Group: Development/Languages/Mono