diff --git a/avahi-bookmarks.init b/avahi-bookmarks.init index 603fddc..6925f39 100644 --- a/avahi-bookmarks.init +++ b/avahi-bookmarks.init @@ -1,9 +1,10 @@ #! /bin/sh ### BEGIN INIT INFO # Provides: avahi-bookmarks -# Required-Start: avahi-dnsconfd +# Required-Start: $network $remote_fs avahi-dnsconfd # Default-Start: 3 5 # Default-Stop: +# Short-Description: ZeroConf Bookmarks server # Description: Avahi ZeroConf Bookmarks server ### END INIT INFO diff --git a/avahi-init-lsb.patch b/avahi-init-lsb.patch new file mode 100644 index 0000000..6fff76a --- /dev/null +++ b/avahi-init-lsb.patch @@ -0,0 +1,28 @@ +--- initscript/suse/avahi-daemon.in ++++ initscript/suse/avahi-daemon.in +@@ -1,9 +1,10 @@ + #! /bin/sh + ### BEGIN INIT INFO + # Provides: avahi +-# Required-Start: $network dbus ++# Required-Start: $network $remote_fs dbus + # Default-Start: 3 5 + # Default-Stop: ++# Short-Description: ZeroConf daemon + # Description: Avahi, a ZeroConf daemon for mDNS and service registration + ### END INIT INFO + +--- initscript/suse/avahi-dnsconfd.in ++++ initscript/suse/avahi-dnsconfd.in +@@ -1,9 +1,10 @@ + #! /bin/sh + ### BEGIN INIT INFO + # Provides: avahi-dnsconfd +-# Required-Start: avahi ++# Required-Start: $remote_fs avahi + # Default-Start: 3 5 + # Default-Stop: ++# Short-Description: ZeroConf daemon + # Description: Avahi, a ZeroConf daemon for mDNS and service registration + ### END INIT INFO + diff --git a/avahi-mono.changes b/avahi-mono.changes index 7ddf4d6..816e09d 100644 --- a/avahi-mono.changes +++ b/avahi-mono.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Oct 11 14:36:43 CEST 2007 - sbrabec@suse.de + +- Updated dependencies. + ------------------------------------------------------------------- Mon Aug 6 17:03:54 CEST 2007 - bk@suse.de diff --git a/avahi-mono.spec b/avahi-mono.spec index b451931..eb04f15 100644 --- a/avahi-mono.spec +++ b/avahi-mono.spec @@ -11,43 +11,50 @@ # norootforbuild Name: avahi-mono +%define _name avahi %define build_mono 1 -# WARNING: If you are editing avahi-mono.spec, STOP. Always edit -# avahi.spec and then run pre_checkin.sh which will create -# avahi-mono.spec based upon avahi.spec. +# WARNING: Do not edit this auto generated file. Version: 0.6.20 -Release: 39 -URL: http://www.avahi.org/ -Group: Development/Libraries/Other +Release: 57 +# WARNING: After changing versions please call Re or rpmbuild to auto-update spec file: +#%(sh %{_sourcedir}/%{name}_spec-prepare.sh %{_sourcedir} %{name}) +%define avahi_client_soname 3 +%define avahi_common_soname 3 +%define avahi_core_soname 5 +%define avahi_ui_soname 0 +%define avahi_glib_soname 1 +%define avahi_qt3_soname 1 +%define avahi_qt4_soname 1 +Url: http://www.avahi.org/ +Group: Development/Languages/Mono License: LGPL v2 or later Summary: Mono Bindings for avahi, the D-BUS Service for Zeroconf and Bonjour -Source: avahi-%{version}.tar.bz2 +Source: %{_name}-%{version}.tar.bz2 Source1: gnome-nettool2.png Source2: avahi-bookmarks.init Source3: avahi.firewall -Source4: pre_checkin.sh +Source4: %{_name}_spec-prepare.sh Patch0: avahi-gacdir.patch Patch1: avahi-desktop.patch -Autoreqprov: on +Patch2: avahi-init-lsb.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildRequires: dbus-1-devel doxygen gcc-c++ gdbm-devel graphviz libdaemon-devel libglade2-devel update-desktop-files zlib-devel -%if %build_mono -BuildRequires: gtk-sharp2 mono-devel monodoc-core -%else -BuildRequires: dbus-1-python python-devel python-gdbm qt3-devel -%if %suse_version > 1010 -BuildRequires: libqt4-devel python-gtk-devel -%else -BuildRequires: python-gtk qt-devel -%endif -%endif -%if %build_mono -Requires: avahi = %{version} gtk-sharp2 -%else +BuildRequires: dbus-1-devel doxygen fdupes gcc-c++ gdbm-devel graphviz libdaemon-devel libglade2-devel update-desktop-files zlib-devel +%if !%build_mono +# For python bindings and utilities: +BuildRequires: dbus-1-python python-devel python-gdbm python-gtk-devel +# For qt3 bindings +BuildRequires: qt3-devel +# For qt4 bindings +BuildRequires: libqt4-devel Requires: dbus-1 Requires: nss-mdns +# mDNSResponder was used for <= 10.2: Provides: mDNSResponder = 107.5 Obsoletes: mDNSResponder <= 107.5 +%else +# For mono bindings: +BuildRequires: gtk-sharp2 mono-devel monodoc-core +Requires: gtk-sharp2 libavahi-client3 >= %{version} libavahi-common3 >= %{version} libavahi-ui0 >= %{version} libavahi-glib1 >= %{version} %endif %description @@ -71,13 +78,11 @@ Authors: Sebastien Estienne %if !%build_mono -%package -n avahi-glib +%package -n libavahi-client3 Summary: Glib Bindings for avahi, the D-BUS Service for Zeroconf and Bonjour -Requires: %{name} = %{version} -Autoreqprov: on Group: Development/Libraries/Other -%description -n avahi-glib +%description -n libavahi-client3 GLib support for avahi. Avahi is an Implementation the DNS Service Discovery and Multicast DNS @@ -100,26 +105,25 @@ Authors: Trent Lloyd Sebastien Estienne -%package -n avahi-python -Summary: A set of Avahi utilities written in Python -Requires: %{name} = %{version} python-gdbm python-gtk dbus-1-python python-twisted python-twisted-web -Autoreqprov: on -Group: System/Daemons +%package -n libavahi-common3 +Summary: Glib Bindings for avahi, the D-BUS Service for Zeroconf and Bonjour +Requires: %{name} >= %{version} +Group: Development/Libraries/Other -%py_requires +%description -n libavahi-common3 +GLib support for avahi. -%description -n avahi-python -Avahi is an implementation of the DNS Service Discovery and Multicast -DNS specifications for Zeroconf Computing. It uses D-BUS for -communication between user applications and a system daemon. The daemon -is used to coordinate application efforts in caching replies, necessary -to minimize the traffic imposed on networks. +Avahi is an Implementation 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 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 that have never been seen -elsewhere, like correct mDNS reflection across LAN segments. +The Avahi mDNS responder is now feature complete implementing all MUSTs +and the majority of the SHOULDs of the mDNS/DNS-SD RFCs. It passes all +tests in the Apple Bonjour conformance test suite. In addition it +supports some nifty things that have never been seen elsewhere like +correct mDNS reflection accross LAN segments. @@ -129,13 +133,98 @@ Authors: Trent Lloyd Sebastien Estienne -%package -n avahi-qt3 -Summary: Qt3 Bindings for avahi, the D-BUS Service for Zeroconf and Bonjour -Requires: %{name} = %{version} -Autoreqprov: on +%package -n libavahi-core5 +Summary: Glib Bindings for avahi, the D-BUS Service for Zeroconf and Bonjour Group: Development/Libraries/Other -%description -n avahi-qt3 +%description -n libavahi-core5 +GLib support for avahi. + +Avahi is an Implementation 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 feature complete implementing all MUSTs +and the majority of the SHOULDs of the mDNS/DNS-SD RFCs. It passes all +tests in the Apple Bonjour conformance test suite. In addition it +supports some nifty things that have never been seen elsewhere like +correct mDNS reflection accross LAN segments. + + + +Authors: +-------- + Lennart Poettering + Trent Lloyd + Sebastien Estienne + +%package -n libavahi-ui0 +Summary: Glib Bindings for avahi, the D-BUS Service for Zeroconf and Bonjour +Group: Development/Libraries/Other + +%description -n libavahi-ui0 +GLib support for avahi. + +Avahi is an Implementation 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 feature complete implementing all MUSTs +and the majority of the SHOULDs of the mDNS/DNS-SD RFCs. It passes all +tests in the Apple Bonjour conformance test suite. In addition it +supports some nifty things that have never been seen elsewhere like +correct mDNS reflection accross LAN segments. + + + +Authors: +-------- + Lennart Poettering + Trent Lloyd + Sebastien Estienne + +%package -n libavahi-glib1 +Summary: Glib Bindings for avahi, the D-BUS Service for Zeroconf and Bonjour +Group: Development/Libraries/Other +# Old name used for <= 10.3: +Provides: avahi-glib = %{version} +Obsoletes: avahi-glib <= %{version} + +%description -n libavahi-glib1 +GLib support for avahi. + +Avahi is an Implementation 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 feature complete implementing all MUSTs +and the majority of the SHOULDs of the mDNS/DNS-SD RFCs. It passes all +tests in the Apple Bonjour conformance test suite. In addition it +supports some nifty things that have never been seen elsewhere like +correct mDNS reflection accross LAN segments. + + + +Authors: +-------- + Lennart Poettering + Trent Lloyd + Sebastien Estienne + +%package -n libavahi-qt3-1 +Summary: Qt3 Bindings for avahi, the D-BUS Service for Zeroconf and Bonjour +Group: Development/Libraries/Other +# Old name used for <= 10.3: +Provides: avahi-qt3 = %{version} +Obsoletes: avahi-qt3 <= %{version} + +%description -n libavahi-qt3-1 Qt3 bindings for avahi. Avahi is an Implementation the DNS Service Discovery and Multicast DNS @@ -158,13 +247,14 @@ Authors: Trent Lloyd Sebastien Estienne -%package -n avahi-qt4 +%package -n libavahi-qt4-1 Summary: Qt4 Bindings for avahi, the D-BUS Service for Zeroconf and Bonjour -Requires: %{name} = %{version} -Autoreqprov: on Group: Development/Libraries/Other +# Old name used for <= 10.3: +Provides: avahi-qt4 = %{version} +Obsoletes: avahi-qt4 <= %{version} -%description -n avahi-qt4 +%description -n libavahi-qt4-1 Qt4 bindings for avahi. Avahi is an Implementation the DNS Service Discovery and Multicast DNS @@ -187,20 +277,24 @@ Authors: Trent Lloyd Sebastien Estienne -%package -n avahi-compat-mDNSResponder +%package -n libdns_sd Summary: D-BUS Service for Zeroconf/Bonjour -Requires: %{name} = %{version} -Autoreqprov: on +Group: System/Daemons +# mDNSResponder-lib used unversioned soname. +# Provide full compatibility with mDNSResponder (FIXME: should be fixed in the package): %ifarch ia64 x86_64 ppc64 s390x Provides: libdns_sd.so()(64bit) %else Provides: libdns_sd.so %endif -Group: System/Daemons +# mDNSResponder-lib was used for <= 10.2: Provides: mDNSResponder-lib = 107.5 Obsoletes: mDNSResponder-lib <= 107.5 +# Old name used for <= 10.3: +Provides: avahi-compat-mDNSResponder = %{version} +Obsoletes: avahi-compat-mDNSResponder <= %{version} -%description -n avahi-compat-mDNSResponder +%description -n libdns_sd Apple mDNSResponder compatibility layer for avahi. Avahi is an Implementation the DNS Service Discovery and Multicast DNS @@ -223,16 +317,240 @@ Authors: Trent Lloyd Sebastien Estienne -%package -n avahi-compat-mDNSResponder-devel +%package -n libhowl0 Summary: D-BUS Service for Zeroconf/Bonjour -Requires: %{name} = %{version} %{name}-compat-mDNSResponder = %{version} -Requires: %{name}-devel = %{version} -Autoreqprov: on +Group: System/Daemons +# Old name used for <= 10.3: +Provides: avahi-compat-howl = %{version} +Obsoletes: avahi-compat-howl <= %{version} + +%description -n libhowl0 +howl compatibility layer for avahi. + +Avahi is an Implementation 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 feature complete implementing all MUSTs +and the majority of the SHOULDs of the mDNS/DNS-SD RFCs. It passes all +tests in the Apple Bonjour conformance test suite. In addition it +supports some nifty things that have never been seen elsewhere like +correct mDNS reflection accross LAN segments. + + + +Authors: +-------- + Lennart Poettering + Trent Lloyd + Sebastien Estienne + +%package utils +Summary: A set of Avahi utilities written in Python +Requires: %{name} >= %{version} +Group: System/Daemons + +%description utils +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 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 that have never been seen +elsewhere, like correct mDNS reflection across LAN segments. + + + +Authors: +-------- + Lennart Poettering + Trent Lloyd + Sebastien Estienne + +%package utils-gtk +Summary: A set of Avahi utilities written in Python +Requires: %{name} >= %{version} +Group: System/Daemons + +%description utils-gtk +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 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 that have never been seen +elsewhere, like correct mDNS reflection across LAN segments. + + + +Authors: +-------- + Lennart Poettering + Trent Lloyd + Sebastien Estienne + +%package -n python-avahi +Summary: A set of Avahi utilities written in Python +Requires: %{name} = %{version} python-gdbm python-gtk dbus-1-python python-twisted python-twisted-web +Group: System/Daemons +# Old name used for <= 10.3: +Provides: avahi-python = %{version} +Obsoletes: avahi-python <= %{version} +%py_requires + +%description -n python-avahi +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 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 that have never been seen +elsewhere, like correct mDNS reflection across LAN segments. + + + +Authors: +-------- + Lennart Poettering + Trent Lloyd + Sebastien Estienne + +%package -n libavahi-devel +Summary: Include Files and Libraries Mandatory for Development +# +Requires: %{name} = %{version} libavahi-common3 = %{version} libavahi-core5 = %{version} libavahi-client3 = %{version} dbus-1-devel glibc-devel +Group: Development/Libraries/Other +# Last appeared in OpenSUSE 10.3: +Provides: avahi-devel = %{version} +Obsoletes: avahi-devel <= %{version} + +%description -n libavahi-devel +Avahi is an Implementation 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 feature complete implementing all MUSTs +and the majority of the SHOULDs of the mDNS/DNS-SD RFCs. It passes all +tests in the Apple Bonjour conformance test suite. In addition it +supports some nifty things that have never been seen elsewhere like +correct mDNS reflection accross LAN segments. + + + +Authors: +-------- + Lennart Poettering + Trent Lloyd + Sebastien Estienne + +%package -n libavahi-glib-devel +Summary: Include Files and Libraries Mandatory for Development +Requires: libavahi-devel = %{version} libavahi-ui0 = %{version} libavahi-glib1 = %{version} glib2-devel gtk2-devel +Group: Development/Libraries/Other +# Last appeared in OpenSUSE 10.3: +Provides: avahi-devel = %{version} + +%description -n libavahi-glib-devel +Avahi is an Implementation 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 feature complete implementing all MUSTs +and the majority of the SHOULDs of the mDNS/DNS-SD RFCs. It passes all +tests in the Apple Bonjour conformance test suite. In addition it +supports some nifty things that have never been seen elsewhere like +correct mDNS reflection accross LAN segments. + + + +Authors: +-------- + Lennart Poettering + Trent Lloyd + Sebastien Estienne + +%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/Other +# Last appeared in OpenSUSE 10.3: +Provides: avahi-devel = %{version} + +%description -n libavahi-qt3-devel +Avahi is an Implementation 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 feature complete implementing all MUSTs +and the majority of the SHOULDs of the mDNS/DNS-SD RFCs. It passes all +tests in the Apple Bonjour conformance test suite. In addition it +supports some nifty things that have never been seen elsewhere like +correct mDNS reflection accross LAN segments. + + + +Authors: +-------- + Lennart Poettering + Trent Lloyd + Sebastien Estienne + +%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/Other +# Last appeared in OpenSUSE 10.3: +Provides: avahi-devel = %{version} + +%description -n libavahi-qt4-devel +Avahi is an Implementation 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 feature complete implementing all MUSTs +and the majority of the SHOULDs of the mDNS/DNS-SD RFCs. It passes all +tests in the Apple Bonjour conformance test suite. In addition it +supports some nifty things that have never been seen elsewhere like +correct mDNS reflection accross LAN segments. + + + +Authors: +-------- + Lennart Poettering + Trent Lloyd + Sebastien Estienne + +%package compat-mDNSResponder-devel +Summary: D-BUS Service for Zeroconf/Bonjour +Requires: libavahi-devel = %{version} libdns_sd = %{version} Group: System/Daemons Provides: mDNSResponder-devel = 107.5 Obsoletes: mDNSResponder-devel <= 107.5 -%description -n avahi-compat-mDNSResponder-devel +%description compat-mDNSResponder-devel Apple mDNSResponder compatibility layer for avahi. Avahi is an Implementation the DNS Service Discovery and Multicast DNS @@ -255,13 +573,12 @@ Authors: Trent Lloyd Sebastien Estienne -%package -n avahi-compat-howl +%package compat-howl-devel Summary: D-BUS Service for Zeroconf/Bonjour -Requires: %{name} = %{version} -Autoreqprov: on +Requires: libavahi-devel = %{version} libhowl0 = %{version} Group: System/Daemons -%description -n avahi-compat-howl +%description compat-howl-devel howl compatibility layer for avahi. Avahi is an Implementation the DNS Service Discovery and Multicast DNS @@ -278,67 +595,6 @@ correct mDNS reflection accross LAN segments. -Authors: --------- - Lennart Poettering - Trent Lloyd - Sebastien Estienne - -%package -n avahi-compat-howl-devel -Summary: D-BUS Service for Zeroconf/Bonjour -Requires: %{name} = %{version} %{name}-compat-howl = %{version} -Autoreqprov: on -Group: System/Daemons - -%description -n avahi-compat-howl-devel -howl compatibility layer for avahi. - -Avahi is an Implementation 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 feature complete implementing all MUSTs -and the majority of the SHOULDs of the mDNS/DNS-SD RFCs. It passes all -tests in the Apple Bonjour conformance test suite. In addition it -supports some nifty things that have never been seen elsewhere like -correct mDNS reflection accross LAN segments. - - - -Authors: --------- - Lennart Poettering - Trent Lloyd - Sebastien Estienne - -%package -n avahi-devel -Summary: Include Files and Libraries Mandatory for Development -Requires: %{name} = %{version} dbus-1-devel glibc-devel glib2-devel gtk2-devel -# NOTE: Adding these will cause large dependencies, 2/3 of the are not -# needed in most cases. Most users of bindings will already require is -# implicitly. So it's better not to be absolutely correct. -# skip-check-libtool-deps -#Requires: qt3-devel glib2-devel libqt4-devel -Autoreqprov: on -Group: Development/Libraries/Other - -%description -n avahi-devel -Avahi is an Implementation 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 feature complete implementing all MUSTs -and the majority of the SHOULDs of the mDNS/DNS-SD RFCs. It passes all -tests in the Apple Bonjour conformance test suite. In addition it -supports some nifty things that have never been seen elsewhere like -correct mDNS reflection accross LAN segments. - - - Authors: -------- Lennart Poettering @@ -347,9 +603,10 @@ Authors: %endif %prep -%setup -q -n avahi-%{version} +%setup -q -n %{_name}-%{version} %patch0 %patch1 -p1 +%patch2 %build ACLOCAL="aclocal -I common" autoreconf -f -i @@ -409,47 +666,48 @@ install -m 644 %{S:3} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/SuSEfirewall2.d/se %endif # Remove files if only building mono %if %build_mono -rm -rf $RPM_BUILD_ROOT/%{_bindir}/avahi-discover-standalone -rm -rf $RPM_BUILD_ROOT/%{_libdir}/*avahi-glib*.so.* -rm -rf $RPM_BUILD_ROOT/%{_bindir}/avahi-browse* -rm -rf $RPM_BUILD_ROOT/%{_bindir}/avahi-publish* -rm -rf $RPM_BUILD_ROOT/%{_bindir}/avahi-resolve* -rm -rf $RPM_BUILD_ROOT/%{_bindir}/avahi-set-host-name -rm -rf $RPM_BUILD_ROOT/%{_bindir}/bssh -rm -rf $RPM_BUILD_ROOT/%{_bindir}/bvnc -rm -rf $RPM_BUILD_ROOT/%{_datadir}/avahi -rm -rf $RPM_BUILD_ROOT/%{_datadir}/applications/bssh.desktop -rm -rf $RPM_BUILD_ROOT/%{_datadir}/applications/bvnc.desktop -rm -rf $RPM_BUILD_ROOT/%{_libdir}/*avahi-client*.so.* -rm -rf $RPM_BUILD_ROOT/%{_libdir}/*avahi-common*.so.* -rm -rf $RPM_BUILD_ROOT/%{_libdir}/*avahi-core*.so.* -rm -rf $RPM_BUILD_ROOT/%{_libdir}/*avahi-ui*.so.* -rm -rf $RPM_BUILD_ROOT/%{_mandir}/man1 -rm -rf $RPM_BUILD_ROOT/%{_mandir}/man5 -rm -rf $RPM_BUILD_ROOT/%{_mandir}/man8 -rm -rf $RPM_BUILD_ROOT/%{_sbindir}/avahi-* -rm -rf $RPM_BUILD_ROOT/%{_sbindir}/rcavahi-daemon -rm -rf $RPM_BUILD_ROOT/%{_sbindir}/rcavahi-dnsconfd -rm -rf $RPM_BUILD_ROOT/%{_sysconfdir}/avahi -rm -rf $RPM_BUILD_ROOT/%{_sysconfdir}/dbus-1/system.d/*.conf -rm -rf $RPM_BUILD_ROOT/%{_sysconfdir}/init.d/avahi-dnsconfd -rm -rf $RPM_BUILD_ROOT/%{_sysconfdir}/init.d/avahi-daemon -rm -rf $RPM_BUILD_ROOT/%{_includedir} -rm -rf $RPM_BUILD_ROOT/%{_libdir}/*avahi-client.*a -rm -rf $RPM_BUILD_ROOT/%{_libdir}/*avahi-client*.so -rm -rf $RPM_BUILD_ROOT/%{_libdir}/*avahi-core.*a -rm -rf $RPM_BUILD_ROOT/%{_libdir}/*avahi-core*.so -rm -rf $RPM_BUILD_ROOT/%{_libdir}/*avahi-common*.so -rm -rf $RPM_BUILD_ROOT/%{_libdir}/*avahi-common*.*a -rm -rf $RPM_BUILD_ROOT/%{_libdir}/*avahi-glib*.*a -rm -rf $RPM_BUILD_ROOT/%{_libdir}/*avahi-glib*.so -rm -rf $RPM_BUILD_ROOT/%{_libdir}/*avahi-ui*.*a -rm -rf $RPM_BUILD_ROOT/%{_libdir}/*avahi-ui*.*so -rm -rf $RPM_BUILD_ROOT/%{_libdir}/pkgconfig/avahi-client.pc -rm -rf $RPM_BUILD_ROOT/%{_libdir}/pkgconfig/avahi-core.pc -rm -rf $RPM_BUILD_ROOT/%{_libdir}/pkgconfig/avahi-glib.pc -rm -rf $RPM_BUILD_ROOT/%{_libdir}/pkgconfig/avahi-ui.pc +rm -rf $RPM_BUILD_ROOT%{_bindir}/avahi-discover-standalone +rm -rf $RPM_BUILD_ROOT%{_libdir}/*avahi-glib*.so.* +rm -rf $RPM_BUILD_ROOT%{_bindir}/avahi-browse* +rm -rf $RPM_BUILD_ROOT%{_bindir}/avahi-publish* +rm -rf $RPM_BUILD_ROOT%{_bindir}/avahi-resolve* +rm -rf $RPM_BUILD_ROOT%{_bindir}/avahi-set-host-name +rm -rf $RPM_BUILD_ROOT%{_bindir}/bssh +rm -rf $RPM_BUILD_ROOT%{_bindir}/bvnc +rm -rf $RPM_BUILD_ROOT%{_datadir}/avahi +rm -rf $RPM_BUILD_ROOT%{_datadir}/applications/bssh.desktop +rm -rf $RPM_BUILD_ROOT%{_datadir}/applications/bvnc.desktop +rm -rf $RPM_BUILD_ROOT%{_libdir}/*avahi-client*.so.* +rm -rf $RPM_BUILD_ROOT%{_libdir}/*avahi-common*.so.* +rm -rf $RPM_BUILD_ROOT%{_libdir}/*avahi-core*.so.* +rm -rf $RPM_BUILD_ROOT%{_libdir}/*avahi-ui*.so.* +rm -rf $RPM_BUILD_ROOT%{_mandir}/man1 +rm -rf $RPM_BUILD_ROOT%{_mandir}/man5 +rm -rf $RPM_BUILD_ROOT%{_mandir}/man8 +rm -rf $RPM_BUILD_ROOT%{_sbindir}/avahi-* +rm -rf $RPM_BUILD_ROOT%{_sbindir}/rcavahi-daemon +rm -rf $RPM_BUILD_ROOT%{_sbindir}/rcavahi-dnsconfd +rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/avahi +rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/dbus-1/system.d/*.conf +rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/init.d/avahi-dnsconfd +rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/init.d/avahi-daemon +rm -rf $RPM_BUILD_ROOT%{_includedir} +rm -rf $RPM_BUILD_ROOT%{_libdir}/*avahi-client.*a +rm -rf $RPM_BUILD_ROOT%{_libdir}/*avahi-client*.so +rm -rf $RPM_BUILD_ROOT%{_libdir}/*avahi-core.*a +rm -rf $RPM_BUILD_ROOT%{_libdir}/*avahi-core*.so +rm -rf $RPM_BUILD_ROOT%{_libdir}/*avahi-common*.so +rm -rf $RPM_BUILD_ROOT%{_libdir}/*avahi-common*.*a +rm -rf $RPM_BUILD_ROOT%{_libdir}/*avahi-glib*.*a +rm -rf $RPM_BUILD_ROOT%{_libdir}/*avahi-glib*.so +rm -rf $RPM_BUILD_ROOT%{_libdir}/*avahi-ui*.*a +rm -rf $RPM_BUILD_ROOT%{_libdir}/*avahi-ui*.*so +rm -rf $RPM_BUILD_ROOT%{_libdir}/pkgconfig/avahi-client.pc +rm -rf $RPM_BUILD_ROOT%{_libdir}/pkgconfig/avahi-core.pc +rm -rf $RPM_BUILD_ROOT%{_libdir}/pkgconfig/avahi-glib.pc +rm -rf $RPM_BUILD_ROOT%{_libdir}/pkgconfig/avahi-ui.pc %endif +%fdupes $RPM_BUILD_ROOT%{_libdir} %clean rm -rf $RPM_BUILD_ROOT @@ -474,44 +732,68 @@ rm -rf $RPM_BUILD_ROOT %{restart_on_update avahi-dnsconfd} %insserv_cleanup -%preun python +%pre -n python-avahi +# For update from == 10.3: +# Restart will not happen due to package rename. Handle it. +if test etc/init.d/avahi-bookmarks -a "$1" = 1 ; then + touch var/adm/python_avahi_needs_restart +fi + +%post -n python-avahi +# For update from == 10.3: +# Restart will not happen due to package rename. Handle it. +if test -f var/adm/python_avahi_needs_restart ; then + rm var/adm/python_avahi_needs_restart + test -f /etc/sysconfig/services && . /etc/sysconfig/services + if test "$YAST_IS_RUNNING" != "instsys" -a "$DISABLE_RESTART_ON_UPDATE" != yes ; then + /etc/init.d/avahi-bookmarks try-restart > /dev/null || : + fi +fi + +%preun -n python-avahi +# FIXME: Package was renamed, check for this case! %{stop_on_removal avahi-bookmarks} %insserv_cleanup -%postun python +%postun -n python-avahi %{restart_on_update avahi-bookmarks} %insserv_cleanup -%post -n avahi-qt3 -/sbin/ldconfig +%post -n libavahi-client3 -p /sbin/ldconfig -%postun -n avahi-qt3 -/sbin/ldconfig +%postun -n libavahi-client3 -p /sbin/ldconfig -%post -n avahi-qt4 -/sbin/ldconfig +%post -n libavahi-common3 -p /sbin/ldconfig -%postun -n avahi-qt4 -/sbin/ldconfig +%postun -n libavahi-common3 -p /sbin/ldconfig -%post -n avahi-glib -/sbin/ldconfig +%post -n libavahi-core5 -p /sbin/ldconfig -%postun -n avahi-glib -/sbin/ldconfig +%postun -n libavahi-core5 -p /sbin/ldconfig -%post -n avahi-compat-mDNSResponder -/sbin/ldconfig +%post -n libavahi-ui0 -p /sbin/ldconfig -%postun -n avahi-compat-mDNSResponder -/sbin/ldconfig +%postun -n libavahi-ui0 -p /sbin/ldconfig -%post -n avahi-compat-howl -/sbin/ldconfig +%post -n libavahi-qt3-1 -p /sbin/ldconfig -%postun -n avahi-compat-howl -/sbin/ldconfig -# end !%build_mono +%postun -n libavahi-qt3-1 -p /sbin/ldconfig + +%post -n libavahi-qt4-1 -p /sbin/ldconfig + +%postun -n libavahi-qt4-1 -p /sbin/ldconfig + +%post -n libavahi-glib1 -p /sbin/ldconfig + +%postun -n libavahi-glib1 -p /sbin/ldconfig + +%post -n libdns_sd -p /sbin/ldconfig + +%postun -n libdns_sd -p /sbin/ldconfig + +%post -n libhowl0 -p /sbin/ldconfig + +%postun -n libhowl0 -p /sbin/ldconfig %endif %if %build_mono @@ -529,28 +811,8 @@ rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root) %doc LICENSE docs/* -%{_bindir}/avahi-browse* -%{_bindir}/avahi-publish* -%{_bindir}/avahi-resolve* -%{_bindir}/avahi-set-host-name -%{_bindir}/bssh -%{_bindir}/bvnc -%{_datadir}/avahi -%{_datadir}/applications/bssh.desktop -%{_datadir}/applications/bvnc.desktop -%{_datadir}/pixmaps/gnome-nettool2.png %{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/* -%{_libdir}/*avahi-client*.so.* -%{_libdir}/*avahi-common*.so.* -%{_libdir}/*avahi-core*.so.* -%{_libdir}/*avahi-ui*.so.* %attr(-,avahi,avahi) %{_localstatedir}/run/avahi-daemon -%doc %{_mandir}/man1/avahi-browse*.1* -%doc %{_mandir}/man1/avahi-publish*.1* -%doc %{_mandir}/man1/avahi-resolve*.1* -%doc %{_mandir}/man1/avahi-set-host-name.1* -%doc %{_mandir}/man1/bssh.1.* -%doc %{_mandir}/man1/bvnc.1.* %doc %{_mandir}/man5/*.5* %doc %{_mandir}/man8/*.8* %{_sbindir}/avahi-* @@ -567,12 +829,68 @@ rm -rf $RPM_BUILD_ROOT %{_sysconfdir}/init.d/avahi-dnsconfd %{_sysconfdir}/init.d/avahi-daemon -%files -n avahi-glib +%files -n libavahi-client3 +%defattr(-,root,root) +%{_libdir}/*avahi-client*.so.* + +%files -n libavahi-common3 +%defattr(-,root,root) +%{_libdir}/*avahi-common*.so.* + +%files -n libavahi-core5 +%defattr(-,root,root) +%{_libdir}/*avahi-core*.so.* + +%files -n libavahi-ui0 +%defattr(-,root,root) +%{_libdir}/*avahi-ui*.so.* + +%files -n libavahi-glib1 %defattr(-,root,root) %{_bindir}/avahi-discover-standalone %{_libdir}/*avahi-glib*.so.* -%files -n avahi-python +%files -n libavahi-qt3-1 +%defattr(-,root,root) +%{_libdir}/*avahi-qt3*.so.* + +%files -n libavahi-qt4-1 +%defattr(-,root,root) +%{_libdir}/*avahi-qt4*.so.* + +%files -n libdns_sd +%defattr(-,root,root) +# libdns_sd.so must be in non-devel package to provide mDNSResponder-lib compatibility: +%{_libdir}/libdns_sd.so +%{_libdir}/libdns_sd.so.* + +%files -n libhowl0 +%defattr(-,root,root) +%{_libdir}/libhowl.so.* + +%files utils +%defattr(-,root,root) +%{_bindir}/avahi-browse* +%{_bindir}/avahi-publish* +%{_bindir}/avahi-resolve* +%{_bindir}/avahi-set-host-name +%{_datadir}/avahi +%{_datadir}/applications/bssh.desktop +%{_datadir}/applications/bvnc.desktop +%{_datadir}/pixmaps/gnome-nettool2.png +%doc %{_mandir}/man1/avahi-browse*.1* +%doc %{_mandir}/man1/avahi-publish*.1* +%doc %{_mandir}/man1/avahi-resolve*.1* +%doc %{_mandir}/man1/avahi-set-host-name.1* + +%files utils-gtk +%defattr(-,root,root) +%{_bindir}/bssh +%{_bindir}/bvnc +%doc %{_mandir}/man1/bssh.1.* +%doc %{_mandir}/man1/bvnc.1.* + +%files -n python-avahi %defattr(-,root,root) %{py_sitedir}/avahi %{_bindir}/avahi-discover @@ -583,51 +901,14 @@ rm -rf $RPM_BUILD_ROOT %{_sbindir}/rcavahi-bookmarks %{_sysconfdir}/init.d/avahi-bookmarks -%files -n avahi-qt3 -%defattr(-,root,root) -%{_libdir}/*avahi-qt3*.so.* - -%files -n avahi-qt4 -%defattr(-,root,root) -%{_libdir}/*avahi-qt4*.so.* - -%files -n avahi-compat-mDNSResponder -%defattr(-,root,root) -# mDNSResponder uses libdns_sd.so, we need .so in the main package. -%{_libdir}/libdns_sd.so -%{_libdir}/libdns_sd.so.* - -%files -n avahi-compat-mDNSResponder-devel -%defattr(-,root,root) -%{_includedir}/avahi-compat-libdns_sd -%{_includedir}/dns_sd.h -%{_libdir}/libdns_sd.*a -%{_libdir}/pkgconfig/avahi-compat-libdns_sd.pc - -%files -n avahi-compat-howl -%defattr(-,root,root) -%{_libdir}/libhowl.so.* - -%files -n avahi-compat-howl-devel -%defattr(-,root,root) -%{_includedir}/avahi-compat-howl -%{_libdir}/libhowl.so -%{_libdir}/libhowl.*a -%{_libdir}/pkgconfig/avahi-compat-howl.pc -%{_libdir}/pkgconfig/howl.pc - -%files -n avahi-devel +%files -n libavahi-devel %defattr(-,root,root) # FIXME: Maybe split to particular subpackages. #%doc doc/api/html #%doc doc/*.html doc/*.txt doc/file-boilerplate.c doc/TODO %{_includedir}/avahi-client %{_includedir}/avahi-common -%{_includedir}/avahi-glib %{_includedir}/avahi-core -%{_includedir}/avahi-qt3 -%{_includedir}/avahi-qt4 -%{_includedir}/avahi-ui # avahi devel files %{_libdir}/*avahi-client.*a %{_libdir}/*avahi-client*.so @@ -635,23 +916,52 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/*avahi-core*.so %{_libdir}/*avahi-common*.so %{_libdir}/*avahi-common*.*a -%{_libdir}/*avahi-glib*.*a -%{_libdir}/*avahi-glib*.so -%{_libdir}/*avahi-qt3*.*a -%{_libdir}/*avahi-qt3*.so -%{_libdir}/*avahi-qt4*.*a -%{_libdir}/*avahi-qt4*.so -%{_libdir}/*avahi-ui*.*a -%{_libdir}/*avahi-ui*.*so %{_libdir}/pkgconfig/avahi-client.pc %{_libdir}/pkgconfig/avahi-core.pc -%{_libdir}/pkgconfig/avahi-glib.pc -%{_libdir}/pkgconfig/avahi-qt3.pc -%{_libdir}/pkgconfig/avahi-qt4.pc -%{_libdir}/pkgconfig/avahi-ui.pc -%endif +%files -n libavahi-glib-devel +%defattr(-,root,root) +%{_includedir}/avahi-glib +%{_includedir}/avahi-ui +%{_libdir}/*avahi-glib*.*a +%{_libdir}/*avahi-glib*.so +%{_libdir}/*avahi-ui*.*a +%{_libdir}/*avahi-ui*.*so +%{_libdir}/pkgconfig/avahi-glib.pc +%{_libdir}/pkgconfig/avahi-ui.pc + +%files -n libavahi-qt3-devel +%defattr(-,root,root) +%{_includedir}/avahi-qt3 +%{_libdir}/*avahi-qt3*.*a +%{_libdir}/*avahi-qt3*.so +%{_libdir}/pkgconfig/avahi-qt3.pc + +%files -n libavahi-qt4-devel +%defattr(-,root,root) +%{_includedir}/avahi-qt4 +%{_libdir}/*avahi-qt4*.*a +%{_libdir}/*avahi-qt4*.so +%{_libdir}/pkgconfig/avahi-qt4.pc + +%files compat-mDNSResponder-devel +%defattr(-,root,root) +%{_includedir}/avahi-compat-libdns_sd +%{_includedir}/dns_sd.h +%{_libdir}/libdns_sd.*a +%{_libdir}/pkgconfig/avahi-compat-libdns_sd.pc + +%files compat-howl-devel +%defattr(-,root,root) +%{_includedir}/avahi-compat-howl +%{_libdir}/libhowl.so +%{_libdir}/libhowl.*a +%{_libdir}/pkgconfig/avahi-compat-howl.pc +%{_libdir}/pkgconfig/howl.pc +%endif %changelog +* Thu Oct 11 2007 - sbrabec@suse.de +- Updated dependencies. * Mon Aug 06 2007 - bk@suse.de - replace -p /usr/sbin/ldconfig with %%{run_ldconfig} * Mon Jul 30 2007 - aj@suse.de diff --git a/avahi.changes b/avahi.changes index e4c338b..ee3c497 100644 --- a/avahi.changes +++ b/avahi.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Tue Oct 9 19:07:37 CEST 2007 - sbrabec@suse.cz + +- Rename packages according to shared library naming policy. +- Make devel packages binding specific to deliver correct + dependencies (#193817). +- Rename python package according to python package naming policy. +- Prepend library devel packages names by "lib". +- libavahi-ui moved to libavahi-glib to prevent depending of avahi + core on libglade2. +- Split commands line utilities and GTK+ UI utilities to separate + packages to not force them for daemon or Qt binding users. + ------------------------------------------------------------------- Wed Sep 5 23:22:37 CEST 2007 - maw@suse.de diff --git a/avahi.spec b/avahi.spec index a211eae..3d00448 100644 --- a/avahi.spec +++ b/avahi.spec @@ -11,43 +11,50 @@ # norootforbuild Name: avahi +%define _name avahi %define build_mono 0 -# WARNING: If you are editing avahi-mono.spec, STOP. Always edit -# avahi.spec and then run pre_checkin.sh which will create -# avahi-mono.spec based upon avahi.spec. +# WARNING: After editing this file please call Re or rpmbuild to update spec files: Version: 0.6.20 -Release: 34 -URL: http://www.avahi.org/ +Release: 44 +# WARNING: After changing versions please call Re or rpmbuild to auto-update spec file: +#%(sh %{_sourcedir}/%{name}_spec-prepare.sh %{_sourcedir} %{name}) +%define avahi_client_soname 3 +%define avahi_common_soname 3 +%define avahi_core_soname 5 +%define avahi_ui_soname 0 +%define avahi_glib_soname 1 +%define avahi_qt3_soname 1 +%define avahi_qt4_soname 1 +Url: http://www.avahi.org/ Group: System/Daemons License: LGPL v2 or later Summary: D-BUS Service for Zeroconf and Bonjour -Source: avahi-%{version}.tar.bz2 +Source: %{_name}-%{version}.tar.bz2 Source1: gnome-nettool2.png Source2: avahi-bookmarks.init Source3: avahi.firewall -Source4: pre_checkin.sh +Source4: %{_name}_spec-prepare.sh Patch0: avahi-gacdir.patch Patch1: avahi-desktop.patch -Autoreqprov: on +Patch2: avahi-init-lsb.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildRequires: dbus-1-devel doxygen gcc-c++ gdbm-devel graphviz libdaemon-devel libglade2-devel update-desktop-files zlib-devel -%if %build_mono -BuildRequires: gtk-sharp2 mono-devel monodoc-core -%else -BuildRequires: dbus-1-python python-devel python-gdbm qt3-devel -%if %suse_version > 1010 -BuildRequires: libqt4-devel python-gtk-devel -%else -BuildRequires: python-gtk qt-devel -%endif -%endif -%if %build_mono -Requires: avahi = %{version} gtk-sharp2 -%else +BuildRequires: dbus-1-devel doxygen fdupes gcc-c++ gdbm-devel graphviz libdaemon-devel libglade2-devel update-desktop-files zlib-devel +%if !%build_mono +# For python bindings and utilities: +BuildRequires: dbus-1-python python-devel python-gdbm python-gtk-devel +# For qt3 bindings +BuildRequires: qt3-devel +# For qt4 bindings +BuildRequires: libqt4-devel Requires: dbus-1 Requires: nss-mdns +# mDNSResponder was used for <= 10.2: Provides: mDNSResponder = 107.5 Obsoletes: mDNSResponder <= 107.5 +%else +# For mono bindings: +BuildRequires: gtk-sharp2 mono-devel monodoc-core +Requires: gtk-sharp2 libavahi-client3 >= %{version} libavahi-common3 >= %{version} libavahi-ui0 >= %{version} libavahi-glib1 >= %{version} %endif %description @@ -72,13 +79,11 @@ Authors: Sebastien Estienne %if !%build_mono -%package -n avahi-glib +%package -n libavahi-client3 Summary: Glib Bindings for avahi, the D-BUS Service for Zeroconf and Bonjour -Requires: %{name} = %{version} -Autoreqprov: on Group: Development/Libraries/Other -%description -n avahi-glib +%description -n libavahi-client3 GLib support for avahi. Avahi is an Implementation the DNS Service Discovery and Multicast DNS @@ -101,26 +106,25 @@ Authors: Trent Lloyd Sebastien Estienne -%package -n avahi-python -Summary: A set of Avahi utilities written in Python -Requires: %{name} = %{version} python-gdbm python-gtk dbus-1-python python-twisted python-twisted-web -Autoreqprov: on -Group: System/Daemons +%package -n libavahi-common3 +Summary: Glib Bindings for avahi, the D-BUS Service for Zeroconf and Bonjour +Requires: %{name} >= %{version} +Group: Development/Libraries/Other -%py_requires +%description -n libavahi-common3 +GLib support for avahi. -%description -n avahi-python -Avahi is an implementation of the DNS Service Discovery and Multicast -DNS specifications for Zeroconf Computing. It uses D-BUS for -communication between user applications and a system daemon. The daemon -is used to coordinate application efforts in caching replies, necessary -to minimize the traffic imposed on networks. +Avahi is an Implementation 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 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 that have never been seen -elsewhere, like correct mDNS reflection across LAN segments. +The Avahi mDNS responder is now feature complete implementing all MUSTs +and the majority of the SHOULDs of the mDNS/DNS-SD RFCs. It passes all +tests in the Apple Bonjour conformance test suite. In addition it +supports some nifty things that have never been seen elsewhere like +correct mDNS reflection accross LAN segments. @@ -130,13 +134,98 @@ Authors: Trent Lloyd Sebastien Estienne -%package -n avahi-qt3 -Summary: Qt3 Bindings for avahi, the D-BUS Service for Zeroconf and Bonjour -Requires: %{name} = %{version} -Autoreqprov: on +%package -n libavahi-core5 +Summary: Glib Bindings for avahi, the D-BUS Service for Zeroconf and Bonjour Group: Development/Libraries/Other -%description -n avahi-qt3 +%description -n libavahi-core5 +GLib support for avahi. + +Avahi is an Implementation 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 feature complete implementing all MUSTs +and the majority of the SHOULDs of the mDNS/DNS-SD RFCs. It passes all +tests in the Apple Bonjour conformance test suite. In addition it +supports some nifty things that have never been seen elsewhere like +correct mDNS reflection accross LAN segments. + + + +Authors: +-------- + Lennart Poettering + Trent Lloyd + Sebastien Estienne + +%package -n libavahi-ui0 +Summary: Glib Bindings for avahi, the D-BUS Service for Zeroconf and Bonjour +Group: Development/Libraries/Other + +%description -n libavahi-ui0 +GLib support for avahi. + +Avahi is an Implementation 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 feature complete implementing all MUSTs +and the majority of the SHOULDs of the mDNS/DNS-SD RFCs. It passes all +tests in the Apple Bonjour conformance test suite. In addition it +supports some nifty things that have never been seen elsewhere like +correct mDNS reflection accross LAN segments. + + + +Authors: +-------- + Lennart Poettering + Trent Lloyd + Sebastien Estienne + +%package -n libavahi-glib1 +Summary: Glib Bindings for avahi, the D-BUS Service for Zeroconf and Bonjour +Group: Development/Libraries/Other +# Old name used for <= 10.3: +Provides: avahi-glib = %{version} +Obsoletes: avahi-glib <= %{version} + +%description -n libavahi-glib1 +GLib support for avahi. + +Avahi is an Implementation 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 feature complete implementing all MUSTs +and the majority of the SHOULDs of the mDNS/DNS-SD RFCs. It passes all +tests in the Apple Bonjour conformance test suite. In addition it +supports some nifty things that have never been seen elsewhere like +correct mDNS reflection accross LAN segments. + + + +Authors: +-------- + Lennart Poettering + Trent Lloyd + Sebastien Estienne + +%package -n libavahi-qt3-1 +Summary: Qt3 Bindings for avahi, the D-BUS Service for Zeroconf and Bonjour +Group: Development/Libraries/Other +# Old name used for <= 10.3: +Provides: avahi-qt3 = %{version} +Obsoletes: avahi-qt3 <= %{version} + +%description -n libavahi-qt3-1 Qt3 bindings for avahi. Avahi is an Implementation the DNS Service Discovery and Multicast DNS @@ -159,13 +248,14 @@ Authors: Trent Lloyd Sebastien Estienne -%package -n avahi-qt4 +%package -n libavahi-qt4-1 Summary: Qt4 Bindings for avahi, the D-BUS Service for Zeroconf and Bonjour -Requires: %{name} = %{version} -Autoreqprov: on Group: Development/Libraries/Other +# Old name used for <= 10.3: +Provides: avahi-qt4 = %{version} +Obsoletes: avahi-qt4 <= %{version} -%description -n avahi-qt4 +%description -n libavahi-qt4-1 Qt4 bindings for avahi. Avahi is an Implementation the DNS Service Discovery and Multicast DNS @@ -188,20 +278,24 @@ Authors: Trent Lloyd Sebastien Estienne -%package -n avahi-compat-mDNSResponder +%package -n libdns_sd Summary: D-BUS Service for Zeroconf/Bonjour -Requires: %{name} = %{version} -Autoreqprov: on +Group: System/Daemons +# mDNSResponder-lib used unversioned soname. +# Provide full compatibility with mDNSResponder (FIXME: should be fixed in the package): %ifarch ia64 x86_64 ppc64 s390x Provides: libdns_sd.so()(64bit) %else Provides: libdns_sd.so %endif -Group: System/Daemons +# mDNSResponder-lib was used for <= 10.2: Provides: mDNSResponder-lib = 107.5 Obsoletes: mDNSResponder-lib <= 107.5 +# Old name used for <= 10.3: +Provides: avahi-compat-mDNSResponder = %{version} +Obsoletes: avahi-compat-mDNSResponder <= %{version} -%description -n avahi-compat-mDNSResponder +%description -n libdns_sd Apple mDNSResponder compatibility layer for avahi. Avahi is an Implementation the DNS Service Discovery and Multicast DNS @@ -224,16 +318,240 @@ Authors: Trent Lloyd Sebastien Estienne -%package -n avahi-compat-mDNSResponder-devel +%package -n libhowl0 Summary: D-BUS Service for Zeroconf/Bonjour -Requires: %{name} = %{version} %{name}-compat-mDNSResponder = %{version} -Requires: %{name}-devel = %{version} -Autoreqprov: on +Group: System/Daemons +# Old name used for <= 10.3: +Provides: avahi-compat-howl = %{version} +Obsoletes: avahi-compat-howl <= %{version} + +%description -n libhowl0 +howl compatibility layer for avahi. + +Avahi is an Implementation 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 feature complete implementing all MUSTs +and the majority of the SHOULDs of the mDNS/DNS-SD RFCs. It passes all +tests in the Apple Bonjour conformance test suite. In addition it +supports some nifty things that have never been seen elsewhere like +correct mDNS reflection accross LAN segments. + + + +Authors: +-------- + Lennart Poettering + Trent Lloyd + Sebastien Estienne + +%package utils +Summary: A set of Avahi utilities written in Python +Requires: %{name} >= %{version} +Group: System/Daemons + +%description utils +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 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 that have never been seen +elsewhere, like correct mDNS reflection across LAN segments. + + + +Authors: +-------- + Lennart Poettering + Trent Lloyd + Sebastien Estienne + +%package utils-gtk +Summary: A set of Avahi utilities written in Python +Requires: %{name} >= %{version} +Group: System/Daemons + +%description utils-gtk +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 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 that have never been seen +elsewhere, like correct mDNS reflection across LAN segments. + + + +Authors: +-------- + Lennart Poettering + Trent Lloyd + Sebastien Estienne + +%package -n python-avahi +Summary: A set of Avahi utilities written in Python +Requires: %{name} = %{version} python-gdbm python-gtk dbus-1-python python-twisted python-twisted-web +Group: System/Daemons +# Old name used for <= 10.3: +Provides: avahi-python = %{version} +Obsoletes: avahi-python <= %{version} +%py_requires + +%description -n python-avahi +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 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 that have never been seen +elsewhere, like correct mDNS reflection across LAN segments. + + + +Authors: +-------- + Lennart Poettering + Trent Lloyd + Sebastien Estienne + +%package -n libavahi-devel +Summary: Include Files and Libraries Mandatory for Development +# +Requires: %{name} = %{version} libavahi-common3 = %{version} libavahi-core5 = %{version} libavahi-client3 = %{version} dbus-1-devel glibc-devel +Group: Development/Libraries/Other +# Last appeared in OpenSUSE 10.3: +Provides: avahi-devel = %{version} +Obsoletes: avahi-devel <= %{version} + +%description -n libavahi-devel +Avahi is an Implementation 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 feature complete implementing all MUSTs +and the majority of the SHOULDs of the mDNS/DNS-SD RFCs. It passes all +tests in the Apple Bonjour conformance test suite. In addition it +supports some nifty things that have never been seen elsewhere like +correct mDNS reflection accross LAN segments. + + + +Authors: +-------- + Lennart Poettering + Trent Lloyd + Sebastien Estienne + +%package -n libavahi-glib-devel +Summary: Include Files and Libraries Mandatory for Development +Requires: libavahi-devel = %{version} libavahi-ui0 = %{version} libavahi-glib1 = %{version} glib2-devel gtk2-devel +Group: Development/Libraries/Other +# Last appeared in OpenSUSE 10.3: +Provides: avahi-devel = %{version} + +%description -n libavahi-glib-devel +Avahi is an Implementation 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 feature complete implementing all MUSTs +and the majority of the SHOULDs of the mDNS/DNS-SD RFCs. It passes all +tests in the Apple Bonjour conformance test suite. In addition it +supports some nifty things that have never been seen elsewhere like +correct mDNS reflection accross LAN segments. + + + +Authors: +-------- + Lennart Poettering + Trent Lloyd + Sebastien Estienne + +%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/Other +# Last appeared in OpenSUSE 10.3: +Provides: avahi-devel = %{version} + +%description -n libavahi-qt3-devel +Avahi is an Implementation 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 feature complete implementing all MUSTs +and the majority of the SHOULDs of the mDNS/DNS-SD RFCs. It passes all +tests in the Apple Bonjour conformance test suite. In addition it +supports some nifty things that have never been seen elsewhere like +correct mDNS reflection accross LAN segments. + + + +Authors: +-------- + Lennart Poettering + Trent Lloyd + Sebastien Estienne + +%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/Other +# Last appeared in OpenSUSE 10.3: +Provides: avahi-devel = %{version} + +%description -n libavahi-qt4-devel +Avahi is an Implementation 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 feature complete implementing all MUSTs +and the majority of the SHOULDs of the mDNS/DNS-SD RFCs. It passes all +tests in the Apple Bonjour conformance test suite. In addition it +supports some nifty things that have never been seen elsewhere like +correct mDNS reflection accross LAN segments. + + + +Authors: +-------- + Lennart Poettering + Trent Lloyd + Sebastien Estienne + +%package compat-mDNSResponder-devel +Summary: D-BUS Service for Zeroconf/Bonjour +Requires: libavahi-devel = %{version} libdns_sd = %{version} Group: System/Daemons Provides: mDNSResponder-devel = 107.5 Obsoletes: mDNSResponder-devel <= 107.5 -%description -n avahi-compat-mDNSResponder-devel +%description compat-mDNSResponder-devel Apple mDNSResponder compatibility layer for avahi. Avahi is an Implementation the DNS Service Discovery and Multicast DNS @@ -256,13 +574,12 @@ Authors: Trent Lloyd Sebastien Estienne -%package -n avahi-compat-howl +%package compat-howl-devel Summary: D-BUS Service for Zeroconf/Bonjour -Requires: %{name} = %{version} -Autoreqprov: on +Requires: libavahi-devel = %{version} libhowl0 = %{version} Group: System/Daemons -%description -n avahi-compat-howl +%description compat-howl-devel howl compatibility layer for avahi. Avahi is an Implementation the DNS Service Discovery and Multicast DNS @@ -279,67 +596,6 @@ correct mDNS reflection accross LAN segments. -Authors: --------- - Lennart Poettering - Trent Lloyd - Sebastien Estienne - -%package -n avahi-compat-howl-devel -Summary: D-BUS Service for Zeroconf/Bonjour -Requires: %{name} = %{version} %{name}-compat-howl = %{version} -Autoreqprov: on -Group: System/Daemons - -%description -n avahi-compat-howl-devel -howl compatibility layer for avahi. - -Avahi is an Implementation 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 feature complete implementing all MUSTs -and the majority of the SHOULDs of the mDNS/DNS-SD RFCs. It passes all -tests in the Apple Bonjour conformance test suite. In addition it -supports some nifty things that have never been seen elsewhere like -correct mDNS reflection accross LAN segments. - - - -Authors: --------- - Lennart Poettering - Trent Lloyd - Sebastien Estienne - -%package -n avahi-devel -Summary: Include Files and Libraries Mandatory for Development -Requires: %{name} = %{version} dbus-1-devel glibc-devel glib2-devel gtk2-devel -# NOTE: Adding these will cause large dependencies, 2/3 of the are not -# needed in most cases. Most users of bindings will already require is -# implicitly. So it's better not to be absolutely correct. -# skip-check-libtool-deps -#Requires: qt3-devel glib2-devel libqt4-devel -Autoreqprov: on -Group: Development/Libraries/Other - -%description -n avahi-devel -Avahi is an Implementation 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 feature complete implementing all MUSTs -and the majority of the SHOULDs of the mDNS/DNS-SD RFCs. It passes all -tests in the Apple Bonjour conformance test suite. In addition it -supports some nifty things that have never been seen elsewhere like -correct mDNS reflection accross LAN segments. - - - Authors: -------- Lennart Poettering @@ -348,9 +604,10 @@ Authors: %endif %prep -%setup -q -n avahi-%{version} +%setup -q -n %{_name}-%{version} %patch0 %patch1 -p1 +%patch2 %build ACLOCAL="aclocal -I common" autoreconf -f -i @@ -410,47 +667,48 @@ install -m 644 %{S:3} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/SuSEfirewall2.d/se %endif # Remove files if only building mono %if %build_mono -rm -rf $RPM_BUILD_ROOT/%{_bindir}/avahi-discover-standalone -rm -rf $RPM_BUILD_ROOT/%{_libdir}/*avahi-glib*.so.* -rm -rf $RPM_BUILD_ROOT/%{_bindir}/avahi-browse* -rm -rf $RPM_BUILD_ROOT/%{_bindir}/avahi-publish* -rm -rf $RPM_BUILD_ROOT/%{_bindir}/avahi-resolve* -rm -rf $RPM_BUILD_ROOT/%{_bindir}/avahi-set-host-name -rm -rf $RPM_BUILD_ROOT/%{_bindir}/bssh -rm -rf $RPM_BUILD_ROOT/%{_bindir}/bvnc -rm -rf $RPM_BUILD_ROOT/%{_datadir}/avahi -rm -rf $RPM_BUILD_ROOT/%{_datadir}/applications/bssh.desktop -rm -rf $RPM_BUILD_ROOT/%{_datadir}/applications/bvnc.desktop -rm -rf $RPM_BUILD_ROOT/%{_libdir}/*avahi-client*.so.* -rm -rf $RPM_BUILD_ROOT/%{_libdir}/*avahi-common*.so.* -rm -rf $RPM_BUILD_ROOT/%{_libdir}/*avahi-core*.so.* -rm -rf $RPM_BUILD_ROOT/%{_libdir}/*avahi-ui*.so.* -rm -rf $RPM_BUILD_ROOT/%{_mandir}/man1 -rm -rf $RPM_BUILD_ROOT/%{_mandir}/man5 -rm -rf $RPM_BUILD_ROOT/%{_mandir}/man8 -rm -rf $RPM_BUILD_ROOT/%{_sbindir}/avahi-* -rm -rf $RPM_BUILD_ROOT/%{_sbindir}/rcavahi-daemon -rm -rf $RPM_BUILD_ROOT/%{_sbindir}/rcavahi-dnsconfd -rm -rf $RPM_BUILD_ROOT/%{_sysconfdir}/avahi -rm -rf $RPM_BUILD_ROOT/%{_sysconfdir}/dbus-1/system.d/*.conf -rm -rf $RPM_BUILD_ROOT/%{_sysconfdir}/init.d/avahi-dnsconfd -rm -rf $RPM_BUILD_ROOT/%{_sysconfdir}/init.d/avahi-daemon -rm -rf $RPM_BUILD_ROOT/%{_includedir} -rm -rf $RPM_BUILD_ROOT/%{_libdir}/*avahi-client.*a -rm -rf $RPM_BUILD_ROOT/%{_libdir}/*avahi-client*.so -rm -rf $RPM_BUILD_ROOT/%{_libdir}/*avahi-core.*a -rm -rf $RPM_BUILD_ROOT/%{_libdir}/*avahi-core*.so -rm -rf $RPM_BUILD_ROOT/%{_libdir}/*avahi-common*.so -rm -rf $RPM_BUILD_ROOT/%{_libdir}/*avahi-common*.*a -rm -rf $RPM_BUILD_ROOT/%{_libdir}/*avahi-glib*.*a -rm -rf $RPM_BUILD_ROOT/%{_libdir}/*avahi-glib*.so -rm -rf $RPM_BUILD_ROOT/%{_libdir}/*avahi-ui*.*a -rm -rf $RPM_BUILD_ROOT/%{_libdir}/*avahi-ui*.*so -rm -rf $RPM_BUILD_ROOT/%{_libdir}/pkgconfig/avahi-client.pc -rm -rf $RPM_BUILD_ROOT/%{_libdir}/pkgconfig/avahi-core.pc -rm -rf $RPM_BUILD_ROOT/%{_libdir}/pkgconfig/avahi-glib.pc -rm -rf $RPM_BUILD_ROOT/%{_libdir}/pkgconfig/avahi-ui.pc +rm -rf $RPM_BUILD_ROOT%{_bindir}/avahi-discover-standalone +rm -rf $RPM_BUILD_ROOT%{_libdir}/*avahi-glib*.so.* +rm -rf $RPM_BUILD_ROOT%{_bindir}/avahi-browse* +rm -rf $RPM_BUILD_ROOT%{_bindir}/avahi-publish* +rm -rf $RPM_BUILD_ROOT%{_bindir}/avahi-resolve* +rm -rf $RPM_BUILD_ROOT%{_bindir}/avahi-set-host-name +rm -rf $RPM_BUILD_ROOT%{_bindir}/bssh +rm -rf $RPM_BUILD_ROOT%{_bindir}/bvnc +rm -rf $RPM_BUILD_ROOT%{_datadir}/avahi +rm -rf $RPM_BUILD_ROOT%{_datadir}/applications/bssh.desktop +rm -rf $RPM_BUILD_ROOT%{_datadir}/applications/bvnc.desktop +rm -rf $RPM_BUILD_ROOT%{_libdir}/*avahi-client*.so.* +rm -rf $RPM_BUILD_ROOT%{_libdir}/*avahi-common*.so.* +rm -rf $RPM_BUILD_ROOT%{_libdir}/*avahi-core*.so.* +rm -rf $RPM_BUILD_ROOT%{_libdir}/*avahi-ui*.so.* +rm -rf $RPM_BUILD_ROOT%{_mandir}/man1 +rm -rf $RPM_BUILD_ROOT%{_mandir}/man5 +rm -rf $RPM_BUILD_ROOT%{_mandir}/man8 +rm -rf $RPM_BUILD_ROOT%{_sbindir}/avahi-* +rm -rf $RPM_BUILD_ROOT%{_sbindir}/rcavahi-daemon +rm -rf $RPM_BUILD_ROOT%{_sbindir}/rcavahi-dnsconfd +rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/avahi +rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/dbus-1/system.d/*.conf +rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/init.d/avahi-dnsconfd +rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/init.d/avahi-daemon +rm -rf $RPM_BUILD_ROOT%{_includedir} +rm -rf $RPM_BUILD_ROOT%{_libdir}/*avahi-client.*a +rm -rf $RPM_BUILD_ROOT%{_libdir}/*avahi-client*.so +rm -rf $RPM_BUILD_ROOT%{_libdir}/*avahi-core.*a +rm -rf $RPM_BUILD_ROOT%{_libdir}/*avahi-core*.so +rm -rf $RPM_BUILD_ROOT%{_libdir}/*avahi-common*.so +rm -rf $RPM_BUILD_ROOT%{_libdir}/*avahi-common*.*a +rm -rf $RPM_BUILD_ROOT%{_libdir}/*avahi-glib*.*a +rm -rf $RPM_BUILD_ROOT%{_libdir}/*avahi-glib*.so +rm -rf $RPM_BUILD_ROOT%{_libdir}/*avahi-ui*.*a +rm -rf $RPM_BUILD_ROOT%{_libdir}/*avahi-ui*.*so +rm -rf $RPM_BUILD_ROOT%{_libdir}/pkgconfig/avahi-client.pc +rm -rf $RPM_BUILD_ROOT%{_libdir}/pkgconfig/avahi-core.pc +rm -rf $RPM_BUILD_ROOT%{_libdir}/pkgconfig/avahi-glib.pc +rm -rf $RPM_BUILD_ROOT%{_libdir}/pkgconfig/avahi-ui.pc %endif +%fdupes $RPM_BUILD_ROOT%{_libdir} %clean rm -rf $RPM_BUILD_ROOT @@ -475,44 +733,68 @@ rm -rf $RPM_BUILD_ROOT %{restart_on_update avahi-dnsconfd} %insserv_cleanup -%preun python +%pre -n python-avahi +# For update from == 10.3: +# Restart will not happen due to package rename. Handle it. +if test etc/init.d/avahi-bookmarks -a "$1" = 1 ; then + touch var/adm/python_avahi_needs_restart +fi + +%post -n python-avahi +# For update from == 10.3: +# Restart will not happen due to package rename. Handle it. +if test -f var/adm/python_avahi_needs_restart ; then + rm var/adm/python_avahi_needs_restart + test -f /etc/sysconfig/services && . /etc/sysconfig/services + if test "$YAST_IS_RUNNING" != "instsys" -a "$DISABLE_RESTART_ON_UPDATE" != yes ; then + /etc/init.d/avahi-bookmarks try-restart > /dev/null || : + fi +fi + +%preun -n python-avahi +# FIXME: Package was renamed, check for this case! %{stop_on_removal avahi-bookmarks} %insserv_cleanup -%postun python +%postun -n python-avahi %{restart_on_update avahi-bookmarks} %insserv_cleanup -%post -n avahi-qt3 -/sbin/ldconfig +%post -n libavahi-client3 -p /sbin/ldconfig -%postun -n avahi-qt3 -/sbin/ldconfig +%postun -n libavahi-client3 -p /sbin/ldconfig -%post -n avahi-qt4 -/sbin/ldconfig +%post -n libavahi-common3 -p /sbin/ldconfig -%postun -n avahi-qt4 -/sbin/ldconfig +%postun -n libavahi-common3 -p /sbin/ldconfig -%post -n avahi-glib -/sbin/ldconfig +%post -n libavahi-core5 -p /sbin/ldconfig -%postun -n avahi-glib -/sbin/ldconfig +%postun -n libavahi-core5 -p /sbin/ldconfig -%post -n avahi-compat-mDNSResponder -/sbin/ldconfig +%post -n libavahi-ui0 -p /sbin/ldconfig -%postun -n avahi-compat-mDNSResponder -/sbin/ldconfig +%postun -n libavahi-ui0 -p /sbin/ldconfig -%post -n avahi-compat-howl -/sbin/ldconfig +%post -n libavahi-qt3-1 -p /sbin/ldconfig -%postun -n avahi-compat-howl -/sbin/ldconfig -# end !%build_mono +%postun -n libavahi-qt3-1 -p /sbin/ldconfig + +%post -n libavahi-qt4-1 -p /sbin/ldconfig + +%postun -n libavahi-qt4-1 -p /sbin/ldconfig + +%post -n libavahi-glib1 -p /sbin/ldconfig + +%postun -n libavahi-glib1 -p /sbin/ldconfig + +%post -n libdns_sd -p /sbin/ldconfig + +%postun -n libdns_sd -p /sbin/ldconfig + +%post -n libhowl0 -p /sbin/ldconfig + +%postun -n libhowl0 -p /sbin/ldconfig %endif %if %build_mono @@ -530,28 +812,8 @@ rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root) %doc LICENSE docs/* -%{_bindir}/avahi-browse* -%{_bindir}/avahi-publish* -%{_bindir}/avahi-resolve* -%{_bindir}/avahi-set-host-name -%{_bindir}/bssh -%{_bindir}/bvnc -%{_datadir}/avahi -%{_datadir}/applications/bssh.desktop -%{_datadir}/applications/bvnc.desktop -%{_datadir}/pixmaps/gnome-nettool2.png %{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/* -%{_libdir}/*avahi-client*.so.* -%{_libdir}/*avahi-common*.so.* -%{_libdir}/*avahi-core*.so.* -%{_libdir}/*avahi-ui*.so.* %attr(-,avahi,avahi) %{_localstatedir}/run/avahi-daemon -%doc %{_mandir}/man1/avahi-browse*.1* -%doc %{_mandir}/man1/avahi-publish*.1* -%doc %{_mandir}/man1/avahi-resolve*.1* -%doc %{_mandir}/man1/avahi-set-host-name.1* -%doc %{_mandir}/man1/bssh.1.* -%doc %{_mandir}/man1/bvnc.1.* %doc %{_mandir}/man5/*.5* %doc %{_mandir}/man8/*.8* %{_sbindir}/avahi-* @@ -568,12 +830,68 @@ rm -rf $RPM_BUILD_ROOT %{_sysconfdir}/init.d/avahi-dnsconfd %{_sysconfdir}/init.d/avahi-daemon -%files -n avahi-glib +%files -n libavahi-client3 +%defattr(-,root,root) +%{_libdir}/*avahi-client*.so.* + +%files -n libavahi-common3 +%defattr(-,root,root) +%{_libdir}/*avahi-common*.so.* + +%files -n libavahi-core5 +%defattr(-,root,root) +%{_libdir}/*avahi-core*.so.* + +%files -n libavahi-ui0 +%defattr(-,root,root) +%{_libdir}/*avahi-ui*.so.* + +%files -n libavahi-glib1 %defattr(-,root,root) %{_bindir}/avahi-discover-standalone %{_libdir}/*avahi-glib*.so.* -%files -n avahi-python +%files -n libavahi-qt3-1 +%defattr(-,root,root) +%{_libdir}/*avahi-qt3*.so.* + +%files -n libavahi-qt4-1 +%defattr(-,root,root) +%{_libdir}/*avahi-qt4*.so.* + +%files -n libdns_sd +%defattr(-,root,root) +# libdns_sd.so must be in non-devel package to provide mDNSResponder-lib compatibility: +%{_libdir}/libdns_sd.so +%{_libdir}/libdns_sd.so.* + +%files -n libhowl0 +%defattr(-,root,root) +%{_libdir}/libhowl.so.* + +%files utils +%defattr(-,root,root) +%{_bindir}/avahi-browse* +%{_bindir}/avahi-publish* +%{_bindir}/avahi-resolve* +%{_bindir}/avahi-set-host-name +%{_datadir}/avahi +%{_datadir}/applications/bssh.desktop +%{_datadir}/applications/bvnc.desktop +%{_datadir}/pixmaps/gnome-nettool2.png +%doc %{_mandir}/man1/avahi-browse*.1* +%doc %{_mandir}/man1/avahi-publish*.1* +%doc %{_mandir}/man1/avahi-resolve*.1* +%doc %{_mandir}/man1/avahi-set-host-name.1* + +%files utils-gtk +%defattr(-,root,root) +%{_bindir}/bssh +%{_bindir}/bvnc +%doc %{_mandir}/man1/bssh.1.* +%doc %{_mandir}/man1/bvnc.1.* + +%files -n python-avahi %defattr(-,root,root) %{py_sitedir}/avahi %{_bindir}/avahi-discover @@ -584,51 +902,14 @@ rm -rf $RPM_BUILD_ROOT %{_sbindir}/rcavahi-bookmarks %{_sysconfdir}/init.d/avahi-bookmarks -%files -n avahi-qt3 -%defattr(-,root,root) -%{_libdir}/*avahi-qt3*.so.* - -%files -n avahi-qt4 -%defattr(-,root,root) -%{_libdir}/*avahi-qt4*.so.* - -%files -n avahi-compat-mDNSResponder -%defattr(-,root,root) -# mDNSResponder uses libdns_sd.so, we need .so in the main package. -%{_libdir}/libdns_sd.so -%{_libdir}/libdns_sd.so.* - -%files -n avahi-compat-mDNSResponder-devel -%defattr(-,root,root) -%{_includedir}/avahi-compat-libdns_sd -%{_includedir}/dns_sd.h -%{_libdir}/libdns_sd.*a -%{_libdir}/pkgconfig/avahi-compat-libdns_sd.pc - -%files -n avahi-compat-howl -%defattr(-,root,root) -%{_libdir}/libhowl.so.* - -%files -n avahi-compat-howl-devel -%defattr(-,root,root) -%{_includedir}/avahi-compat-howl -%{_libdir}/libhowl.so -%{_libdir}/libhowl.*a -%{_libdir}/pkgconfig/avahi-compat-howl.pc -%{_libdir}/pkgconfig/howl.pc - -%files -n avahi-devel +%files -n libavahi-devel %defattr(-,root,root) # FIXME: Maybe split to particular subpackages. #%doc doc/api/html #%doc doc/*.html doc/*.txt doc/file-boilerplate.c doc/TODO %{_includedir}/avahi-client %{_includedir}/avahi-common -%{_includedir}/avahi-glib %{_includedir}/avahi-core -%{_includedir}/avahi-qt3 -%{_includedir}/avahi-qt4 -%{_includedir}/avahi-ui # avahi devel files %{_libdir}/*avahi-client.*a %{_libdir}/*avahi-client*.so @@ -636,23 +917,60 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/*avahi-core*.so %{_libdir}/*avahi-common*.so %{_libdir}/*avahi-common*.*a -%{_libdir}/*avahi-glib*.*a -%{_libdir}/*avahi-glib*.so -%{_libdir}/*avahi-qt3*.*a -%{_libdir}/*avahi-qt3*.so -%{_libdir}/*avahi-qt4*.*a -%{_libdir}/*avahi-qt4*.so -%{_libdir}/*avahi-ui*.*a -%{_libdir}/*avahi-ui*.*so %{_libdir}/pkgconfig/avahi-client.pc %{_libdir}/pkgconfig/avahi-core.pc -%{_libdir}/pkgconfig/avahi-glib.pc -%{_libdir}/pkgconfig/avahi-qt3.pc -%{_libdir}/pkgconfig/avahi-qt4.pc -%{_libdir}/pkgconfig/avahi-ui.pc -%endif +%files -n libavahi-glib-devel +%defattr(-,root,root) +%{_includedir}/avahi-glib +%{_includedir}/avahi-ui +%{_libdir}/*avahi-glib*.*a +%{_libdir}/*avahi-glib*.so +%{_libdir}/*avahi-ui*.*a +%{_libdir}/*avahi-ui*.*so +%{_libdir}/pkgconfig/avahi-glib.pc +%{_libdir}/pkgconfig/avahi-ui.pc + +%files -n libavahi-qt3-devel +%defattr(-,root,root) +%{_includedir}/avahi-qt3 +%{_libdir}/*avahi-qt3*.*a +%{_libdir}/*avahi-qt3*.so +%{_libdir}/pkgconfig/avahi-qt3.pc + +%files -n libavahi-qt4-devel +%defattr(-,root,root) +%{_includedir}/avahi-qt4 +%{_libdir}/*avahi-qt4*.*a +%{_libdir}/*avahi-qt4*.so +%{_libdir}/pkgconfig/avahi-qt4.pc + +%files compat-mDNSResponder-devel +%defattr(-,root,root) +%{_includedir}/avahi-compat-libdns_sd +%{_includedir}/dns_sd.h +%{_libdir}/libdns_sd.*a +%{_libdir}/pkgconfig/avahi-compat-libdns_sd.pc + +%files compat-howl-devel +%defattr(-,root,root) +%{_includedir}/avahi-compat-howl +%{_libdir}/libhowl.so +%{_libdir}/libhowl.*a +%{_libdir}/pkgconfig/avahi-compat-howl.pc +%{_libdir}/pkgconfig/howl.pc +%endif %changelog +* Tue Oct 09 2007 - sbrabec@suse.cz +- Rename packages according to shared library naming policy. +- Make devel packages binding specific to deliver correct + dependencies (#193817). +- Rename python package according to python package naming policy. +- Prepend library devel packages names by "lib". +- libavahi-ui moved to libavahi-glib to prevent depending of avahi + core on libglade2. +- Split commands line utilities and GTK+ UI utilities to separate + packages to not force them for daemon or Qt binding users. * Wed Sep 05 2007 - maw@suse.de - Move %%{_datadir}/pixmaps/gnome-nettool2.png from the python subpackage to the base package (#299566). diff --git a/avahi_spec-prepare.sh b/avahi_spec-prepare.sh new file mode 100644 index 0000000..b2bdcca --- /dev/null +++ b/avahi_spec-prepare.sh @@ -0,0 +1,49 @@ +#!/bin/bash + +# Autobuild doesn't support package names with macros. This script will update versions in package names. + +ORIG_SPEC=${2%-mono} +# Never update -mono file when it is already opened. It will break advanced build scripts: +if test "$2" != "$ORIG_SPEC" ; then + exit +fi + +if ! test -f $1/$ORIG_SPEC.spec ; then + exit +fi + +for PKGNAME in avahi-client avahi-common avahi-core avahi-ui avahi-glib avahi-qt3 avahi-qt4 ; do + # Packages with name ending by number needs separator + if test x`echo $PKGNAME | sed "s/.*[0-9]$//"` = x ; then + SEPARATOR=- + else + SEPARATOR= + fi + sed -i " + 1,/%changelog/ { + # Copy ${PKGNAME//-/_}_soname to hold space + /^%define ${PKGNAME//-/_}_soname / { + h; + s/^%define ${PKGNAME//-/_}_soname //; + x; + }; + + # Update ${PKGNAME}_soname everywhere + /$PKGNAME$SEPARATOR[0-9][0-9]*\([[:space:]].*\|\)\$/ { + G; + s/$PKGNAME$SEPARATOR[0-9][0-9]*\([[:space:]].*\|\)\n\(.*\)/$PKGNAME$SEPARATOR\2\1/; + }; + };" $1/$ORIG_SPEC.spec +done + +# Edit file to fit -mono build needs: +sed ' + s/build_mono\ 0/build_mono 1/; + s/^.ame:.*/&-mono/; + # No more needed. + #s/^..hangelog.*/& mono/; + s/^\(# WARNING:\).*After editing.*/\1 Do not edit this auto generated file./ +' <$1/$ORIG_SPEC.spec >$1/$ORIG_SPEC-mono.spec + +# Not wanted for avahi: +#cp -a $1/$ORIG_SPEC.changes $1/$ORIG_SPEC-mono.changes diff --git a/pre_checkin.sh b/pre_checkin.sh index 518b912..339fcae 100644 --- a/pre_checkin.sh +++ b/pre_checkin.sh @@ -1,18 +1,3 @@ #!/bin/sh -function fail { - echo Something failed. Too bad. - exit 1 -} - -rm -f avahi-mono.spec.tmp - -cat avahi.spec \ - | sed 's/^Name: *avahi/Name: avahi-mono/g' \ - | sed 's/^%define *build_mono 0/%define build_mono 1/g' \ - > avahi-mono.spec.tmp || fail - -mv avahi-mono.spec.tmp avahi-mono.spec || fail - -echo Fixed up avahi-mono.spec. - +bash avahi_spec-prepare.sh "$PWD" avahi