Hello community,
here is the log from the commit of package avahi for openSUSE:Factory
checked in at Mon Aug 17 14:19:55 CEST 2009.
--------
--- avahi/avahi-glib2.changes 2009-01-14 17:46:55.000000000 +0100
+++ /mounts/work_src_done/STABLE/avahi/avahi-glib2.changes 2009-08-09 18:58:52.000000000 +0200
@@ -1,0 +2,5 @@
+Sun Aug 9 12:43:26 CEST 2009 - coolo@novell.com
+
+- use new python macros
+
+-------------------------------------------------------------------
avahi-mono.changes: same change
avahi-qt4.changes: same change
--- avahi/avahi.changes 2009-05-28 18:46:08.000000000 +0200
+++ /mounts/work_src_done/STABLE/avahi/avahi.changes 2009-08-13 19:18:11.000000000 +0200
@@ -1,0 +2,15 @@
+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
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
New:
----
attributes
update_spec.pl
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ avahi-glib2.spec ++++++
--- /var/tmp/diff_new_pack.ej8rNT/_old 2009-08-17 14:19:25.000000000 +0200
+++ /var/tmp/diff_new_pack.ej8rNT/_new 2009-08-17 14:19:25.000000000 +0200
@@ -31,7 +31,7 @@
%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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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-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 @@
%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 @@
%{_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)
++++++ avahi-mono.spec ++++++
--- /var/tmp/diff_new_pack.ej8rNT/_old 2009-08-17 14:19:25.000000000 +0200
+++ /var/tmp/diff_new_pack.ej8rNT/_new 2009-08-17 14:19:25.000000000 +0200
@@ -31,7 +31,7 @@
%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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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-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 @@
%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 @@
%{_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)
++++++ avahi-qt4.spec ++++++
--- /var/tmp/diff_new_pack.ej8rNT/_old 2009-08-17 14:19:25.000000000 +0200
+++ /var/tmp/diff_new_pack.ej8rNT/_new 2009-08-17 14:19:25.000000000 +0200
@@ -31,7 +31,7 @@
%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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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-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 @@
%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 @@
%{_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)
++++++ avahi.spec ++++++
--- /var/tmp/diff_new_pack.ej8rNT/_old 2009-08-17 14:19:25.000000000 +0200
+++ /var/tmp/diff_new_pack.ej8rNT/_new 2009-08-17 14:19:25.000000000 +0200
@@ -33,7 +33,7 @@
%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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
addition, it supports some nifty things, like correct mDNS reflection
across LAN segments.
-
-
-Authors:
---------
- Lennart Poettering
- Trent Lloyd
- Sebastien Estienne