Hello community,
here is the log from the commit of package avahi
checked in at Wed Dec 19 22:31:01 CET 2007.
--------
--- avahi/avahi.changes 2007-10-21 14:20:40.000000000 +0200
+++ /mounts/work_src_done/STABLE/avahi/avahi.changes 2007-12-19 16:36:40.422267000 +0100
@@ -1,0 +2,28 @@
+Wed Dec 19 16:33:02 CET 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
+
+-------------------------------------------------------------------
Old:
----
avahi-0.6.20.tar.bz2
New:
----
avahi-0.6.22.tar.bz2
avahi-empty-share-dir.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ avahi-mono.spec ++++++
--- /var/tmp/diff_new_pack.rw1350/_old 2007-12-19 22:29:57.000000000 +0100
+++ /var/tmp/diff_new_pack.rw1350/_new 2007-12-19 22:29:57.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package avahi-mono (Version 0.6.20)
+# spec file for package avahi-mono (Version 0.6.22)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -14,8 +14,8 @@
%define _name avahi
%define build_mono 1
# WARNING: Do not edit this auto generated file.
-Version: 0.6.20
-Release: 67
+Version: 0.6.22
+Release: 1
# WARNING: After changing versions please call Re or rpmbuild to auto-update spec file:
#%(sh %{_sourcedir}/%{name}_spec-prepare.sh %{_sourcedir} %{name})
%define avahi_client_soname 3
@@ -23,23 +23,31 @@
%define avahi_core_soname 5
%define avahi_ui_soname 0
%define avahi_glib_soname 1
+%define avahi_gobject_soname 0
%define avahi_qt3_soname 1
%define avahi_qt4_soname 1
Url: http://www.avahi.org/
Group: Development/Languages/Mono
-License: LGPL v2 or later
+License: LGPL v2.1 or later
Summary: Mono Bindings for avahi, the D-BUS Service for Zeroconf and Bonjour
Source: %{_name}-%{version}.tar.bz2
Source1: gnome-nettool2.png
Source2: avahi-bookmarks.init
Source3: avahi.firewall
Source4: %{_name}_spec-prepare.sh
+#PATCH-FIX-OPENSUSE avahi-gacdir.patch -- Mono libs are in $prefix/lib on suse
Patch0: avahi-gacdir.patch
+#PATCH-FIX-UPSTREAM avahi-desktop.patch bnc254654 sbrabec@suse.de
Patch1: avahi-desktop.patch
+#PATCH-FIX-UPSTREAM avahi-init-lsb.patch -- committed after 0.6.22 release upstream
Patch2: avahi-init-lsb.patch
+#PATCH-FIX-UPSTREAM avahi-empty-share-dir.patch jpr@novell.com -- mailed maintainer
+Patch3: avahi-empty-share-dir.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-BuildRequires: dbus-1-devel doxygen fdupes gcc-c++ gdbm-devel graphviz libdaemon-devel libglade2-devel update-desktop-files zlib-devel
+BuildRequires: dbus-1-devel doxygen fdupes gcc-c++ gdbm-devel graphviz intltool libdaemon-devel libglade2-devel update-desktop-files zlib-devel
%if !%build_mono
+PreReq: pwdutils
+Requires: %{name}-lang = %{version}
# For python bindings and utilities:
BuildRequires: dbus-1-python python-devel python-gdbm python-gtk-devel
# For qt3 bindings
@@ -78,6 +86,7 @@
Sebastien Estienne
%if !%build_mono
+
%package -n libavahi-client3
Summary: D-BUS Service for Zeroconf and Bonjour
Group: System/Libraries
@@ -209,6 +218,31 @@
Trent Lloyd
Sebastien Estienne
+%package -n libavahi-gobject0
+Summary: D-BUS Service for Zeroconf and Bonjour
+Group: System/Daemons
+
+%description -n libavahi-gobject0
+Avahi is an implementation of the DNS Service Discovery and Multicast
+DNS specifications for Zeroconf Computing. It uses D-BUS for
+communication between user applications and a system daemon. The daemon
+is used to coordinate application efforts in caching replies, necessary
+to minimize the traffic imposed on networks.
+
+The Avahi mDNS responder is now complete with features, 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.
+
+
+
+Authors:
+--------
+ Lennart Poettering
+ Trent Lloyd
+ Sebastien Estienne
+
%package -n libavahi-qt3-1
Summary: Qt3 Bindings for avahi, the D-BUS Service for Zeroconf and Bonjour
Group: System/GUI/KDE
@@ -393,6 +427,7 @@
%package -n python-avahi
Summary: A set of Avahi utilities written in Python
+PreReq: coreutils
Requires: %{name} = %{version} python-gdbm python-gtk dbus-1-python python-twisted python-twisted-web
Group: Development/Languages/Python
# Old name used for <= 10.3:
@@ -481,6 +516,32 @@
Trent Lloyd
Sebastien Estienne
+%package -n libavahi-gobject-devel
+Summary: D-BUS Service for Zeroconf and Bonjour
+Requires: libavahi-devel = %{version} libavahi-glib-devel libavahi-gobject0 = %{version} glib2-devel
+Group: System/Daemons
+
+%description -n libavahi-gobject-devel
+Avahi is an implementation of the DNS Service Discovery and Multicast
+DNS specifications for Zeroconf Computing. It uses D-BUS for
+communication between user applications and a system daemon. The daemon
+is used to coordinate application efforts in caching replies, necessary
+to minimize the traffic imposed on networks.
+
+The Avahi mDNS responder is now complete with features, 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.
+
+
+
+Authors:
+--------
+ Lennart Poettering
+ Trent Lloyd
+ Sebastien Estienne
+
%package -n libavahi-qt3-devel
Summary: Include Files and Libraries Mandatory for Development
Requires: libavahi-devel = %{version} libavahi-qt3-1 = %{version} qt3-devel
@@ -600,14 +661,19 @@
Sebastien Estienne
%endif
+%if !%build_mono
+%lang_package
+%endif
+
%prep
%setup -q -n %{_name}-%{version}
%patch0
%patch1 -p1
%patch2
+%patch3
%build
-ACLOCAL="aclocal -I common" autoreconf -f -i
+autoreconf -f -i
%configure\
--libexecdir=%{_prefix}/lib\
--disable-static\
@@ -632,10 +698,10 @@
--with-avahi-priv-access-group=avahi\
--with-autoipd-user=avahi\
--with-autoipd-group=avahi
-make %{?jobs:-j%jobs}
+%__make %{?jobs:-j%jobs}
%install
-make DESTDIR=$RPM_BUILD_ROOT install
+%makeinstall
## WARNING: found empty dependency_libs variable. please remove the
## pointless libtool .la file
## /var/tmp/avahi-0.6.20-build/usr/lib64/lib\avahi-common.la
@@ -661,20 +727,22 @@
install -m 644 %{S:3} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/avahi
# FIXME: There are no better Categories in the spec (Monitor is not allowed in Network).
%suse_update_desktop_file -r avahi-discover GNOME System Monitor
+%find_lang %{name}
%endif
# Remove files if only building mono
%if %build_mono
rm -rf $RPM_BUILD_ROOT%{_bindir}/avahi-discover-standalone
-rm -rf $RPM_BUILD_ROOT%{_libdir}/libavahi-glib*.so.*
rm -rf $RPM_BUILD_ROOT%{_bindir}/avahi-browse*
rm -rf $RPM_BUILD_ROOT%{_bindir}/avahi-publish*
rm -rf $RPM_BUILD_ROOT%{_bindir}/avahi-resolve*
rm -rf $RPM_BUILD_ROOT%{_bindir}/avahi-set-host-name
+rm -rf $RPM_BUILD_ROOT%{_bindir}/bshell
rm -rf $RPM_BUILD_ROOT%{_bindir}/bssh
rm -rf $RPM_BUILD_ROOT%{_bindir}/bvnc
rm -rf $RPM_BUILD_ROOT%{_datadir}/avahi
rm -rf $RPM_BUILD_ROOT%{_datadir}/applications/bssh.desktop
rm -rf $RPM_BUILD_ROOT%{_datadir}/applications/bvnc.desktop
+rm -rf $RPM_BUILD_ROOT%{_datadir}/locale
rm -rf $RPM_BUILD_ROOT%{_libdir}/libavahi-client*.so.*
rm -rf $RPM_BUILD_ROOT%{_libdir}/libavahi-common*.so.*
rm -rf $RPM_BUILD_ROOT%{_libdir}/libavahi-core*.so.*
@@ -696,13 +764,18 @@
rm -rf $RPM_BUILD_ROOT%{_libdir}/libavahi-core*.so
rm -rf $RPM_BUILD_ROOT%{_libdir}/libavahi-common*.so
rm -rf $RPM_BUILD_ROOT%{_libdir}/libavahi-common*.*a
-rm -rf $RPM_BUILD_ROOT%{_libdir}/libavahi-glib*.*a
rm -rf $RPM_BUILD_ROOT%{_libdir}/libavahi-glib*.so
+rm -rf $RPM_BUILD_ROOT%{_libdir}/libavahi-glib*.so.*
+rm -rf $RPM_BUILD_ROOT%{_libdir}/libavahi-glib*.*a
+rm -rf $RPM_BUILD_ROOT%{_libdir}/libavahi-gobject*.so
+rm -rf $RPM_BUILD_ROOT%{_libdir}/libavahi-gobject*.so.*
+rm -rf $RPM_BUILD_ROOT%{_libdir}/libavahi-gobject*.*a
rm -rf $RPM_BUILD_ROOT%{_libdir}/libavahi-ui*.*a
rm -rf $RPM_BUILD_ROOT%{_libdir}/libavahi-ui*.*so
rm -rf $RPM_BUILD_ROOT%{_libdir}/pkgconfig/avahi-client.pc
rm -rf $RPM_BUILD_ROOT%{_libdir}/pkgconfig/avahi-core.pc
rm -rf $RPM_BUILD_ROOT%{_libdir}/pkgconfig/avahi-glib.pc
+rm -rf $RPM_BUILD_ROOT%{_libdir}/pkgconfig/avahi-gobject.pc
rm -rf $RPM_BUILD_ROOT%{_libdir}/pkgconfig/avahi-ui.pc
%endif
%fdupes $RPM_BUILD_ROOT%{_libdir}
@@ -781,6 +854,10 @@
%postun -n libavahi-qt4-1 -p /sbin/ldconfig
+%post -n libavahi-gobject0 -p /sbin/ldconfig
+
+%postun -n libavahi-gobject0 -p /sbin/ldconfig
+
%post -n libavahi-glib1 -p /sbin/ldconfig
%postun -n libavahi-glib1 -p /sbin/ldconfig
@@ -826,6 +903,10 @@
%{_sysconfdir}/dbus-1/system.d/*.conf
%{_sysconfdir}/init.d/avahi-dnsconfd
%{_sysconfdir}/init.d/avahi-daemon
+%if !%build_mono
+
+%files lang -f %{name}.lang
+%endif
%files -n libavahi-client3
%defattr(-,root,root)
@@ -845,9 +926,12 @@
%files -n libavahi-glib1
%defattr(-,root,root)
-%{_bindir}/avahi-discover-standalone
%{_libdir}/libavahi-glib*.so.*
+%files -n libavahi-gobject0
+%defattr(-,root,root)
+%{_libdir}/libavahi-gobject*.so.*
+
%files -n libavahi-qt3-1
%defattr(-,root,root)
%{_libdir}/libavahi-qt3*.so.*
@@ -872,9 +956,11 @@
%{_bindir}/avahi-publish*
%{_bindir}/avahi-resolve*
%{_bindir}/avahi-set-host-name
-%{_datadir}/avahi
-%{_datadir}/applications/bssh.desktop
-%{_datadir}/applications/bvnc.desktop
+%dir %{_datadir}/avahi/
+%{_datadir}/avahi/avahi-service.dtd
+%{_datadir}/avahi/introspection
+%dir %{_libdir}/avahi/
+%{_libdir}/avahi/service-types.db
%{_datadir}/pixmaps/gnome-nettool2.png
%doc %{_mandir}/man1/avahi-browse*.1*
%doc %{_mandir}/man1/avahi-publish*.1*
@@ -883,14 +969,21 @@
%files utils-gtk
%defattr(-,root,root)
+%{_bindir}/bshell
%{_bindir}/bssh
%{_bindir}/bvnc
+%{_bindir}/avahi-discover-standalone
+%{_datadir}/applications/bssh.desktop
+%{_datadir}/applications/bvnc.desktop
+%dir %{_datadir}/avahi/
+%{_datadir}/avahi/interfaces
%doc %{_mandir}/man1/bssh.1.*
%doc %{_mandir}/man1/bvnc.1.*
%files -n python-avahi
%defattr(-,root,root)
%{py_sitedir}/avahi
+%{py_sitedir}/avahi_discover
%{_bindir}/avahi-discover
%{_bindir}/avahi-bookmarks
%doc %{_mandir}/man1/avahi-bookmarks.1*
@@ -928,6 +1021,13 @@
%{_libdir}/pkgconfig/avahi-glib.pc
%{_libdir}/pkgconfig/avahi-ui.pc
+%files -n libavahi-gobject-devel
+%defattr(-,root,root)
+%{_includedir}/avahi-gobject
+%{_libdir}/libavahi-gobject*.*a
+%{_libdir}/libavahi-gobject*.so
+%{_libdir}/pkgconfig/avahi-gobject.pc
+
%files -n libavahi-qt3-devel
%defattr(-,root,root)
%{_includedir}/avahi-qt3
@@ -957,6 +1057,7 @@
%{_libdir}/pkgconfig/avahi-compat-howl.pc
%{_libdir}/pkgconfig/howl.pc
%endif
+
%changelog
* Thu Oct 11 2007 - sbrabec@suse.de
- Updated dependencies.
++++++ avahi.spec ++++++
--- /var/tmp/diff_new_pack.rw1350/_old 2007-12-19 22:29:57.000000000 +0100
+++ /var/tmp/diff_new_pack.rw1350/_new 2007-12-19 22:29:57.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package avahi (Version 0.6.20)
+# spec file for package avahi (Version 0.6.22)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -14,8 +14,8 @@
%define _name avahi
%define build_mono 0
# WARNING: After editing this file please call Re or rpmbuild to update spec files:
-Version: 0.6.20
-Release: 52
+Version: 0.6.22
+Release: 1
# WARNING: After changing versions please call Re or rpmbuild to auto-update spec file:
#%(sh %{_sourcedir}/%{name}_spec-prepare.sh %{_sourcedir} %{name})
%define avahi_client_soname 3
@@ -23,23 +23,31 @@
%define avahi_core_soname 5
%define avahi_ui_soname 0
%define avahi_glib_soname 1
+%define avahi_gobject_soname 0
%define avahi_qt3_soname 1
%define avahi_qt4_soname 1
Url: http://www.avahi.org/
Group: System/Daemons
-License: LGPL v2 or later
+License: LGPL v2.1 or later
Summary: D-BUS Service for Zeroconf and Bonjour
Source: %{_name}-%{version}.tar.bz2
Source1: gnome-nettool2.png
Source2: avahi-bookmarks.init
Source3: avahi.firewall
Source4: %{_name}_spec-prepare.sh
+#PATCH-FIX-OPENSUSE avahi-gacdir.patch -- Mono libs are in $prefix/lib on suse
Patch0: avahi-gacdir.patch
+#PATCH-FIX-UPSTREAM avahi-desktop.patch bnc254654 sbrabec@suse.de
Patch1: avahi-desktop.patch
+#PATCH-FIX-UPSTREAM avahi-init-lsb.patch -- committed after 0.6.22 release upstream
Patch2: avahi-init-lsb.patch
+#PATCH-FIX-UPSTREAM avahi-empty-share-dir.patch jpr@novell.com -- mailed maintainer
+Patch3: avahi-empty-share-dir.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-BuildRequires: dbus-1-devel doxygen fdupes gcc-c++ gdbm-devel graphviz libdaemon-devel libglade2-devel update-desktop-files zlib-devel
+BuildRequires: dbus-1-devel doxygen fdupes gcc-c++ gdbm-devel graphviz intltool libdaemon-devel libglade2-devel update-desktop-files zlib-devel
%if !%build_mono
+PreReq: pwdutils
+Requires: %{name}-lang = %{version}
# For python bindings and utilities:
BuildRequires: dbus-1-python python-devel python-gdbm python-gtk-devel
# For qt3 bindings
@@ -79,6 +87,7 @@
Sebastien Estienne
%if !%build_mono
+
%package -n libavahi-client3
Summary: D-BUS Service for Zeroconf and Bonjour
Group: System/Libraries
@@ -210,6 +219,31 @@
Trent Lloyd
Sebastien Estienne
+%package -n libavahi-gobject0
+Summary: D-BUS Service for Zeroconf and Bonjour
+Group: System/Daemons
+
+%description -n libavahi-gobject0
+Avahi is an implementation of the DNS Service Discovery and Multicast
+DNS specifications for Zeroconf Computing. It uses D-BUS for
+communication between user applications and a system daemon. The daemon
+is used to coordinate application efforts in caching replies, necessary
+to minimize the traffic imposed on networks.
+
+The Avahi mDNS responder is now complete with features, 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.
+
+
+
+Authors:
+--------
+ Lennart Poettering
+ Trent Lloyd
+ Sebastien Estienne
+
%package -n libavahi-qt3-1
Summary: Qt3 Bindings for avahi, the D-BUS Service for Zeroconf and Bonjour
Group: System/GUI/KDE
@@ -394,6 +428,7 @@
%package -n python-avahi
Summary: A set of Avahi utilities written in Python
+PreReq: coreutils
Requires: %{name} = %{version} python-gdbm python-gtk dbus-1-python python-twisted python-twisted-web
Group: Development/Languages/Python
# Old name used for <= 10.3:
@@ -482,6 +517,32 @@
Trent Lloyd
Sebastien Estienne
+%package -n libavahi-gobject-devel
+Summary: D-BUS Service for Zeroconf and Bonjour
+Requires: libavahi-devel = %{version} libavahi-glib-devel libavahi-gobject0 = %{version} glib2-devel
+Group: System/Daemons
+
+%description -n libavahi-gobject-devel
+Avahi is an implementation of the DNS Service Discovery and Multicast
+DNS specifications for Zeroconf Computing. It uses D-BUS for
+communication between user applications and a system daemon. The daemon
+is used to coordinate application efforts in caching replies, necessary
+to minimize the traffic imposed on networks.
+
+The Avahi mDNS responder is now complete with features, 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.
+
+
+
+Authors:
+--------
+ Lennart Poettering
+ Trent Lloyd
+ Sebastien Estienne
+
%package -n libavahi-qt3-devel
Summary: Include Files and Libraries Mandatory for Development
Requires: libavahi-devel = %{version} libavahi-qt3-1 = %{version} qt3-devel
@@ -601,14 +662,19 @@
Sebastien Estienne
%endif
+%if !%build_mono
+%lang_package
+%endif
+
%prep
%setup -q -n %{_name}-%{version}
%patch0
%patch1 -p1
%patch2
+%patch3
%build
-ACLOCAL="aclocal -I common" autoreconf -f -i
+autoreconf -f -i
%configure\
--libexecdir=%{_prefix}/lib\
--disable-static\
@@ -633,10 +699,10 @@
--with-avahi-priv-access-group=avahi\
--with-autoipd-user=avahi\
--with-autoipd-group=avahi
-make %{?jobs:-j%jobs}
+%__make %{?jobs:-j%jobs}
%install
-make DESTDIR=$RPM_BUILD_ROOT install
+%makeinstall
## WARNING: found empty dependency_libs variable. please remove the
## pointless libtool .la file
## /var/tmp/avahi-0.6.20-build/usr/lib64/lib\avahi-common.la
@@ -662,20 +728,22 @@
install -m 644 %{S:3} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/avahi
# FIXME: There are no better Categories in the spec (Monitor is not allowed in Network).
%suse_update_desktop_file -r avahi-discover GNOME System Monitor
+%find_lang %{name}
%endif
# Remove files if only building mono
%if %build_mono
rm -rf $RPM_BUILD_ROOT%{_bindir}/avahi-discover-standalone
-rm -rf $RPM_BUILD_ROOT%{_libdir}/libavahi-glib*.so.*
rm -rf $RPM_BUILD_ROOT%{_bindir}/avahi-browse*
rm -rf $RPM_BUILD_ROOT%{_bindir}/avahi-publish*
rm -rf $RPM_BUILD_ROOT%{_bindir}/avahi-resolve*
rm -rf $RPM_BUILD_ROOT%{_bindir}/avahi-set-host-name
+rm -rf $RPM_BUILD_ROOT%{_bindir}/bshell
rm -rf $RPM_BUILD_ROOT%{_bindir}/bssh
rm -rf $RPM_BUILD_ROOT%{_bindir}/bvnc
rm -rf $RPM_BUILD_ROOT%{_datadir}/avahi
rm -rf $RPM_BUILD_ROOT%{_datadir}/applications/bssh.desktop
rm -rf $RPM_BUILD_ROOT%{_datadir}/applications/bvnc.desktop
+rm -rf $RPM_BUILD_ROOT%{_datadir}/locale
rm -rf $RPM_BUILD_ROOT%{_libdir}/libavahi-client*.so.*
rm -rf $RPM_BUILD_ROOT%{_libdir}/libavahi-common*.so.*
rm -rf $RPM_BUILD_ROOT%{_libdir}/libavahi-core*.so.*
@@ -697,13 +765,18 @@
rm -rf $RPM_BUILD_ROOT%{_libdir}/libavahi-core*.so
rm -rf $RPM_BUILD_ROOT%{_libdir}/libavahi-common*.so
rm -rf $RPM_BUILD_ROOT%{_libdir}/libavahi-common*.*a
-rm -rf $RPM_BUILD_ROOT%{_libdir}/libavahi-glib*.*a
rm -rf $RPM_BUILD_ROOT%{_libdir}/libavahi-glib*.so
+rm -rf $RPM_BUILD_ROOT%{_libdir}/libavahi-glib*.so.*
+rm -rf $RPM_BUILD_ROOT%{_libdir}/libavahi-glib*.*a
+rm -rf $RPM_BUILD_ROOT%{_libdir}/libavahi-gobject*.so
+rm -rf $RPM_BUILD_ROOT%{_libdir}/libavahi-gobject*.so.*
+rm -rf $RPM_BUILD_ROOT%{_libdir}/libavahi-gobject*.*a
rm -rf $RPM_BUILD_ROOT%{_libdir}/libavahi-ui*.*a
rm -rf $RPM_BUILD_ROOT%{_libdir}/libavahi-ui*.*so
rm -rf $RPM_BUILD_ROOT%{_libdir}/pkgconfig/avahi-client.pc
rm -rf $RPM_BUILD_ROOT%{_libdir}/pkgconfig/avahi-core.pc
rm -rf $RPM_BUILD_ROOT%{_libdir}/pkgconfig/avahi-glib.pc
+rm -rf $RPM_BUILD_ROOT%{_libdir}/pkgconfig/avahi-gobject.pc
rm -rf $RPM_BUILD_ROOT%{_libdir}/pkgconfig/avahi-ui.pc
%endif
%fdupes $RPM_BUILD_ROOT%{_libdir}
@@ -782,6 +855,10 @@
%postun -n libavahi-qt4-1 -p /sbin/ldconfig
+%post -n libavahi-gobject0 -p /sbin/ldconfig
+
+%postun -n libavahi-gobject0 -p /sbin/ldconfig
+
%post -n libavahi-glib1 -p /sbin/ldconfig
%postun -n libavahi-glib1 -p /sbin/ldconfig
@@ -827,6 +904,10 @@
%{_sysconfdir}/dbus-1/system.d/*.conf
%{_sysconfdir}/init.d/avahi-dnsconfd
%{_sysconfdir}/init.d/avahi-daemon
+%if !%build_mono
+
+%files lang -f %{name}.lang
+%endif
%files -n libavahi-client3
%defattr(-,root,root)
@@ -846,9 +927,12 @@
%files -n libavahi-glib1
%defattr(-,root,root)
-%{_bindir}/avahi-discover-standalone
%{_libdir}/libavahi-glib*.so.*
+%files -n libavahi-gobject0
+%defattr(-,root,root)
+%{_libdir}/libavahi-gobject*.so.*
+
%files -n libavahi-qt3-1
%defattr(-,root,root)
%{_libdir}/libavahi-qt3*.so.*
@@ -873,9 +957,11 @@
%{_bindir}/avahi-publish*
%{_bindir}/avahi-resolve*
%{_bindir}/avahi-set-host-name
-%{_datadir}/avahi
-%{_datadir}/applications/bssh.desktop
-%{_datadir}/applications/bvnc.desktop
+%dir %{_datadir}/avahi/
+%{_datadir}/avahi/avahi-service.dtd
+%{_datadir}/avahi/introspection
+%dir %{_libdir}/avahi/
+%{_libdir}/avahi/service-types.db
%{_datadir}/pixmaps/gnome-nettool2.png
%doc %{_mandir}/man1/avahi-browse*.1*
%doc %{_mandir}/man1/avahi-publish*.1*
@@ -884,14 +970,21 @@
%files utils-gtk
%defattr(-,root,root)
+%{_bindir}/bshell
%{_bindir}/bssh
%{_bindir}/bvnc
+%{_bindir}/avahi-discover-standalone
+%{_datadir}/applications/bssh.desktop
+%{_datadir}/applications/bvnc.desktop
+%dir %{_datadir}/avahi/
+%{_datadir}/avahi/interfaces
%doc %{_mandir}/man1/bssh.1.*
%doc %{_mandir}/man1/bvnc.1.*
%files -n python-avahi
%defattr(-,root,root)
%{py_sitedir}/avahi
+%{py_sitedir}/avahi_discover
%{_bindir}/avahi-discover
%{_bindir}/avahi-bookmarks
%doc %{_mandir}/man1/avahi-bookmarks.1*
@@ -929,6 +1022,13 @@
%{_libdir}/pkgconfig/avahi-glib.pc
%{_libdir}/pkgconfig/avahi-ui.pc
+%files -n libavahi-gobject-devel
+%defattr(-,root,root)
+%{_includedir}/avahi-gobject
+%{_libdir}/libavahi-gobject*.*a
+%{_libdir}/libavahi-gobject*.so
+%{_libdir}/pkgconfig/avahi-gobject.pc
+
%files -n libavahi-qt3-devel
%defattr(-,root,root)
%{_includedir}/avahi-qt3
@@ -958,7 +1058,33 @@
%{_libdir}/pkgconfig/avahi-compat-howl.pc
%{_libdir}/pkgconfig/howl.pc
%endif
+
%changelog
+* 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
++++++ avahi-0.6.20.tar.bz2 -> avahi-0.6.22.tar.bz2 ++++++
++++ 52095 lines of diff (skipped)
++++++ avahi-desktop.patch ++++++
--- /var/tmp/diff_new_pack.rw1350/_old 2007-12-19 22:29:59.000000000 +0100
+++ /var/tmp/diff_new_pack.rw1350/_new 2007-12-19 22:29:59.000000000 +0100
@@ -1,7 +1,7 @@
-Index: avahi-0.6.20/avahi-ui/bssh.desktop.in
+Index: avahi-0.6.22/avahi-ui/bssh.desktop.in
===================================================================
---- avahi-0.6.20.orig/avahi-ui/bssh.desktop.in
-+++ avahi-0.6.20/avahi-ui/bssh.desktop.in
+--- avahi-0.6.22.orig/avahi-ui/bssh.desktop.in
++++ avahi-0.6.22/avahi-ui/bssh.desktop.in
@@ -6,7 +6,8 @@ Comment=Browse for Zeroconf-enabled SSH
Exec=@bindir@/bssh
Terminal=false
@@ -13,10 +13,10 @@
StartupNotify=false
GenericName=
+X-SuSE-translate=true
-Index: avahi-0.6.20/avahi-ui/bvnc.desktop.in
+Index: avahi-0.6.22/avahi-ui/bvnc.desktop.in
===================================================================
---- avahi-0.6.20.orig/avahi-ui/bvnc.desktop.in
-+++ avahi-0.6.20/avahi-ui/bvnc.desktop.in
+--- avahi-0.6.22.orig/avahi-ui/bvnc.desktop.in
++++ avahi-0.6.22/avahi-ui/bvnc.desktop.in
@@ -6,7 +6,8 @@ Comment=Browse for Zeroconf-enabled VNC
Exec=@bindir@/bvnc
Terminal=false
@@ -28,10 +28,10 @@
StartupNotify=false
GenericName=
+X-SuSE-translate=true
-Index: avahi-0.6.20/avahi-python/avahi-discover.desktop.in
+Index: avahi-0.6.22/avahi-python/avahi-discover/avahi-discover.desktop.in
===================================================================
---- avahi-0.6.20.orig/avahi-python/avahi-discover.desktop.in
-+++ avahi-0.6.20/avahi-python/avahi-discover.desktop.in
+--- avahi-0.6.22.orig/avahi-python/avahi-discover/avahi-discover.desktop.in
++++ avahi-0.6.22/avahi-python/avahi-discover/avahi-discover.desktop.in
@@ -6,7 +6,7 @@ Comment=Browse for Zeroconf services ava
Exec=@bindir@/avahi-discover
Terminal=false
++++++ avahi-empty-share-dir.patch ++++++
Index: service-type-database/Makefile.am
===================================================================
--- service-type-database/Makefile.am.orig
+++ service-type-database/Makefile.am
@@ -19,7 +19,6 @@
EXTRA_DIST=build-db.in service-types
-pkgdata_DATA=service-types
pkglib_DATA=
if HAVE_PYTHON
++++++ avahi-gacdir.patch ++++++
--- /var/tmp/diff_new_pack.rw1350/_old 2007-12-19 22:29:59.000000000 +0100
+++ /var/tmp/diff_new_pack.rw1350/_new 2007-12-19 22:29:59.000000000 +0100
@@ -31,7 +31,7 @@
===================================================================
--- avahi-sharp/Makefile.in.orig
+++ avahi-sharp/Makefile.in
-@@ -603,10 +603,10 @@ $(ASSEMBLY).config: $(ASSEMBLY).config.i
+@@ -669,10 +669,10 @@ $(ASSEMBLY).config: $(ASSEMBLY).config.i
@HAVE_DBUS_TRUE@@HAVE_MONODOC_TRUE@@HAVE_MONO_TRUE@ $(MDASSEMBLER) --out avahi-sharp-docs --ecma $(srcdir)/en
@HAVE_DBUS_TRUE@@HAVE_MONO_TRUE@install-data-hook: $(ASSEMBLY)
@@ -48,7 +48,7 @@
===================================================================
--- avahi-ui-sharp/Makefile.am.orig
+++ avahi-ui-sharp/Makefile.am
-@@ -61,10 +61,10 @@ monodoc_DATA = avahi-ui-sharp-docs.zip a
+@@ -62,10 +62,10 @@ monodoc_DATA = avahi-ui-sharp-docs.zip a
endif
install-data-hook: $(ASSEMBLY)
@@ -65,16 +65,16 @@
===================================================================
--- avahi-ui-sharp/Makefile.in.orig
+++ avahi-ui-sharp/Makefile.in
-@@ -590,10 +590,10 @@ bssh.exe: $(srcdir)/bssh.cs $(ASSEMBLY)
- @HAVE_DBUS_TRUE@@HAVE_MONODOC_TRUE@@HAVE_MONO_TRUE@ $(MDASSEMBLER) --out avahi-ui-sharp-docs --ecma $(srcdir)/en
+@@ -658,10 +658,10 @@ bssh.exe: $(srcdir)/bssh.cs $(ASSEMBLY)
+ @HAVE_DBUS_TRUE@@HAVE_GTK_TRUE@@HAVE_MONODOC_TRUE@@HAVE_MONO_TRUE@ $(MDASSEMBLER) --out avahi-ui-sharp-docs --ecma $(srcdir)/en
- @HAVE_DBUS_TRUE@@HAVE_MONO_TRUE@install-data-hook: $(ASSEMBLY)
--@HAVE_DBUS_TRUE@@HAVE_MONO_TRUE@ $(GACUTIL) /i $(ASSEMBLY) /package avahi-ui-sharp /gacdir $(libdir) /root $(DESTDIR)$(libdir)
-+@HAVE_DBUS_TRUE@@HAVE_MONO_TRUE@ $(GACUTIL) /i $(ASSEMBLY) /package avahi-ui-sharp /gacdir $(prefix)/lib /root $(DESTDIR)$(prefix)/lib
-
- @HAVE_DBUS_TRUE@@HAVE_MONO_TRUE@uninstall-hook: $(ASSEMBLY)
--@HAVE_DBUS_TRUE@@HAVE_MONO_TRUE@ $(GACUTIL) /u avahi-ui-sharp /package avahi-ui-sharp /gacdir $(libdir) /root $(DESTDIR)$(libdir)
-+@HAVE_DBUS_TRUE@@HAVE_MONO_TRUE@ $(GACUTIL) /u avahi-ui-sharp /package avahi-ui-sharp /gacdir $(prefix)/lib /root $(DESTDIR)$(prefix)/lib
+ @HAVE_DBUS_TRUE@@HAVE_GTK_TRUE@@HAVE_MONO_TRUE@install-data-hook: $(ASSEMBLY)
+-@HAVE_DBUS_TRUE@@HAVE_GTK_TRUE@@HAVE_MONO_TRUE@ $(GACUTIL) /i $(ASSEMBLY) /package avahi-ui-sharp /gacdir $(libdir) /root $(DESTDIR)$(libdir)
++@HAVE_DBUS_TRUE@@HAVE_GTK_TRUE@@HAVE_MONO_TRUE@ $(GACUTIL) /i $(ASSEMBLY) /package avahi-ui-sharp /gacdir $(prefix)/lib /root $(DESTDIR)$(prefix)/lib
+
+ @HAVE_DBUS_TRUE@@HAVE_GTK_TRUE@@HAVE_MONO_TRUE@uninstall-hook: $(ASSEMBLY)
+-@HAVE_DBUS_TRUE@@HAVE_GTK_TRUE@@HAVE_MONO_TRUE@ $(GACUTIL) /u avahi-ui-sharp /package avahi-ui-sharp /gacdir $(libdir) /root $(DESTDIR)$(libdir)
++@HAVE_DBUS_TRUE@@HAVE_GTK_TRUE@@HAVE_MONO_TRUE@ $(GACUTIL) /u avahi-ui-sharp /package avahi-ui-sharp /gacdir $(prefix)/lib /root $(DESTDIR)$(prefix)/lib
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
++++++ avahi_spec-prepare.sh ++++++
--- avahi/avahi_spec-prepare.sh 2007-10-11 13:55:17.000000000 +0200
+++ /mounts/work_src_done/STABLE/avahi/avahi_spec-prepare.sh 2007-12-19 16:10:16.618637000 +0100
@@ -12,7 +12,7 @@
exit
fi
-for PKGNAME in avahi-client avahi-common avahi-core avahi-ui avahi-glib avahi-qt3 avahi-qt4 ; do
+for PKGNAME in avahi-client avahi-common avahi-core avahi-ui avahi-glib avahi-gobject avahi-qt3 avahi-qt4 ; do
# Packages with name ending by number needs separator
if test x`echo $PKGNAME | sed "s/.*[0-9]$//"` = x ; then
SEPARATOR=-
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org