From a04e04bf6154771b72477ab4cc70812882cbee36ae081eee2173db471449106f Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Mon, 17 Aug 2009 12:20:47 +0000 Subject: [PATCH] Accepting request 17832 from GNOME:Factory Copy from GNOME:Factory/avahi based on submit request 17832 from user vuntz OBS-URL: https://build.opensuse.org/request/show/17832 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/avahi?expand=0&rev=55 --- attributes | 31 +++ avahi-glib2.changes | 5 + avahi-glib2.spec | 232 +---------------- avahi-mono.changes | 5 + avahi-mono.spec | 225 +--------------- avahi-qt4.changes | 5 + avahi-qt4.spec | 217 +--------------- avahi.changes | 15 ++ avahi.spec | 585 +----------------------------------------- avahi_spec-prepare.sh | 13 +- update_spec.pl | 106 ++++++++ 11 files changed, 217 insertions(+), 1222 deletions(-) create mode 100644 attributes create mode 100644 update_spec.pl diff --git a/attributes b/attributes new file mode 100644 index 0000000..9b9f4fa --- /dev/null +++ b/attributes @@ -0,0 +1,31 @@ +group.avahi-qt4 System/GUI/KDE +summary.avahi-qt4 Qt4 Bindings for avahi, the D-BUS Service for Zeroconf and Bonjour ++description.avahi-qt4 +Qt4 bindings 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. +-description.avahi-qt4 +group.avahi-mono Development/Languages/Mono +summary.avahi-mono Mono Bindings for avahi, the D-BUS Service for Zeroconf and Bonjour ++description.avahi-mono +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. +-description.avahi-mono diff --git a/avahi-glib2.changes b/avahi-glib2.changes index cda67aa..d80080a 100644 --- a/avahi-glib2.changes +++ b/avahi-glib2.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sun Aug 9 12:43:26 CEST 2009 - coolo@novell.com + +- use new python macros + ------------------------------------------------------------------- Wed Jan 14 14:17:05 CET 2009 - sbrabec@suse.cz diff --git a/avahi-glib2.spec b/avahi-glib2.spec index 4d72add..0d80edf 100644 --- a/avahi-glib2.spec +++ b/avahi-glib2.spec @@ -31,7 +31,7 @@ Name: avahi-glib2 %define build_qt3 0 %define build_qt4 0 Version: 0.6.25 -Release: 2 +Release: 3 %if !%build_glib2 && !%build_mono && !%build_qt3 && !%build_qt4 # Create split spec files only when building per partes: #%(sh %{_sourcedir}/%{_name}_spec-prepare.sh %{_sourcedir} %{name}) @@ -55,6 +55,8 @@ Source: %{_name}-%{version}.tar.bz2 Source1: gnome-nettool2.png Source2: avahi-bookmarks.init Source3: avahi.firewall +Source100: attributes +Source101: update_spec.pl # Copy of glib-2.0.m4 from glib2-devel to not depend on glib2-devel. Source4: avahi-glib-gettext.m4 #PATCH-FIX-OPENSUSE avahi-gacdir.patch -- Mono libs are in $prefix/lib on suse @@ -71,6 +73,9 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: dbus-1-python fdupes gcc-c++ gdbm-devel intltool libdaemon-devel libexpat-devel pkg-config # Even if we are not building python bindings, we need python to build service types database: BuildRequires: python-devel python-gdbm +%if %suse_version <= 1110 +%define python_sitelib %{py_sitedir} +%endif %if %build_core Source5: %{_name}_spec-prepare.sh PreReq: pwdutils @@ -122,14 +127,6 @@ 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. - - -Authors: --------- - Lennart Poettering - Trent Lloyd - Sebastien Estienne - %if %build_core %package -n libavahi-client3 @@ -150,14 +147,6 @@ 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. - - -Authors: --------- - Lennart Poettering - Trent Lloyd - Sebastien Estienne - %package -n libavahi-common3 License: LGPL v2.1 or later Summary: D-BUS Service for Zeroconf and Bonjour @@ -176,14 +165,6 @@ 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. - - -Authors: --------- - Lennart Poettering - Trent Lloyd - Sebastien Estienne - %package -n libavahi-core6 License: LGPL v2.1 or later Summary: D-BUS Service for Zeroconf and Bonjour @@ -202,14 +183,6 @@ 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. - - -Authors: --------- - Lennart Poettering - Trent Lloyd - Sebastien Estienne - %package -n libdns_sd License: LGPL v2.1 or later Summary: mDNSResponder Compatibility Package for D-BUS Service for Zeroconf/Bonjour @@ -248,14 +221,6 @@ 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 libhowl0 License: LGPL v2.1 or later Summary: howl Compatibility Package for D-BUS Service for Zeroconf/Bonjour @@ -279,14 +244,6 @@ 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 python-avahi License: LGPL v2.1 or later Summary: A set of Avahi utilities written in Python @@ -311,14 +268,6 @@ 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 License: LGPL v2.1 or later Summary: Command Line Utilities for D-BUS Service for Zeroconf and Bonjour @@ -338,14 +287,6 @@ 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. - - -Authors: --------- - Lennart Poettering - Trent Lloyd - Sebastien Estienne - %package -n libavahi-devel License: LGPL v2.1 or later Summary: Include Files and Libraries Mandatory for Development @@ -369,14 +310,6 @@ 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 License: LGPL v2.1 or later Summary: mDNSResponder Compatibility Package for D-BUS Service for Zeroconf/Bonjour @@ -400,14 +333,6 @@ 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-howl-devel License: LGPL v2.1 or later Summary: howl Compatibility Package for D-BUS Service for Zeroconf/Bonjour @@ -429,14 +354,6 @@ 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 - %endif %if %build_glib2 @@ -458,14 +375,6 @@ 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. - - -Authors: --------- - Lennart Poettering - Trent Lloyd - Sebastien Estienne - %package -n libavahi-glib1 License: LGPL v2.1 or later Summary: Glib Bindings for avahi, the D-BUS Service for Zeroconf and Bonjour @@ -489,14 +398,6 @@ 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-gobject0 License: LGPL v2.1 or later Summary: D-BUS Service for Zeroconf and Bonjour @@ -515,14 +416,6 @@ 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. - - -Authors: --------- - Lennart Poettering - Trent Lloyd - Sebastien Estienne - %package -n avahi-utils-gtk License: LGPL v2.1 or later Summary: GTK+ Utilities for D-BUS Service for Zeroconf and Bonjour @@ -547,14 +440,6 @@ 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. - - -Authors: --------- - Lennart Poettering - Trent Lloyd - Sebastien Estienne - %package -n python-avahi-gtk License: LGPL v2.1 or later Summary: A set of Avahi utilities written in Python Using python-gtk @@ -581,14 +466,6 @@ 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-glib-devel License: LGPL v2.1 or later Summary: Include Files and Libraries Mandatory for Development @@ -612,14 +489,6 @@ 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-gobject-devel License: LGPL v2.1 or later Summary: D-BUS Service for Zeroconf and Bonjour @@ -639,14 +508,6 @@ 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. - - -Authors: --------- - Lennart Poettering - Trent Lloyd - Sebastien Estienne - %endif %if %build_qt3 @@ -673,14 +534,6 @@ 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 @@ -704,14 +557,6 @@ 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 - %endif %if %build_qt4 @@ -738,14 +583,6 @@ 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 License: LGPL v2.1 or later Summary: Include Files and Libraries Mandatory for Development @@ -769,14 +606,6 @@ 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 - %endif %if %build_core %if %build_mono @@ -799,14 +628,6 @@ SHOULDs of the mDNS and DNS-SD RFCs. It passes all tests in the Apple Bonjour conformance test suite. In addition, it supports some nifty things, like correct mDNS reflection across LAN segments. - - -Authors: --------- - Lennart Poettering - Trent Lloyd - Sebastien Estienne - %endif %lang_package %endif @@ -959,7 +780,7 @@ rm $RPM_BUILD_ROOT%{_libdir}/pkgconfig/avahi-client.pc rm $RPM_BUILD_ROOT%{_libdir}/pkgconfig/avahi-core.pc %if %build_glib2 rm $RPM_BUILD_ROOT%{_bindir}/avahi-bookmarks -rm -r $RPM_BUILD_ROOT%{py_sitedir}/avahi +rm -r $RPM_BUILD_ROOT%{python_sitelib}/avahi rm $RPM_BUILD_ROOT%{_mandir}/man1/avahi-bookmarks.1* rm $RPM_BUILD_ROOT%{_mandir}/man1/avahi-browse-domains.1* rm $RPM_BUILD_ROOT%{_mandir}/man1/avahi-browse.1* @@ -1151,8 +972,8 @@ fi %doc %{_mandir}/man1/avahi-bookmarks.1* %{_sbindir}/rcavahi-bookmarks %{_sysconfdir}/init.d/avahi-bookmarks -%{py_sitedir}/avahi -%{py_sitedir}/avahi/ServiceTypeDatabase.py +%{python_sitelib}/avahi +%{python_sitelib}/avahi/ServiceTypeDatabase.py %files utils %defattr(-,root,root) @@ -1224,7 +1045,7 @@ fi %{_bindir}/avahi-discover %{_datadir}/applications/avahi-discover.desktop %doc %{_mandir}/man1/avahi-discover.1* -%{py_sitedir}/avahi_discover +%{python_sitelib}/avahi_discover %files -n avahi-utils-gtk %defattr(-,root,root) @@ -1300,36 +1121,3 @@ fi %endif %changelog -* Wed Jan 14 2009 sbrabec@suse.cz -- avahi-glib2-utils-gtk renamed back to its correct name - avahi-utils-gtk (bnc#456418). -* Tue Jan 13 2009 olh@suse.de -- obsolete old -XXbit packages (bnc#437293) -* Mon Dec 15 2008 sbrabec@suse.cz -- avahi-discover.glade is required by avahi-utils-gtk and - python-avahi-gtk => move to avahi (bnc#456418). -- Upgrade protection for avahi-utils-gtk built as - avahi-glib2-utils-gtk (bnc#456418). -* Mon Sep 01 2008 meissner@suse.de -- Added GCC attribute alloc_size markup for allocator functions -* Mon Aug 04 2008 ro@suse.de -- move fix further up in specfile -* Fri Aug 01 2008 ro@suse.de -- fix requires for debuginfo package -* Sat Jul 26 2008 aj@suse.de -- Fix requires to require avahi base package. -* Fri Jul 18 2008 sbrabec@suse.cz -- Build glib2, gobject and python stuff separately to break build - loop cups -> gtk2 -> avahi -> cups. -- Split avahi-python-gtk from avahi-python. -- Updated to version 0.6.23: - * A lot of translation updates - * Beef up bnvc quite a bit, including passing a domain to browse - in - * Increase numer of open files resource limit to 300 so that we - can deal with more clients simultaneously. - * Rework 'poof' algorithm a bit to reduce traffic load on noisy - links. - * Build fixes - * Minor other updates - * Backwards compatible with Avahi 0.6.x with x < 23. diff --git a/avahi-mono.changes b/avahi-mono.changes index 4c364db..f20edd2 100644 --- a/avahi-mono.changes +++ b/avahi-mono.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sun Aug 9 12:43:26 CEST 2009 - coolo@novell.com + +- use new python macros + ------------------------------------------------------------------- Mon Sep 1 10:22:46 CEST 2008 - meissner@suse.de diff --git a/avahi-mono.spec b/avahi-mono.spec index fd12803..88f9e8b 100644 --- a/avahi-mono.spec +++ b/avahi-mono.spec @@ -31,7 +31,7 @@ Name: avahi-mono %define build_qt3 0 %define build_qt4 0 Version: 0.6.25 -Release: 2 +Release: 3 %if !%build_glib2 && !%build_mono && !%build_qt3 && !%build_qt4 # Create split spec files only when building per partes: #%(sh %{_sourcedir}/%{_name}_spec-prepare.sh %{_sourcedir} %{name}) @@ -55,6 +55,8 @@ Source: %{_name}-%{version}.tar.bz2 Source1: gnome-nettool2.png Source2: avahi-bookmarks.init Source3: avahi.firewall +Source100: attributes +Source101: update_spec.pl # Copy of glib-2.0.m4 from glib2-devel to not depend on glib2-devel. Source4: avahi-glib-gettext.m4 #PATCH-FIX-OPENSUSE avahi-gacdir.patch -- Mono libs are in $prefix/lib on suse @@ -71,6 +73,9 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: dbus-1-python fdupes gcc-c++ gdbm-devel intltool libdaemon-devel libexpat-devel pkg-config # Even if we are not building python bindings, we need python to build service types database: BuildRequires: python-devel python-gdbm +%if %suse_version <= 1110 +%define python_sitelib %{py_sitedir} +%endif %if %build_core Source5: %{_name}_spec-prepare.sh PreReq: pwdutils @@ -121,14 +126,6 @@ SHOULDs of the mDNS and DNS-SD RFCs. It passes all tests in the Apple Bonjour conformance test suite. In addition, it supports some nifty things, like correct mDNS reflection across LAN segments. - - -Authors: --------- - Lennart Poettering - Trent Lloyd - Sebastien Estienne - %if %build_core %package -n libavahi-client3 @@ -149,14 +146,6 @@ 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. - - -Authors: --------- - Lennart Poettering - Trent Lloyd - Sebastien Estienne - %package -n libavahi-common3 License: LGPL v2.1 or later Summary: D-BUS Service for Zeroconf and Bonjour @@ -175,14 +164,6 @@ 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. - - -Authors: --------- - Lennart Poettering - Trent Lloyd - Sebastien Estienne - %package -n libavahi-core6 License: LGPL v2.1 or later Summary: D-BUS Service for Zeroconf and Bonjour @@ -201,14 +182,6 @@ 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. - - -Authors: --------- - Lennart Poettering - Trent Lloyd - Sebastien Estienne - %package -n libdns_sd License: LGPL v2.1 or later Summary: mDNSResponder Compatibility Package for D-BUS Service for Zeroconf/Bonjour @@ -247,14 +220,6 @@ 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 libhowl0 License: LGPL v2.1 or later Summary: howl Compatibility Package for D-BUS Service for Zeroconf/Bonjour @@ -278,14 +243,6 @@ 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 python-avahi License: LGPL v2.1 or later Summary: A set of Avahi utilities written in Python @@ -310,14 +267,6 @@ 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 License: LGPL v2.1 or later Summary: Command Line Utilities for D-BUS Service for Zeroconf and Bonjour @@ -337,14 +286,6 @@ 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. - - -Authors: --------- - Lennart Poettering - Trent Lloyd - Sebastien Estienne - %package -n libavahi-devel License: LGPL v2.1 or later Summary: Include Files and Libraries Mandatory for Development @@ -368,14 +309,6 @@ 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 License: LGPL v2.1 or later Summary: mDNSResponder Compatibility Package for D-BUS Service for Zeroconf/Bonjour @@ -399,14 +332,6 @@ 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-howl-devel License: LGPL v2.1 or later Summary: howl Compatibility Package for D-BUS Service for Zeroconf/Bonjour @@ -428,14 +353,6 @@ 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 - %endif %if %build_glib2 @@ -457,14 +374,6 @@ 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. - - -Authors: --------- - Lennart Poettering - Trent Lloyd - Sebastien Estienne - %package -n libavahi-glib1 License: LGPL v2.1 or later Summary: Glib Bindings for avahi, the D-BUS Service for Zeroconf and Bonjour @@ -488,14 +397,6 @@ 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-gobject0 License: LGPL v2.1 or later Summary: D-BUS Service for Zeroconf and Bonjour @@ -514,14 +415,6 @@ 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. - - -Authors: --------- - Lennart Poettering - Trent Lloyd - Sebastien Estienne - %package -n avahi-utils-gtk License: LGPL v2.1 or later Summary: GTK+ Utilities for D-BUS Service for Zeroconf and Bonjour @@ -546,14 +439,6 @@ 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. - - -Authors: --------- - Lennart Poettering - Trent Lloyd - Sebastien Estienne - %package -n python-avahi-gtk License: LGPL v2.1 or later Summary: A set of Avahi utilities written in Python Using python-gtk @@ -580,14 +465,6 @@ 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-glib-devel License: LGPL v2.1 or later Summary: Include Files and Libraries Mandatory for Development @@ -611,14 +488,6 @@ 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-gobject-devel License: LGPL v2.1 or later Summary: D-BUS Service for Zeroconf and Bonjour @@ -638,14 +507,6 @@ 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. - - -Authors: --------- - Lennart Poettering - Trent Lloyd - Sebastien Estienne - %endif %if %build_qt3 @@ -672,14 +533,6 @@ 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 @@ -703,14 +556,6 @@ 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 - %endif %if %build_qt4 @@ -737,14 +582,6 @@ 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 License: LGPL v2.1 or later Summary: Include Files and Libraries Mandatory for Development @@ -768,14 +605,6 @@ 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 - %endif %if %build_core %if %build_mono @@ -798,14 +627,6 @@ SHOULDs of the mDNS and DNS-SD RFCs. It passes all tests in the Apple Bonjour conformance test suite. In addition, it supports some nifty things, like correct mDNS reflection across LAN segments. - - -Authors: --------- - Lennart Poettering - Trent Lloyd - Sebastien Estienne - %endif %lang_package %endif @@ -958,7 +779,7 @@ rm $RPM_BUILD_ROOT%{_libdir}/pkgconfig/avahi-client.pc rm $RPM_BUILD_ROOT%{_libdir}/pkgconfig/avahi-core.pc %if %build_glib2 rm $RPM_BUILD_ROOT%{_bindir}/avahi-bookmarks -rm -r $RPM_BUILD_ROOT%{py_sitedir}/avahi +rm -r $RPM_BUILD_ROOT%{python_sitelib}/avahi rm $RPM_BUILD_ROOT%{_mandir}/man1/avahi-bookmarks.1* rm $RPM_BUILD_ROOT%{_mandir}/man1/avahi-browse-domains.1* rm $RPM_BUILD_ROOT%{_mandir}/man1/avahi-browse.1* @@ -1150,8 +971,8 @@ fi %doc %{_mandir}/man1/avahi-bookmarks.1* %{_sbindir}/rcavahi-bookmarks %{_sysconfdir}/init.d/avahi-bookmarks -%{py_sitedir}/avahi -%{py_sitedir}/avahi/ServiceTypeDatabase.py +%{python_sitelib}/avahi +%{python_sitelib}/avahi/ServiceTypeDatabase.py %files utils %defattr(-,root,root) @@ -1223,7 +1044,7 @@ fi %{_bindir}/avahi-discover %{_datadir}/applications/avahi-discover.desktop %doc %{_mandir}/man1/avahi-discover.1* -%{py_sitedir}/avahi_discover +%{python_sitelib}/avahi_discover %files -n avahi-utils-gtk %defattr(-,root,root) @@ -1299,29 +1120,3 @@ fi %endif %changelog -* Mon Sep 01 2008 meissner@suse.de -- Added GCC attribute alloc_size markup for allocator functions -* Fri Jul 18 2008 sbrabec@suse.cz -- Updated to version 0.6.23: - * A lot of translation updates - * Beef up bnvc quite a bit, including passing a domain to browse - in - * Increase numer of open files resource limit to 300 so that we - can deal with more clients simultaneously. - * Rework 'poof' algorithm a bit to reduce traffic load on noisy - links. - * Build fixes - * Minor other updates - * Backwards compatible with Avahi 0.6.x with x < 23. -* Sun May 11 2008 coolo@suse.de -- fix rename of xxbit packages -* Tue Mar 11 2008 sbrabec@suse.cz -- Fix build failure of avahi-mono. -* 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 -- Add gcc-c++ to BuildRequires. -* Mon Jul 16 2007 aj@suse.de -- Create new spec file to avoid build cycle avahi->gnome->mono->avahi. diff --git a/avahi-qt4.changes b/avahi-qt4.changes index 3707601..1f9094b 100644 --- a/avahi-qt4.changes +++ b/avahi-qt4.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sun Aug 9 12:43:26 CEST 2009 - coolo@novell.com + +- use new python macros + ------------------------------------------------------------------- Mon Sep 1 10:22:46 CEST 2008 - meissner@suse.de diff --git a/avahi-qt4.spec b/avahi-qt4.spec index 41f03c4..15b0331 100644 --- a/avahi-qt4.spec +++ b/avahi-qt4.spec @@ -31,7 +31,7 @@ Name: avahi-qt4 %define build_qt3 0 %define build_qt4 1 Version: 0.6.25 -Release: 2 +Release: 3 %if !%build_glib2 && !%build_mono && !%build_qt3 && !%build_qt4 # Create split spec files only when building per partes: #%(sh %{_sourcedir}/%{_name}_spec-prepare.sh %{_sourcedir} %{name}) @@ -55,6 +55,8 @@ Source: %{_name}-%{version}.tar.bz2 Source1: gnome-nettool2.png Source2: avahi-bookmarks.init Source3: avahi.firewall +Source100: attributes +Source101: update_spec.pl # Copy of glib-2.0.m4 from glib2-devel to not depend on glib2-devel. Source4: avahi-glib-gettext.m4 #PATCH-FIX-OPENSUSE avahi-gacdir.patch -- Mono libs are in $prefix/lib on suse @@ -71,6 +73,9 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: dbus-1-python fdupes gcc-c++ gdbm-devel intltool libdaemon-devel libexpat-devel pkg-config # Even if we are not building python bindings, we need python to build service types database: BuildRequires: python-devel python-gdbm +%if %suse_version <= 1110 +%define python_sitelib %{py_sitedir} +%endif %if %build_core Source5: %{_name}_spec-prepare.sh PreReq: pwdutils @@ -124,14 +129,6 @@ 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 - %if %build_core %package -n libavahi-client3 @@ -152,14 +149,6 @@ 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. - - -Authors: --------- - Lennart Poettering - Trent Lloyd - Sebastien Estienne - %package -n libavahi-common3 License: LGPL v2.1 or later Summary: D-BUS Service for Zeroconf and Bonjour @@ -178,14 +167,6 @@ 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. - - -Authors: --------- - Lennart Poettering - Trent Lloyd - Sebastien Estienne - %package -n libavahi-core6 License: LGPL v2.1 or later Summary: D-BUS Service for Zeroconf and Bonjour @@ -204,14 +185,6 @@ 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. - - -Authors: --------- - Lennart Poettering - Trent Lloyd - Sebastien Estienne - %package -n libdns_sd License: LGPL v2.1 or later Summary: mDNSResponder Compatibility Package for D-BUS Service for Zeroconf/Bonjour @@ -250,14 +223,6 @@ 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 libhowl0 License: LGPL v2.1 or later Summary: howl Compatibility Package for D-BUS Service for Zeroconf/Bonjour @@ -281,14 +246,6 @@ 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 python-avahi License: LGPL v2.1 or later Summary: A set of Avahi utilities written in Python @@ -313,14 +270,6 @@ 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 License: LGPL v2.1 or later Summary: Command Line Utilities for D-BUS Service for Zeroconf and Bonjour @@ -340,14 +289,6 @@ 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. - - -Authors: --------- - Lennart Poettering - Trent Lloyd - Sebastien Estienne - %package -n libavahi-devel License: LGPL v2.1 or later Summary: Include Files and Libraries Mandatory for Development @@ -371,14 +312,6 @@ 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 License: LGPL v2.1 or later Summary: mDNSResponder Compatibility Package for D-BUS Service for Zeroconf/Bonjour @@ -402,14 +335,6 @@ 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-howl-devel License: LGPL v2.1 or later Summary: howl Compatibility Package for D-BUS Service for Zeroconf/Bonjour @@ -431,14 +356,6 @@ 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 - %endif %if %build_glib2 @@ -460,14 +377,6 @@ 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. - - -Authors: --------- - Lennart Poettering - Trent Lloyd - Sebastien Estienne - %package -n libavahi-glib1 License: LGPL v2.1 or later Summary: Glib Bindings for avahi, the D-BUS Service for Zeroconf and Bonjour @@ -491,14 +400,6 @@ 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-gobject0 License: LGPL v2.1 or later Summary: D-BUS Service for Zeroconf and Bonjour @@ -517,14 +418,6 @@ 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. - - -Authors: --------- - Lennart Poettering - Trent Lloyd - Sebastien Estienne - %package -n avahi-utils-gtk License: LGPL v2.1 or later Summary: GTK+ Utilities for D-BUS Service for Zeroconf and Bonjour @@ -549,14 +442,6 @@ 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. - - -Authors: --------- - Lennart Poettering - Trent Lloyd - Sebastien Estienne - %package -n python-avahi-gtk License: LGPL v2.1 or later Summary: A set of Avahi utilities written in Python Using python-gtk @@ -583,14 +468,6 @@ 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-glib-devel License: LGPL v2.1 or later Summary: Include Files and Libraries Mandatory for Development @@ -614,14 +491,6 @@ 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-gobject-devel License: LGPL v2.1 or later Summary: D-BUS Service for Zeroconf and Bonjour @@ -641,14 +510,6 @@ 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. - - -Authors: --------- - Lennart Poettering - Trent Lloyd - Sebastien Estienne - %endif %if %build_qt3 @@ -675,14 +536,6 @@ 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 @@ -706,14 +559,6 @@ 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 - %endif %if %build_qt4 @@ -740,14 +585,6 @@ 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 License: LGPL v2.1 or later Summary: Include Files and Libraries Mandatory for Development @@ -771,14 +608,6 @@ 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 - %endif %if %build_core %if %build_mono @@ -801,14 +630,6 @@ SHOULDs of the mDNS and DNS-SD RFCs. It passes all tests in the Apple Bonjour conformance test suite. In addition, it supports some nifty things, like correct mDNS reflection across LAN segments. - - -Authors: --------- - Lennart Poettering - Trent Lloyd - Sebastien Estienne - %endif %lang_package %endif @@ -961,7 +782,7 @@ rm $RPM_BUILD_ROOT%{_libdir}/pkgconfig/avahi-client.pc rm $RPM_BUILD_ROOT%{_libdir}/pkgconfig/avahi-core.pc %if %build_glib2 rm $RPM_BUILD_ROOT%{_bindir}/avahi-bookmarks -rm -r $RPM_BUILD_ROOT%{py_sitedir}/avahi +rm -r $RPM_BUILD_ROOT%{python_sitelib}/avahi rm $RPM_BUILD_ROOT%{_mandir}/man1/avahi-bookmarks.1* rm $RPM_BUILD_ROOT%{_mandir}/man1/avahi-browse-domains.1* rm $RPM_BUILD_ROOT%{_mandir}/man1/avahi-browse.1* @@ -1153,8 +974,8 @@ fi %doc %{_mandir}/man1/avahi-bookmarks.1* %{_sbindir}/rcavahi-bookmarks %{_sysconfdir}/init.d/avahi-bookmarks -%{py_sitedir}/avahi -%{py_sitedir}/avahi/ServiceTypeDatabase.py +%{python_sitelib}/avahi +%{python_sitelib}/avahi/ServiceTypeDatabase.py %files utils %defattr(-,root,root) @@ -1226,7 +1047,7 @@ fi %{_bindir}/avahi-discover %{_datadir}/applications/avahi-discover.desktop %doc %{_mandir}/man1/avahi-discover.1* -%{py_sitedir}/avahi_discover +%{python_sitelib}/avahi_discover %files -n avahi-utils-gtk %defattr(-,root,root) @@ -1302,21 +1123,3 @@ fi %endif %changelog -* Mon Sep 01 2008 meissner@suse.de -- Added GCC attribute alloc_size markup for allocator functions -* Fri Jul 18 2008 sbrabec@suse.cz -- Updated to version 0.6.23: - * A lot of translation updates - * Beef up bnvc quite a bit, including passing a domain to browse - in - * Increase numer of open files resource limit to 300 so that we - can deal with more clients simultaneously. - * Rework 'poof' algorithm a bit to reduce traffic load on noisy - links. - * Build fixes - * Minor other updates - * Backwards compatible with Avahi 0.6.x with x < 23. -* Sun May 11 2008 coolo@suse.de -- fix rename of xxbit packages -* Wed Mar 05 2008 sbrabec@suse.cz -- Create new spec file to avoid dependency of avahi core on Qt. diff --git a/avahi.changes b/avahi.changes index 5621e74..ba8b1fe 100644 --- a/avahi.changes +++ b/avahi.changes @@ -1,3 +1,18 @@ +------------------------------------------------------------------- +Thu Aug 13 19:11:24 CEST 2009 - vuntz@novell.com + +- Tweak the use of new python macros. + +------------------------------------------------------------------- +Mon Aug 10 13:16:55 CEST 2009 - coolo@novell.com + +- fix generation of sub-spec files by using update_spec.pl + +------------------------------------------------------------------- +Sun Aug 9 12:29:11 CEST 2009 - coolo@novell.com + +- use new python macros + ------------------------------------------------------------------- Thu May 28 18:45:06 CEST 2009 - vuntz@novell.com diff --git a/avahi.spec b/avahi.spec index 3da3303..6a99c34 100644 --- a/avahi.spec +++ b/avahi.spec @@ -33,7 +33,7 @@ Name: avahi %define build_qt3 0 %define build_qt4 0 Version: 0.6.25 -Release: 2 +Release: 3 %if !%build_glib2 && !%build_mono && !%build_qt3 && !%build_qt4 # Create split spec files only when building per partes: #%(sh %{_sourcedir}/%{_name}_spec-prepare.sh %{_sourcedir} %{name}) @@ -57,6 +57,8 @@ Source: %{_name}-%{version}.tar.bz2 Source1: gnome-nettool2.png Source2: avahi-bookmarks.init Source3: avahi.firewall +Source100: attributes +Source101: update_spec.pl # Copy of glib-2.0.m4 from glib2-devel to not depend on glib2-devel. Source4: avahi-glib-gettext.m4 #PATCH-FIX-OPENSUSE avahi-gacdir.patch -- Mono libs are in $prefix/lib on suse @@ -73,6 +75,9 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: dbus-1-python fdupes gcc-c++ gdbm-devel intltool libdaemon-devel libexpat-devel pkg-config # Even if we are not building python bindings, we need python to build service types database: BuildRequires: python-devel python-gdbm +%if %suse_version <= 1110 +%define python_sitelib %{py_sitedir} +%endif %if %build_core Source5: %{_name}_spec-prepare.sh PreReq: pwdutils @@ -124,14 +129,6 @@ 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. - - -Authors: --------- - Lennart Poettering - Trent Lloyd - Sebastien Estienne - %if %build_core %package -n libavahi-client3 @@ -152,14 +149,6 @@ 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. - - -Authors: --------- - Lennart Poettering - Trent Lloyd - Sebastien Estienne - %package -n libavahi-common3 License: LGPL v2.1 or later Summary: D-BUS Service for Zeroconf and Bonjour @@ -178,14 +167,6 @@ 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. - - -Authors: --------- - Lennart Poettering - Trent Lloyd - Sebastien Estienne - %package -n libavahi-core6 License: LGPL v2.1 or later Summary: D-BUS Service for Zeroconf and Bonjour @@ -204,14 +185,6 @@ 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. - - -Authors: --------- - Lennart Poettering - Trent Lloyd - Sebastien Estienne - %package -n libdns_sd License: LGPL v2.1 or later Summary: mDNSResponder Compatibility Package for D-BUS Service for Zeroconf/Bonjour @@ -250,14 +223,6 @@ 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 libhowl0 License: LGPL v2.1 or later Summary: howl Compatibility Package for D-BUS Service for Zeroconf/Bonjour @@ -281,14 +246,6 @@ 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 python-avahi License: LGPL v2.1 or later Summary: A set of Avahi utilities written in Python @@ -313,14 +270,6 @@ 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 License: LGPL v2.1 or later Summary: Command Line Utilities for D-BUS Service for Zeroconf and Bonjour @@ -340,14 +289,6 @@ 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. - - -Authors: --------- - Lennart Poettering - Trent Lloyd - Sebastien Estienne - %package -n libavahi-devel License: LGPL v2.1 or later Summary: Include Files and Libraries Mandatory for Development @@ -371,14 +312,6 @@ 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 License: LGPL v2.1 or later Summary: mDNSResponder Compatibility Package for D-BUS Service for Zeroconf/Bonjour @@ -402,14 +335,6 @@ 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-howl-devel License: LGPL v2.1 or later Summary: howl Compatibility Package for D-BUS Service for Zeroconf/Bonjour @@ -431,14 +356,6 @@ 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 - %endif %if %build_glib2 @@ -460,14 +377,6 @@ 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. - - -Authors: --------- - Lennart Poettering - Trent Lloyd - Sebastien Estienne - %package -n libavahi-glib1 License: LGPL v2.1 or later Summary: Glib Bindings for avahi, the D-BUS Service for Zeroconf and Bonjour @@ -491,14 +400,6 @@ 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-gobject0 License: LGPL v2.1 or later Summary: D-BUS Service for Zeroconf and Bonjour @@ -517,14 +418,6 @@ 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. - - -Authors: --------- - Lennart Poettering - Trent Lloyd - Sebastien Estienne - %package -n avahi-utils-gtk License: LGPL v2.1 or later Summary: GTK+ Utilities for D-BUS Service for Zeroconf and Bonjour @@ -549,14 +442,6 @@ 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. - - -Authors: --------- - Lennart Poettering - Trent Lloyd - Sebastien Estienne - %package -n python-avahi-gtk License: LGPL v2.1 or later Summary: A set of Avahi utilities written in Python Using python-gtk @@ -583,14 +468,6 @@ 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-glib-devel License: LGPL v2.1 or later Summary: Include Files and Libraries Mandatory for Development @@ -614,14 +491,6 @@ 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-gobject-devel License: LGPL v2.1 or later Summary: D-BUS Service for Zeroconf and Bonjour @@ -641,14 +510,6 @@ 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. - - -Authors: --------- - Lennart Poettering - Trent Lloyd - Sebastien Estienne - %endif %if %build_qt3 @@ -675,14 +536,6 @@ 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 @@ -706,14 +559,6 @@ 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 - %endif %if %build_qt4 @@ -740,14 +585,6 @@ 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 License: LGPL v2.1 or later Summary: Include Files and Libraries Mandatory for Development @@ -771,14 +608,6 @@ 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 - %endif %if %build_core %if %build_mono @@ -801,14 +630,6 @@ SHOULDs of the mDNS and DNS-SD RFCs. It passes all tests in the Apple Bonjour conformance test suite. In addition, it supports some nifty things, like correct mDNS reflection across LAN segments. - - -Authors: --------- - Lennart Poettering - Trent Lloyd - Sebastien Estienne - %endif %lang_package %endif @@ -961,7 +782,7 @@ rm $RPM_BUILD_ROOT%{_libdir}/pkgconfig/avahi-client.pc rm $RPM_BUILD_ROOT%{_libdir}/pkgconfig/avahi-core.pc %if %build_glib2 rm $RPM_BUILD_ROOT%{_bindir}/avahi-bookmarks -rm -r $RPM_BUILD_ROOT%{py_sitedir}/avahi +rm -r $RPM_BUILD_ROOT%{python_sitelib}/avahi rm $RPM_BUILD_ROOT%{_mandir}/man1/avahi-bookmarks.1* rm $RPM_BUILD_ROOT%{_mandir}/man1/avahi-browse-domains.1* rm $RPM_BUILD_ROOT%{_mandir}/man1/avahi-browse.1* @@ -1153,8 +974,8 @@ fi %doc %{_mandir}/man1/avahi-bookmarks.1* %{_sbindir}/rcavahi-bookmarks %{_sysconfdir}/init.d/avahi-bookmarks -%{py_sitedir}/avahi -%{py_sitedir}/avahi/ServiceTypeDatabase.py +%{python_sitelib}/avahi +%{python_sitelib}/avahi/ServiceTypeDatabase.py %files utils %defattr(-,root,root) @@ -1226,7 +1047,7 @@ fi %{_bindir}/avahi-discover %{_datadir}/applications/avahi-discover.desktop %doc %{_mandir}/man1/avahi-discover.1* -%{py_sitedir}/avahi_discover +%{python_sitelib}/avahi_discover %files -n avahi-utils-gtk %defattr(-,root,root) @@ -1302,389 +1123,3 @@ fi %endif %changelog -* Thu May 28 2009 vuntz@novell.com -- Remove perl-XML-Parser BuildRequires. -* Thu Apr 16 2009 vuntz@novell.com -- Update to version 0.6.25: - + Use send_destination for DBus rule - + Make .desktop files pass desktop-file-validate - + CVE-2009-0758: Reflector creates packet storm on legacy unicast - traffic - + Build system fixes. - + Updated translations. -- Respin avahi-desktop.patch. -- Drop bnc_459007.patch: fixed upstream. -* Mon Feb 02 2009 vuntz@novell.com -- Call %%suse_update_desktop_file on bssh and bvnc. -* Mon Feb 02 2009 vuntz@novell.com -- Update avahi-desktop.patch to not add X-SuSE-translate=true in - .desktop files. -* Fri Jan 16 2009 ro@suse.de -- readd libavahi-common.la, breaks > 100 packages if done this way -* Wed Jan 14 2009 sbrabec@suse.cz -- avahi-glib2-utils-gtk renamed back to its correct name - avahi-utils-gtk (bnc#456418). -- Removed pointless libtool .la file. -* Tue Jan 13 2009 olh@suse.de -- obsolete old -XXbit packages (bnc#437293) -* Tue Jan 06 2009 mboman@suse.de -- Update to version 0.6.24: - + A huge number of bug fixes, including a security relavant one - (low risk) - + Add two new configuration directives "allow-interfaces" and - "deny-interfaces" which can be used to make Avahi ignore certain - network interfaces or only use certain network interfaces - + Translation updates -- Remove avahi-man-selection.patch. Fixed upstream -- Remove avahi-no-gtk-no-interfaces.patch. Fixed upstream. -- Remove avahi-bookmarks-no-pygtk.patch. Fixed upstream -- Remove avahi-no-gtk-python.patch. Fixed upstream -- Remove avahi-allocsize.patch. Fixed upstream -- Remove avahi-dnsconfd-netconfig.patch. Fixed upstream -* Wed Dec 17 2008 mauro@suse.de -- Added bnc_459007.patch to fix bnc#459007 - + Fixes CVE-2008-5081 -* Mon Dec 15 2008 sbrabec@suse.cz -- avahi-discover.glade is required by avahi-utils-gtk and - python-avahi-gtk => move to avahi (bnc#456418). -- Upgrade protection for avahi-utils-gtk built as - avahi-glib2-utils-gtk (bnc#456418). -* Mon Nov 24 2008 sbrabec@suse.cz -- Removed dependency libavahi-common3 -> avahi (bnc#447101). -* Thu Oct 23 2008 maw@suse.de -- Make debug packages require a specific %%{version}-%%{release}. -* Fri Oct 17 2008 lnussel@suse.de -- use netconfig for avahi-dnsconfd (bnc#431240) -- disable avahi-dnsconfd by default (bnc#431240) -- remove 0pointer.de and zeroconf.org from default config (bnc#433359) -- fix indenting in init script (bnc#435506) -* Fri Sep 12 2008 aj@suse.de -- Remove languages directory ownership, it's now part of filesystem. -* Fri Sep 05 2008 ro@suse.de -- add Required-Stop to initscripts -* Mon Sep 01 2008 meissner@suse.de -- Added GCC attribute alloc_size markup for allocator functions -* Fri Jul 18 2008 sbrabec@suse.cz -- Build glib2, gobject and python stuff separately to break build - loop cups -> gtk2 -> avahi -> cups. -- Split avahi-python-gtk from avahi-python. -- Updated to version 0.6.23: - * A lot of translation updates - * Beef up bnvc quite a bit, including passing a domain to browse - in - * Increase numer of open files resource limit to 300 so that we - can deal with more clients simultaneously. - * Rework 'poof' algorithm a bit to reduce traffic load on noisy - links. - * Build fixes - * Minor other updates - * Backwards compatible with Avahi 0.6.x with x < 23. -* Wed Jul 16 2008 coolo@suse.de -- don't build cycle between avahi and cups -* Tue May 27 2008 coolo@suse.de -- fix baselibs config one more time -* Sat May 17 2008 coolo@suse.de -- 10.2 had even more xxbit packages to be renamed -* Sun May 11 2008 coolo@suse.de -- fix rename of xxbit packages -* Tue Apr 29 2008 cthiel@suse.de -- obsolete avahi-, avahi-compat-mDNSResponder- and - avahi-glib- via baselibs.conf -* Thu Apr 10 2008 ro@suse.de -- added baselibs.conf file to build xxbit packages - for multilib support -* Tue Mar 11 2008 sbrabec@suse.cz -- Fix build failure of avahi-mono. -* Wed Mar 05 2008 sbrabec@suse.cz -- Build Qt bindings in separate packages to shorten build path and - unneeded triggering for rebuild. -- Spec file rewritten to allow simple and fast build per partes. -* Wed Jan 30 2008 sbrabec@suse.cz -- Fixed init scripts (bnc#332964). -* Mon Jan 21 2008 ro@suse.de -- same for libavahi-glib1 and libavahi-ui0 -* Sun Jan 20 2008 ro@suse.de -- avahi-mono: buildreq libavahi-client3 (for mono-find-requires) -* Wed Dec 19 2007 jpr@suse.de -- Update to 0.6.22 - * i18n support - * Documentation and example code updates - * Support for registering the Avahi documentation in devhelp - (needs manual setup) - * Added a new component libavahi-gobject, which is a - GObjectified version of the Avahi API - * Major BSD compatibility improvements - * avahi-ui: Allow overwriting of pretty service name by the - application - * Service type database updates - * Add new option --parsable to avahi-browse - * Make avahi-autoipd actually produce correct ARP packets - * Add FreeBSD kqueue support for watching /etc/avahi/services - * Use search domain from /etc/resolv.conf as additional browse - domains. - * No longer return a conflict error when two local applications - register identical RRs. - * Properly find alternative service/host names for very long names - * DNS name compression fix (Sjoerd Simons) - * Fedora init script order fix - * Several fixes to make gcc produces less warnings - * Minor other updates -- Package avahi-discover-standalone in gtk-utils with its glade files -* Sun Oct 21 2007 coolo@suse.de -- fix provides, obsoleting something another package provides creates - a conflict between them -* 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). -* Wed Sep 05 2007 sbrabec@suse.cz -- Start avahi by default (#298872). -- Handle avahi-bookmarks daemon in scriptlets. -* Tue Aug 07 2007 maw@suse.de -- But that macro is deprecated (http://en.opensuse.org/Packaging/SUSE_Package_Conventions/RPM_Macros#3.28._.25run_ldconfig_.28deprecated.29) - so replace it with /sbin/ldconfig. -* Mon Aug 06 2007 bk@suse.de -- replace -p /usr/sbin/ldconfig with %%{run_ldconfig} -* Mon Jul 30 2007 aj@suse.de -- Add gcc-c++ to BuildRequires. -* Tue Jul 24 2007 aj@suse.de -- Resort spec file so that mDNSResponder is provided again. -* Mon Jul 16 2007 aj@suse.de -- Fix spec file. -* Mon Jul 16 2007 aj@suse.de -- Use extra spec file for avahi-mono to avoid build cycle - avahi->gnome->mono->avahi. -* Thu Jul 05 2007 maw@suse.de -- Build require gtk2-devel. -* Thu Jul 05 2007 maw@suse.de -- Don't remove libavahi-common.la, because many things depend on it -- Make avahi-mono require gtk-sharp2. -- Update avahi-gacdir.patch, fixing the build on biarch platforms. -* Thu Jul 05 2007 maw@suse.de -- Remove some extraneous comments in the .spec file. -* Tue Jul 03 2007 maw@suse.de -- Update to version 0.6.20: - + Various bug fixes and portability fixes - + New features, including a new libavahi-ui library and tools - to exploit it - + A fix for a local DoS vulnerability (b.n.c #287123 and - CVE-2007-3372) -- Remove upstreamed patches: avahi-python-compile.patch and - avahi-compat-libdns_sd-fixes.patch; rename - avahi-discover-icon.patch to avahi-desktop.patch, and fix more - .desktop files therein -- Buildrequire gtk-sharp2. -* Wed Jun 06 2007 sbrabec@suse.cz -- Removed invalid desktop Category "Application" (#254654). -* Thu May 24 2007 ro@suse.de -- fix some rpmlint errors (call ldconfig in post scripts) -* Tue Mar 27 2007 crivera@suse.de -- Improve libdns_sd compat support. This helps fix 214887. -* Mon Mar 26 2007 rguenther@suse.de -- Add gdbm-devel and zlib-devel BuildRequires. -* Tue Mar 13 2007 crivera@suse.de -- Rework the sub package split. There is a new package, avahi-python, - that contains all of the Python utilities. This removes all Python - dependencies from the base avahi package. This fixes 245390. -* Sat Mar 10 2007 crivera@suse.de -- Install avahi.firewill in /etc/sysconfig/SuSEfirewall2.d/services - instead of /usr/share/SuSEfirewall2/services. This allows avahi - to build again. This also depends on the latest dbus-1-python - submission being approved. -* Tue Feb 27 2007 crivera@suse.de -- Remove netdev patch in favor of using the configure parameter - instead. This also fixes a similar issue with the autoipd group - and user. This fixes 237145. -* Mon Feb 26 2007 crivera@suse.de -- Replace the non-existent "netdev" group with the "avahi" group in - avahi-dbus.conf. This fixes 237145. -- Remove Application, Utility, Network, and Settings categories from - the .desktop file. This fixes 244464. -* Wed Feb 21 2007 sbrabec@suse.cz -- Updated to a bugfix release 0.6.17: - * Don't accept "localhost" as a local mDNS host name - * Allow running avahi-bookmarks as CGI script - * Improve libdns_sd compatibility - * Stability: libdns_sd mutex locking order fix - * Publish IPv6 addresses via IPv4 and vice versa - * IA64 fixes - * A lot of minor cleanups and fixes -- Fixed python dependencies (#244457). -- Fixed howl compatibility links (#244486). -- Fixed python byte-compilation (#244458). -- Added avahi-bookmarks init script. -- Added SuSEfirewall2 rule. -* Tue Feb 13 2007 sbrabec@suse.cz -- Do not build unusable static libraries (#238552#c17). -* Thu Feb 01 2007 ro@suse.de -- removed gnome-nettool from BuildRequires (and Recommends) - (causes a build-cycle) and use local copy of the icon -* Fri Jan 26 2007 ro@suse.de -- add mono-devel to build requires to make mono-reqprov work -* Wed Jan 24 2007 sbrabec@suse.cz -- Updated to version 0.6.16 (CVE-2006-5461, CVE-2006-6870): - * Revert previous patch to check nlmsg_pid as it is bogus and - breaks in many cases, notably when using NetworkManager. - * Replace with new SO_PASSCRED-based check of the sending UID - which seems to work better. - * Handle some errors in libdns_sd more gracefully the way the real - libdns_sd does - * Apply fix for Linux 2.6.19+ where IFA_RTA / IFLA_RTA is no - longer defined - * Fix doxygen comments for avahi watch - * Make d-bus version detection work for >= 1.0 - * Dont dbus_connection_close on shared dbus connections - * Fix potential endless loop in dns label unpacking code - * Fix bogus assertion in client-publish-service.c example - * Mild fix to some doxygen docs for avahi-common/address.h - * Fix passing in custom priviledged group (previously ignored - setting) - * Check that netlink messages actually originate from the kernel - and not another process. - * Fix dbus_service_browser not setting - AVAHI_LOOKUP_RESULT_OUR_OWN. -* Sun Jan 21 2007 dmueller@suse.de --compat-mDNSResponder-devel should require avahi-devel -* Sat Jan 20 2007 aj@suse.de -- Fix avahi-sharp.pc file to use correct gcac location. -- Add obsoletes and provides for mDNSResponder. -* Thu Dec 14 2006 sbrabec@suse.cz -- Created init script symlinks in /usr/sbin (#228203). -* Sun Nov 12 2006 thoenig@suse.de -- Update patch avahi-dbus-request-name-flags-fix-thoenig-02.patch: - Be precise with regard to the minor version of D-Bus -* Sun Nov 12 2006 thoenig@suse.de -- Add patch avahi-dbus-request-name-flags-fix-thoenig-01.patch: - Fix flawed logic for flags passed to dbus_bus_request_name() -* Mon Oct 30 2006 sbrabec@suse.cz -- Check the sender ID of netlink packets before using them - (#216219). -* Sun Oct 15 2006 danw@suse.de -- Remove dead patches -* Mon Oct 09 2006 sbrabec@suse.cz -- Build in older products. -- Enabled parallel build. -* Fri Sep 22 2006 aj@suse.de -- Fix filelist for python upgrade. -- Build everything with RPM_OPT_FLAGS. -* Mon Sep 18 2006 jhargadon@suse.de -- update to version 0.6.14 -- Add new daemon "avahi-autoipd" which is an implementation of - IPv4LL as defined in RFC3927, a technology for assigning link-local IP - addresses without DHCP server. The same functionality has been available on - Windows under the name APIPA. While it is not the first implemenatation of - this technology for Free operating systems it is clearly the most powerful - and hopefully even the most secure. (Because it chroot()s and drops - priviliges and suchlike) -- Fix a segfault in the code handling static host name registrations -- Add a few new entries to the service type database -- s/D-?BUS/D-Bus/g -- Documentation updates -- Fix service type database building on Solaris -- Make use of newer D-Bus APIs -- Fix random seed initialization -- Install SFTP static service file by default -- Other minor code cleanups -- removed upstreamed patches -* Sun Sep 03 2006 aj@suse.de -- Follow package rename qt->libqt4. -* Thu Aug 24 2006 cthiel@suse.de -- fix build -* Wed Aug 16 2006 cthiel@suse.de -- buildrequire python-gtk-devel instead of python-gtk -* Mon Aug 14 2006 thoenig@suse.de -- Add patch avahi-dbus-api-fix-thoenig-01.patch: Use - dbus_connection_close, not dbus_connection_disconnect -* Fri Aug 11 2006 cthiel@suse.de -- remove avahi-0.6.10-pygtk-hack.patch, since python-gtk has been fixed in - the meantime -* Sun Aug 06 2006 cthiel@suse.de -- fixed build by adding avahi-0.6.10-pygtk-hack.patch to hack around an - unfavorable configure check -* Mon Jul 03 2006 schwab@suse.de -- Fix quoting in configure script. -- Fix invalid redefinition of docdir. -* Mon May 15 2006 sbrabec@suse.cz -- Updated to version 0.6.10 (#137781). - * Fix a buffer overflow in avahi-core - * Refuse to process invalid UTF8 data - * Automatically reconnect to the DBUS if we're kicked. (Works only if - chroot() is disabled) - * Don't hit an assert() in the client libs when the Avahi daemon is - terminated - * Enumerate all service types in the database in the Service - Discovery Applet for Gnome - * Improve the Bonjour compatibility layer to make it survive - GnomeMeeting's broken usage - * Deal properly with local non-ASCII hostnames - * AMD64 and FreeBSD portability fixes - * Filter double DNS server entries in avahi-dnsconfd - * Fix a locking bug in avahi-sharp's EntryGroup.AddService() - * Ported to Solaris (incomplete) - * Add _airport._tcp to our service type database -* Tue May 09 2006 sbrabec@suse.cz -- Fixed buffer overflow in avahi_record_to_string() (#137781#c7). -* Mon Apr 24 2006 sbrabec@suse.cz -- Replaced Obsoletes by Conflicts for mDNSResponder* (#149676). -* Wed Apr 19 2006 jpr@suse.de -- Fix compat layer ABI inconsistencies with mDNSResponder (part of - [#149676]) -* Wed Apr 05 2006 sbrabec@suse.cz -- Wait for daemon initialization in the init script (#150902). -* Tue Apr 04 2006 sbrabec@suse.cz -- Use Provides and Obsoletes instead of Conflicts to allow seamless - replacement. -* Mon Mar 20 2006 sbrabec@suse.cz -- Call %%insserv_cleanup in %%postun. -* Thu Feb 09 2006 sbrabec@suse.cz -- Provide libdns_sd.so RPM symbol, as mDNSResponder does. -- Reduced BuildRequires. -* Thu Feb 09 2006 sbrabec@suse.cz -- Fixed circular dependency between avahi and avahi-glib - (avahi-discover moved to avahi-glib). -* Wed Jan 25 2006 mls@suse.de -- converted neededforbuild to BuildRequires -* Mon Jan 23 2006 sbrabec@suse.cz -- Updated to version 0.6.5. -- Enable howl compatibility layer as separate packages. -* Mon Jan 16 2006 sbrabec@suse.cz -- Updated to version 0.6.4. -* Tue Dec 20 2005 ro@suse.de -- fix build with dbus-1 0.60 -- added libxml2-python to nfb -* Fri Dec 16 2005 rml@suse.de -- Move libdns_sd.so to avahi-compat-mDNSResponder from - avahi-compat-mDNSResponder-devel (fix up requires/provides) -* Fri Dec 02 2005 sbrabec@suse.cz -- Provide dns_sd.h compatibility symlink. -* Fri Dec 02 2005 sbrabec@suse.cz -- Enable mDNSResponder compatibility layer as separate packages. -* Fri Dec 02 2005 sbrabec@suse.cz -- Call aclocal to compile in PLUS. -- Enabled qt4 bindings. -- Fixed file ownership. -- Disabled parallel build - mono fails often. -* Thu Dec 01 2005 sbrabec@suse.cz -- Bi-arch fix. -- Build as user. -- Enabled parallel build. -* Wed Nov 30 2005 sbrabec@suse.cz -- Updated to version 0.6.1. -- Moved all devel files and Requires to devel subpackage. -* Wed Oct 12 2005 ro@suse.de -- use gnome2-devel-packages in nfb and cleanup nfb -- fix build of sharp part on x86_64 -* Mon Oct 10 2005 ro@suse.de -- removed restart_on_update in postinstall - (only needed in postuninstall) -* Thu Oct 06 2005 jpr@suse.de -- Initial check in diff --git a/avahi_spec-prepare.sh b/avahi_spec-prepare.sh index 1d6f01b..3c5b912 100644 --- a/avahi_spec-prepare.sh +++ b/avahi_spec-prepare.sh @@ -48,7 +48,9 @@ sed ' /^# WARNING: After editing/,/^# to update spec files/d /^%define[[:space:]]*_name/i \ # Do not edit this auto generated file! Edit avahi.spec. -' <$1/$ORIG_SPEC.spec >$1/$ORIG_SPEC-mono.spec +' <$1/$ORIG_SPEC.spec >$1/$ORIG_SPEC-mono.spec.new +perl $1/update_spec.pl $1/$ORIG_SPEC-mono.spec.new attributes > $1/$ORIG_SPEC-mono.spec +rm $1/$ORIG_SPEC-mono.spec.new # Edit file to fit -glib2 build needs: sed ' @@ -61,7 +63,9 @@ sed ' /^# WARNING: After editing/,/^# to update spec files/d /^%define[[:space:]]*_name/i \ # Do not edit this auto generated file! Edit avahi.spec. -' <$1/$ORIG_SPEC.spec >$1/$ORIG_SPEC-glib2.spec +' <$1/$ORIG_SPEC.spec >$1/$ORIG_SPEC-glib2.spec.new +perl $1/update_spec.pl $1/$ORIG_SPEC-glib2.spec.new attributes > $1/$ORIG_SPEC-glib2.spec +rm $1/$ORIG_SPEC-glib2.spec.new # Edit file to fit -qt4 build needs: sed ' @@ -74,7 +78,10 @@ sed ' /^# WARNING: After editing/,/^# to update spec files/d /^%define[[:space:]]*_name/i \ # Do not edit this auto generated file! Edit avahi.spec. -' <$1/$ORIG_SPEC.spec >$1/$ORIG_SPEC-qt4.spec +' <$1/$ORIG_SPEC.spec >$1/$ORIG_SPEC-qt4.spec.new +perl $1/update_spec.pl $1/$ORIG_SPEC-qt4.spec.new attributes > $1/$ORIG_SPEC-qt4.spec +rm $1/$ORIG_SPEC-qt4.spec.new + # Not wanted for avahi: #cp -a $1/$ORIG_SPEC.changes $1/$ORIG_SPEC-glib2.changes diff --git a/update_spec.pl b/update_spec.pl new file mode 100644 index 0000000..7110b1c --- /dev/null +++ b/update_spec.pl @@ -0,0 +1,106 @@ +#! /usr/bin/perl + +my $name = $ARGV[0]; +$name =~ s,.*/,,; +$name =~ s,\.spec.*,,; + +my %attributes = (); +open(FILE, $ARGV[1]) || die 'no attributes'; +my $pack = undef; +my $text = undef; +while ( ) { + if (/^\+(.*)$/) { $pack = $1; $text = ''; next } + if (/^-(.*)$/) { + if ($pack ne $1) { + die "$pack and $1 do not match"; + } + $text =~ s,^\s*,,; + $text =~ s,\s*$,,; + $attributes{$pack} = $text; + $text = undef; + $pack = undef; + next; + } + if (defined $text) { + $text .= $_; + } elsif (/^(\S*)\s*(.*)$/) { + my $attr = $1; + my $string = $2; + $string =~ s,^\s*,,; + $string =~ s,\s*$,,; + $attributes{$attr} = $string; + } +} +close(FILE); + +open(FILE, $ARGV[0]); + +sub description() +{ + if (/^%description\s*(.*)\s*/) { + my $suffix = $1; + my $pname = $name; + + if ($suffix =~ m/-n\s*(.*)/) { + $pname = $1; + } else { + $pname = "$name-$suffix" if ($suffix); + } + + if (defined $attributes{"description.$pname"}) { + print $_; + my $descr = $attributes{"description.$pname"}; + print "$descr\n"; + $_ = ''; + do { + $_ = ; + } while ( $_ !~ /^%/ && $_ !~ /^@/ ); + print "\n"; + description(); + } + } + +} + +# current subpackage +my $pname = $name; + +while ( ) +{ + if (/^Name:\s*(.*)/) { + $name = $1; + $pname = $1; + } + description(); + + if (/^%package\s*(.*)/) { + my $suffix = $1; + if ($suffix =~ m/-n\s*(.*)/) { + $pname = $1; + } else { + $pname = "$name-$1"; + } + } + + if (/^(Summary:\s*)(.*)$/) { + if (defined $attributes{"summary.$pname"}) { + print $1 . $attributes{"summary.$pname"} ."\n"; + next; + } + } + if (/^(License:\s*)(.*)$/) { + if (defined $attributes{"license.$pname"}) { + print $1 . $attributes{"license.$pname"} ."\n"; + next; + } + } + if (/^(Group:\s*)(.*)$/) { + if (defined $attributes{"group.$pname"}) { + print $1 . $attributes{"group.$pname"} ."\n"; + next; + } + } + print $_; +} + +close(FILE);