Mailinglist Archive: opensuse-commit (938 mails)

< Previous Next >
commit avahi for openSUSE:Factory
  • From: root@xxxxxxxxxxxxxxx (h_root)
  • Date: Sat, 11 Sep 2010 11:40:08 +0200
  • Message-id: <20100911094009.57EDC202B9@xxxxxxxxxxxxxxx>

Hello community,

here is the log from the commit of package avahi for openSUSE:Factory
checked in at Sat Sep 11 11:40:08 CEST 2010.



--------
avahi-mono.changes: same change
avahi-qt4.changes: same change
--- avahi/avahi.changes 2010-06-21 14:04:15.000000000 +0200
+++ avahi/avahi.changes 2010-09-01 15:20:22.000000000 +0200
@@ -1,0 +2,42 @@
+Wed Sep 1 13:23:37 CEST 2010 - vuntz@xxxxxxxxxxxx
+
+- Update to version 0.6.27:
+ + Various systemd fixes.
+ + Daemon:
+ - make sure we never choke on SIGPIPE
+ - return successful error code when we ran successfully
+ - reset signals on initialization
+ - unblock all signals by default
+ + Update libavahi-client so that it can deal with auto-activated
+ avahi daemons
+ + Bump soname
+ + Build fix when gtk3 is not installed.
+ + i18n updates
+- Changes from version 0.6.26:
+ + Fix CVE-2010-2244
+ + Support for Gtk+ 3 and Gtk+ Introspection
+ + Native systemd socket activation support
+ + Add systemd service files
+ + Add various resource control options, for traffic rate limiting
+ as well as cache size and D-Bus client object limits.
+ + i18n updates
+ + Minor other updates
+- Rename libavahi-core6 to libavahi-core7, to follow library soname
+ bump.
+- Rebase avahi-gacdir.patch.
+- Add avahi-gobject-introspection-1.1.patch to set format of gir
+ file to 1.1.
+- Add avahi-fix-howl.pc.patch to fix generation of howl.pc.
+- Drop avahi-0.6.25-fixcrash.patch: fixed upstream.
+- Drop avahi-init_unused-not-dead.patch: fixed upstream.
+- Add gobject-introspection-devel BuildRequires for the glib2
+ build, to get introspection support.
+- Remove libglade2-devel BuildRequires.
+- Remove avahi-utils-gtk <= 0.6.22 Conflicts, since the file for
+ which we added the Conflicts doesn't exist anymore.
+- Pass --disable-gtk3 to configure since we don't want gtk3 support
+ right now.
+- Pass --with-systemdsystemunitdir=/lib/systemd/system to
+ configure. Thanks Kay!
+
+-------------------------------------------------------------------

calling whatdependson for head-i586


Old:
----
avahi-0.6.25-fixcrash.patch
avahi-0.6.25.tar.bz2
avahi-init_unused-not-dead.patch

New:
----
avahi-0.6.27.tar.bz2
avahi-fix-howl.pc.patch
avahi-gobject-introspection-1.1.patch

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ avahi-glib2.spec ++++++
--- /var/tmp/diff_new_pack.vxGs7y/_old 2010-09-11 11:39:04.000000000 +0200
+++ /var/tmp/diff_new_pack.vxGs7y/_new 2010-09-11 11:39:04.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package avahi-glib2 (Version 0.6.25)
+# spec file for package avahi-glib2 (Version 0.6.27)
#
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -30,15 +30,15 @@
%define build_mono 0
%define build_qt3 0
%define build_qt4 0
-Version: 0.6.25
-Release: 10
+Version: 0.6.27
+Release: 1
%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})
%endif
%define avahi_client_soname 3
%define avahi_common_soname 3
-%define avahi_core_soname 6
+%define avahi_core_soname 7
%define avahi_ui_soname 0
%define avahi_glib_soname 1
%define avahi_gobject_soname 0
@@ -68,12 +68,12 @@
Patch2: avahi-init-lsb.patch
#PATCH-FIX-UPSTREAM avahi-empty-share-dir.patch jpr@xxxxxxxxxx -- mailed
maintainer
Patch3: avahi-empty-share-dir.patch
-#PATCH-FIX-UPSTREAM avahi-0.6.25-fixcrash.patch lnussel@xxxxxxx -- mailed
maintainer
-Patch4: avahi-0.6.25-fixcrash.patch
+# PATCH-FIX-UPSTREAM avahi-gobject-introspection-1.1.patch vuntz@xxxxxxxxxxxx
-- New version of introspection format; http://www.avahi.org/ticket/318
+Patch4: avahi-gobject-introspection-1.1.patch
+# PATCH-FIX-UPSTREAM avahi-fix-howl.pc.patch vuntz@xxxxxxxxxxxx -- Fix howl.pc
to be correctly generated, mailed upstream
+Patch5: avahi-fix-howl.pc.patch
#PATCH-FIX-OPENSUSE avahi-unicastdomains.patch bnc433359 lnussel@xxxxxxx --
disable pre-set unicast domains by default
Patch10: avahi-unicastdomains.patch
-# PATCH-FIX-UPSTREAM avahi-init_unused-not-dead.patch bnc#329708
dimstar@xxxxxxxxxxxx -- Report unused instead of dead
-Patch11: avahi-init_unused-not-dead.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: dbus-1-python fdupes gcc-c++ gdbm-devel intltool
libdaemon-devel libexpat-devel pkg-config translation-update-upstream
# Even if we are not building python bindings, we need python to build service
types database:
@@ -86,8 +86,6 @@
PreReq: pwdutils
Requires: %{_name}-lang = %{version}
BuildRequires: dbus-1-devel doxygen graphviz python-gdbm zlib-devel
-# For update of avahi-discover.glade from == 11.0:
-Conflicts: avahi-utils-gtk <= 0.6.22
# For python bindings and utilities:
#BuildRequires: dbus-1-python
#Requires: dbus-1
@@ -102,7 +100,7 @@
Obsoletes: mDNSResponder < 107.5
%endif
%if %build_glib2
-BuildRequires: libglade2-devel python-gtk-devel update-desktop-files
+BuildRequires: gobject-introspection-devel python-gtk-devel
update-desktop-files
BuildRequires: libavahi-devel
%endif
%if %build_qt3
@@ -114,7 +112,7 @@
BuildRequires: libavahi-devel
%endif
%if %build_mono
-BuildRequires: gtk-sharp2 libavahi-glib-devel libglade2-devel mono-devel
monodoc-core
+BuildRequires: gtk-sharp2 libavahi-glib-devel mono-devel monodoc-core
# Please copy this line to avahi-mono definition below for build all-in-once:
Requires: gtk-sharp2 libavahi-client3 >= %{version} libavahi-common3 >=
%{version} libavahi-ui0 >= %{version} libavahi-glib1 >= %{version}
%endif
@@ -170,12 +168,12 @@
addition, it supports some nifty things, like correct mDNS reflection
across LAN segments.

-%package -n libavahi-core6
+%package -n libavahi-core7
License: LGPLv2.1+
Summary: D-BUS Service for Zeroconf and Bonjour
Group: System/Libraries

-%description -n libavahi-core6
+%description -n libavahi-core7
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
@@ -228,14 +226,14 @@

%package -n libhowl0
License: LGPLv2.1+
-Summary: howl Compatibility Package for D-BUS Service for
Zeroconf/Bonjour
+Summary: Howl Compatibility Package for D-BUS Service for
Zeroconf/Bonjour
Group: System/Libraries
# Old name used for <= 10.3:
Provides: avahi-compat-howl = %{version}
Obsoletes: avahi-compat-howl < %{version}

%description -n libhowl0
-howl compatibility layer for avahi.
+Howl compatibility layer for avahi.

Avahi is an Implementation the DNS Service Discovery and Multicast DNS
specifications for Zeroconf Computing. It uses D-BUS for communication
@@ -296,7 +294,7 @@
License: LGPLv2.1+
Summary: Include Files and Libraries Mandatory for Development
#
-Requires: %{_name} = %{version} libavahi-common3 = %{version}
libavahi-core6 = %{version} libavahi-client3 = %{version} dbus-1-devel
glibc-devel
+Requires: %{_name} = %{version} libavahi-common3 = %{version}
libavahi-core7 = %{version} libavahi-client3 = %{version} dbus-1-devel
glibc-devel
Group: Development/Libraries/C and C++
# Last appeared in OpenSUSE 10.3:
Provides: avahi-devel = %{version}
@@ -340,12 +338,12 @@

%package compat-howl-devel
License: LGPLv2.1+
-Summary: howl Compatibility Package for D-BUS Service for
Zeroconf/Bonjour
+Summary: Howl Compatibility Package for D-BUS Service for
Zeroconf/Bonjour
Requires: libavahi-devel = %{version} libhowl0 = %{version}
Group: Development/Libraries/C and C++

%description compat-howl-devel
-howl compatibility layer for avahi.
+Howl compatibility layer for avahi.

Avahi is an Implementation the DNS Service Discovery and Multicast DNS
specifications for Zeroconf Computing. It uses D-BUS for communication
@@ -647,8 +645,8 @@
%patch2
%patch3
%patch4 -p1
+%patch5 -p1
%patch10 -p1
-%patch11 -p1
%if !%build_core
# Replace all .la references from local .la files to installed versions
# with exception of libavahi-glib.la.
@@ -673,6 +671,7 @@
--libexecdir=%{_prefix}/lib\
--disable-static\
--with-distro=suse\
+ --with-systemdsystemunitdir=/lib/systemd/system\
%if %build_core
--enable-compat-libdns_sd\
--enable-compat-howl\
@@ -684,6 +683,7 @@
--enable-glib\
--enable-gobject\
--enable-gtk\
+ --disable-gtk3\
--enable-pygtk\
%else
--disable-glib\
@@ -691,6 +691,7 @@
%if ! %build_mono
--disable-gtk\
%endif
+ --disable-gtk3\
--disable-pygtk\
%endif
%if %build_qt3
@@ -780,7 +781,7 @@
%if ! %build_glib2
# Note: This file is intentionally installed here. It is needed for
avahi-utils-gtk and python-avahi-gtk:
install -d $RPM_BUILD_ROOT%{_datadir}/avahi/interfaces
-install -m 644 avahi-discover-standalone/avahi-discover.glade
$RPM_BUILD_ROOT%{_datadir}/avahi/interfaces
+install -m 644 avahi-discover-standalone/avahi-discover.ui
$RPM_BUILD_ROOT%{_datadir}/avahi/interfaces
%endif
%find_lang %{name}
%else
@@ -810,7 +811,7 @@
rm $RPM_BUILD_ROOT%{_mandir}/man8/avahi-dnsconfd.8*
rm $RPM_BUILD_ROOT%{_mandir}/man8/avahi-dnsconfd.action.8*
# Note: This file was intentionally moved to avahi. It is needed for
avahi-utils-gtk and python-avahi-gtk:
-rm $RPM_BUILD_ROOT%{_datadir}/avahi/interfaces/avahi-discover.glade
+rm $RPM_BUILD_ROOT%{_datadir}/avahi/interfaces/avahi-discover.ui
rmdir $RPM_BUILD_ROOT%{_datadir}/avahi/interfaces
rmdir $RPM_BUILD_ROOT%{_datadir}/avahi
%else
@@ -858,9 +859,9 @@

%postun -n libavahi-common3 -p /sbin/ldconfig

-%post -n libavahi-core6 -p /sbin/ldconfig
+%post -n libavahi-core7 -p /sbin/ldconfig

-%postun -n libavahi-core6 -p /sbin/ldconfig
+%postun -n libavahi-core7 -p /sbin/ldconfig

%post -n libdns_sd -p /sbin/ldconfig

@@ -949,6 +950,10 @@
%{_sysconfdir}/dbus-1/system.d/*.conf
%{_sysconfdir}/init.d/avahi-dnsconfd
%{_sysconfdir}/init.d/avahi-daemon
+%{_datadir}/dbus-1/system-services/org.freedesktop.Avahi.service
+/lib/systemd/system/avahi-daemon.service
+/lib/systemd/system/avahi-daemon.socket
+/lib/systemd/system/avahi-dnsconfd.service
# Common file for avahi-utils-gtk and python-avahi-gtk:
%dir %{_datadir}/avahi/
%{_datadir}/avahi/interfaces
@@ -964,7 +969,7 @@
%defattr(-,root,root)
%{_libdir}/libavahi-common*.so.*

-%files -n libavahi-core6
+%files -n libavahi-core7
%defattr(-,root,root)
%{_libdir}/libavahi-core*.so.*

@@ -984,7 +989,8 @@
%doc %{_mandir}/man1/avahi-bookmarks.1*
%{_sbindir}/rcavahi-bookmarks
%{_sysconfdir}/init.d/avahi-bookmarks
-%{python_sitelib}/avahi
+%dir %{python_sitelib}/avahi
+%{python_sitelib}/avahi/__init__.py*
%{python_sitelib}/avahi/ServiceTypeDatabase.py

%files utils
@@ -995,7 +1001,6 @@
%{_bindir}/avahi-set-host-name
%dir %{_datadir}/avahi/
%{_datadir}/avahi/avahi-service.dtd
-%{_datadir}/avahi/introspection
%dir %{_libdir}/avahi/
%{_libdir}/avahi/service-types.db
%doc %{_mandir}/man1/avahi-browse*.1*
@@ -1008,6 +1013,7 @@
# FIXME: Maybe split to particular subpackages.
#%doc doc/api/html
#%doc doc/*.html doc/*.txt doc/file-boilerplate.c doc/TODO
+%{_datadir}/dbus-1/interfaces/org.freedesktop.Avahi.*.xml
%{_includedir}/avahi-client
%{_includedir}/avahi-common
%{_includedir}/avahi-core
@@ -1051,6 +1057,8 @@
%files -n libavahi-gobject0
%defattr(-,root,root)
%{_libdir}/libavahi-gobject*.so.*
+%{_libdir}/girepository-1.0/Avahi-0.6.typelib
+%{_libdir}/girepository-1.0/AvahiCore-0.6.typelib

%files -n python-avahi-gtk
%defattr(-,root,root)
@@ -1087,6 +1095,7 @@
%{_libdir}/libavahi-gobject*.*a
%{_libdir}/libavahi-gobject*.so
%{_libdir}/pkgconfig/avahi-gobject.pc
+%{_datadir}/gir-1.0/*.gir
%endif
%if %build_qt3


++++++ avahi-mono.spec ++++++
--- /var/tmp/diff_new_pack.vxGs7y/_old 2010-09-11 11:39:04.000000000 +0200
+++ /var/tmp/diff_new_pack.vxGs7y/_new 2010-09-11 11:39:04.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package avahi-mono (Version 0.6.25)
+# spec file for package avahi-mono (Version 0.6.27)
#
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -30,15 +30,15 @@
%define build_mono 1
%define build_qt3 0
%define build_qt4 0
-Version: 0.6.25
-Release: 10
+Version: 0.6.27
+Release: 1
%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})
%endif
%define avahi_client_soname 3
%define avahi_common_soname 3
-%define avahi_core_soname 6
+%define avahi_core_soname 7
%define avahi_ui_soname 0
%define avahi_glib_soname 1
%define avahi_gobject_soname 0
@@ -68,12 +68,12 @@
Patch2: avahi-init-lsb.patch
#PATCH-FIX-UPSTREAM avahi-empty-share-dir.patch jpr@xxxxxxxxxx -- mailed
maintainer
Patch3: avahi-empty-share-dir.patch
-#PATCH-FIX-UPSTREAM avahi-0.6.25-fixcrash.patch lnussel@xxxxxxx -- mailed
maintainer
-Patch4: avahi-0.6.25-fixcrash.patch
+# PATCH-FIX-UPSTREAM avahi-gobject-introspection-1.1.patch vuntz@xxxxxxxxxxxx
-- New version of introspection format; http://www.avahi.org/ticket/318
+Patch4: avahi-gobject-introspection-1.1.patch
+# PATCH-FIX-UPSTREAM avahi-fix-howl.pc.patch vuntz@xxxxxxxxxxxx -- Fix howl.pc
to be correctly generated, mailed upstream
+Patch5: avahi-fix-howl.pc.patch
#PATCH-FIX-OPENSUSE avahi-unicastdomains.patch bnc433359 lnussel@xxxxxxx --
disable pre-set unicast domains by default
Patch10: avahi-unicastdomains.patch
-# PATCH-FIX-UPSTREAM avahi-init_unused-not-dead.patch bnc#329708
dimstar@xxxxxxxxxxxx -- Report unused instead of dead
-Patch11: avahi-init_unused-not-dead.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: dbus-1-python fdupes gcc-c++ gdbm-devel intltool
libdaemon-devel libexpat-devel pkg-config translation-update-upstream
# Even if we are not building python bindings, we need python to build service
types database:
@@ -86,8 +86,6 @@
PreReq: pwdutils
Requires: %{_name}-lang = %{version}
BuildRequires: dbus-1-devel doxygen graphviz python-gdbm zlib-devel
-# For update of avahi-discover.glade from == 11.0:
-Conflicts: avahi-utils-gtk <= 0.6.22
# For python bindings and utilities:
#BuildRequires: dbus-1-python
#Requires: dbus-1
@@ -102,7 +100,7 @@
Obsoletes: mDNSResponder < 107.5
%endif
%if %build_glib2
-BuildRequires: libglade2-devel python-gtk-devel update-desktop-files
+BuildRequires: gobject-introspection-devel python-gtk-devel
update-desktop-files
BuildRequires: libavahi-devel
%endif
%if %build_qt3
@@ -114,7 +112,7 @@
BuildRequires: libavahi-devel
%endif
%if %build_mono
-BuildRequires: gtk-sharp2 libavahi-glib-devel libglade2-devel mono-devel
monodoc-core
+BuildRequires: gtk-sharp2 libavahi-glib-devel mono-devel monodoc-core
# Please copy this line to avahi-mono definition below for build all-in-once:
Requires: gtk-sharp2 libavahi-client3 >= %{version} libavahi-common3 >=
%{version} libavahi-ui0 >= %{version} libavahi-glib1 >= %{version}
%endif
@@ -169,12 +167,12 @@
addition, it supports some nifty things, like correct mDNS reflection
across LAN segments.

-%package -n libavahi-core6
+%package -n libavahi-core7
License: LGPLv2.1+
Summary: D-BUS Service for Zeroconf and Bonjour
Group: System/Libraries

-%description -n libavahi-core6
+%description -n libavahi-core7
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
@@ -227,14 +225,14 @@

%package -n libhowl0
License: LGPLv2.1+
-Summary: howl Compatibility Package for D-BUS Service for
Zeroconf/Bonjour
+Summary: Howl Compatibility Package for D-BUS Service for
Zeroconf/Bonjour
Group: System/Libraries
# Old name used for <= 10.3:
Provides: avahi-compat-howl = %{version}
Obsoletes: avahi-compat-howl < %{version}

%description -n libhowl0
-howl compatibility layer for avahi.
+Howl compatibility layer for avahi.

Avahi is an Implementation the DNS Service Discovery and Multicast DNS
specifications for Zeroconf Computing. It uses D-BUS for communication
@@ -295,7 +293,7 @@
License: LGPLv2.1+
Summary: Include Files and Libraries Mandatory for Development
#
-Requires: %{_name} = %{version} libavahi-common3 = %{version}
libavahi-core6 = %{version} libavahi-client3 = %{version} dbus-1-devel
glibc-devel
+Requires: %{_name} = %{version} libavahi-common3 = %{version}
libavahi-core7 = %{version} libavahi-client3 = %{version} dbus-1-devel
glibc-devel
Group: Development/Libraries/C and C++
# Last appeared in OpenSUSE 10.3:
Provides: avahi-devel = %{version}
@@ -339,12 +337,12 @@

%package compat-howl-devel
License: LGPLv2.1+
-Summary: howl Compatibility Package for D-BUS Service for
Zeroconf/Bonjour
+Summary: Howl Compatibility Package for D-BUS Service for
Zeroconf/Bonjour
Requires: libavahi-devel = %{version} libhowl0 = %{version}
Group: Development/Libraries/C and C++

%description compat-howl-devel
-howl compatibility layer for avahi.
+Howl compatibility layer for avahi.

Avahi is an Implementation the DNS Service Discovery and Multicast DNS
specifications for Zeroconf Computing. It uses D-BUS for communication
@@ -646,8 +644,8 @@
%patch2
%patch3
%patch4 -p1
+%patch5 -p1
%patch10 -p1
-%patch11 -p1
%if !%build_core
# Replace all .la references from local .la files to installed versions
# with exception of libavahi-glib.la.
@@ -672,6 +670,7 @@
--libexecdir=%{_prefix}/lib\
--disable-static\
--with-distro=suse\
+ --with-systemdsystemunitdir=/lib/systemd/system\
%if %build_core
--enable-compat-libdns_sd\
--enable-compat-howl\
@@ -683,6 +682,7 @@
--enable-glib\
--enable-gobject\
--enable-gtk\
+ --disable-gtk3\
--enable-pygtk\
%else
--disable-glib\
@@ -690,6 +690,7 @@
%if ! %build_mono
--disable-gtk\
%endif
+ --disable-gtk3\
--disable-pygtk\
%endif
%if %build_qt3
@@ -779,7 +780,7 @@
%if ! %build_glib2
# Note: This file is intentionally installed here. It is needed for
avahi-utils-gtk and python-avahi-gtk:
install -d $RPM_BUILD_ROOT%{_datadir}/avahi/interfaces
-install -m 644 avahi-discover-standalone/avahi-discover.glade
$RPM_BUILD_ROOT%{_datadir}/avahi/interfaces
+install -m 644 avahi-discover-standalone/avahi-discover.ui
$RPM_BUILD_ROOT%{_datadir}/avahi/interfaces
%endif
%find_lang %{name}
%else
@@ -809,7 +810,7 @@
rm $RPM_BUILD_ROOT%{_mandir}/man8/avahi-dnsconfd.8*
rm $RPM_BUILD_ROOT%{_mandir}/man8/avahi-dnsconfd.action.8*
# Note: This file was intentionally moved to avahi. It is needed for
avahi-utils-gtk and python-avahi-gtk:
-rm $RPM_BUILD_ROOT%{_datadir}/avahi/interfaces/avahi-discover.glade
+rm $RPM_BUILD_ROOT%{_datadir}/avahi/interfaces/avahi-discover.ui
rmdir $RPM_BUILD_ROOT%{_datadir}/avahi/interfaces
rmdir $RPM_BUILD_ROOT%{_datadir}/avahi
%else
@@ -857,9 +858,9 @@

%postun -n libavahi-common3 -p /sbin/ldconfig

-%post -n libavahi-core6 -p /sbin/ldconfig
+%post -n libavahi-core7 -p /sbin/ldconfig

-%postun -n libavahi-core6 -p /sbin/ldconfig
+%postun -n libavahi-core7 -p /sbin/ldconfig

%post -n libdns_sd -p /sbin/ldconfig

@@ -948,6 +949,10 @@
%{_sysconfdir}/dbus-1/system.d/*.conf
%{_sysconfdir}/init.d/avahi-dnsconfd
%{_sysconfdir}/init.d/avahi-daemon
+%{_datadir}/dbus-1/system-services/org.freedesktop.Avahi.service
+/lib/systemd/system/avahi-daemon.service
+/lib/systemd/system/avahi-daemon.socket
+/lib/systemd/system/avahi-dnsconfd.service
# Common file for avahi-utils-gtk and python-avahi-gtk:
%dir %{_datadir}/avahi/
%{_datadir}/avahi/interfaces
@@ -963,7 +968,7 @@
%defattr(-,root,root)
%{_libdir}/libavahi-common*.so.*

-%files -n libavahi-core6
+%files -n libavahi-core7
%defattr(-,root,root)
%{_libdir}/libavahi-core*.so.*

@@ -983,7 +988,8 @@
%doc %{_mandir}/man1/avahi-bookmarks.1*
%{_sbindir}/rcavahi-bookmarks
%{_sysconfdir}/init.d/avahi-bookmarks
-%{python_sitelib}/avahi
+%dir %{python_sitelib}/avahi
+%{python_sitelib}/avahi/__init__.py*
%{python_sitelib}/avahi/ServiceTypeDatabase.py

%files utils
@@ -994,7 +1000,6 @@
%{_bindir}/avahi-set-host-name
%dir %{_datadir}/avahi/
%{_datadir}/avahi/avahi-service.dtd
-%{_datadir}/avahi/introspection
%dir %{_libdir}/avahi/
%{_libdir}/avahi/service-types.db
%doc %{_mandir}/man1/avahi-browse*.1*
@@ -1007,6 +1012,7 @@
# FIXME: Maybe split to particular subpackages.
#%doc doc/api/html
#%doc doc/*.html doc/*.txt doc/file-boilerplate.c doc/TODO
+%{_datadir}/dbus-1/interfaces/org.freedesktop.Avahi.*.xml
%{_includedir}/avahi-client
%{_includedir}/avahi-common
%{_includedir}/avahi-core
@@ -1050,6 +1056,8 @@
%files -n libavahi-gobject0
%defattr(-,root,root)
%{_libdir}/libavahi-gobject*.so.*
+%{_libdir}/girepository-1.0/Avahi-0.6.typelib
+%{_libdir}/girepository-1.0/AvahiCore-0.6.typelib

%files -n python-avahi-gtk
%defattr(-,root,root)
@@ -1086,6 +1094,7 @@
%{_libdir}/libavahi-gobject*.*a
%{_libdir}/libavahi-gobject*.so
%{_libdir}/pkgconfig/avahi-gobject.pc
+%{_datadir}/gir-1.0/*.gir
%endif
%if %build_qt3


++++++ avahi-qt4.spec ++++++
--- /var/tmp/diff_new_pack.vxGs7y/_old 2010-09-11 11:39:04.000000000 +0200
+++ /var/tmp/diff_new_pack.vxGs7y/_new 2010-09-11 11:39:04.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package avahi-qt4 (Version 0.6.25)
+# spec file for package avahi-qt4 (Version 0.6.27)
#
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -30,15 +30,15 @@
%define build_mono 0
%define build_qt3 0
%define build_qt4 1
-Version: 0.6.25
-Release: 10
+Version: 0.6.27
+Release: 1
%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})
%endif
%define avahi_client_soname 3
%define avahi_common_soname 3
-%define avahi_core_soname 6
+%define avahi_core_soname 7
%define avahi_ui_soname 0
%define avahi_glib_soname 1
%define avahi_gobject_soname 0
@@ -68,12 +68,12 @@
Patch2: avahi-init-lsb.patch
#PATCH-FIX-UPSTREAM avahi-empty-share-dir.patch jpr@xxxxxxxxxx -- mailed
maintainer
Patch3: avahi-empty-share-dir.patch
-#PATCH-FIX-UPSTREAM avahi-0.6.25-fixcrash.patch lnussel@xxxxxxx -- mailed
maintainer
-Patch4: avahi-0.6.25-fixcrash.patch
+# PATCH-FIX-UPSTREAM avahi-gobject-introspection-1.1.patch vuntz@xxxxxxxxxxxx
-- New version of introspection format; http://www.avahi.org/ticket/318
+Patch4: avahi-gobject-introspection-1.1.patch
+# PATCH-FIX-UPSTREAM avahi-fix-howl.pc.patch vuntz@xxxxxxxxxxxx -- Fix howl.pc
to be correctly generated, mailed upstream
+Patch5: avahi-fix-howl.pc.patch
#PATCH-FIX-OPENSUSE avahi-unicastdomains.patch bnc433359 lnussel@xxxxxxx --
disable pre-set unicast domains by default
Patch10: avahi-unicastdomains.patch
-# PATCH-FIX-UPSTREAM avahi-init_unused-not-dead.patch bnc#329708
dimstar@xxxxxxxxxxxx -- Report unused instead of dead
-Patch11: avahi-init_unused-not-dead.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: dbus-1-python fdupes gcc-c++ gdbm-devel intltool
libdaemon-devel libexpat-devel pkg-config translation-update-upstream
# Even if we are not building python bindings, we need python to build service
types database:
@@ -86,8 +86,6 @@
PreReq: pwdutils
Requires: %{_name}-lang = %{version}
BuildRequires: dbus-1-devel doxygen graphviz python-gdbm zlib-devel
-# For update of avahi-discover.glade from == 11.0:
-Conflicts: avahi-utils-gtk <= 0.6.22
# For python bindings and utilities:
#BuildRequires: dbus-1-python
#Requires: dbus-1
@@ -102,7 +100,7 @@
Obsoletes: mDNSResponder < 107.5
%endif
%if %build_glib2
-BuildRequires: libglade2-devel python-gtk-devel update-desktop-files
+BuildRequires: gobject-introspection-devel python-gtk-devel
update-desktop-files
BuildRequires: libavahi-devel
%endif
%if %build_qt3
@@ -114,7 +112,7 @@
BuildRequires: libavahi-devel
%endif
%if %build_mono
-BuildRequires: gtk-sharp2 libavahi-glib-devel libglade2-devel mono-devel
monodoc-core
+BuildRequires: gtk-sharp2 libavahi-glib-devel mono-devel monodoc-core
# Please copy this line to avahi-mono definition below for build all-in-once:
Requires: gtk-sharp2 libavahi-client3 >= %{version} libavahi-common3 >=
%{version} libavahi-ui0 >= %{version} libavahi-glib1 >= %{version}
%endif
@@ -172,12 +170,12 @@
addition, it supports some nifty things, like correct mDNS reflection
across LAN segments.

-%package -n libavahi-core6
+%package -n libavahi-core7
License: LGPLv2.1+
Summary: D-BUS Service for Zeroconf and Bonjour
Group: System/Libraries

-%description -n libavahi-core6
+%description -n libavahi-core7
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
@@ -230,14 +228,14 @@

%package -n libhowl0
License: LGPLv2.1+
-Summary: howl Compatibility Package for D-BUS Service for
Zeroconf/Bonjour
+Summary: Howl Compatibility Package for D-BUS Service for
Zeroconf/Bonjour
Group: System/Libraries
# Old name used for <= 10.3:
Provides: avahi-compat-howl = %{version}
Obsoletes: avahi-compat-howl < %{version}

%description -n libhowl0
-howl compatibility layer for avahi.
+Howl compatibility layer for avahi.

Avahi is an Implementation the DNS Service Discovery and Multicast DNS
specifications for Zeroconf Computing. It uses D-BUS for communication
@@ -298,7 +296,7 @@
License: LGPLv2.1+
Summary: Include Files and Libraries Mandatory for Development
#
-Requires: %{_name} = %{version} libavahi-common3 = %{version}
libavahi-core6 = %{version} libavahi-client3 = %{version} dbus-1-devel
glibc-devel
+Requires: %{_name} = %{version} libavahi-common3 = %{version}
libavahi-core7 = %{version} libavahi-client3 = %{version} dbus-1-devel
glibc-devel
Group: Development/Libraries/C and C++
# Last appeared in OpenSUSE 10.3:
Provides: avahi-devel = %{version}
@@ -342,12 +340,12 @@

%package compat-howl-devel
License: LGPLv2.1+
-Summary: howl Compatibility Package for D-BUS Service for
Zeroconf/Bonjour
+Summary: Howl Compatibility Package for D-BUS Service for
Zeroconf/Bonjour
Requires: libavahi-devel = %{version} libhowl0 = %{version}
Group: Development/Libraries/C and C++

%description compat-howl-devel
-howl compatibility layer for avahi.
+Howl compatibility layer for avahi.

Avahi is an Implementation the DNS Service Discovery and Multicast DNS
specifications for Zeroconf Computing. It uses D-BUS for communication
@@ -649,8 +647,8 @@
%patch2
%patch3
%patch4 -p1
+%patch5 -p1
%patch10 -p1
-%patch11 -p1
%if !%build_core
# Replace all .la references from local .la files to installed versions
# with exception of libavahi-glib.la.
@@ -675,6 +673,7 @@
--libexecdir=%{_prefix}/lib\
--disable-static\
--with-distro=suse\
+ --with-systemdsystemunitdir=/lib/systemd/system\
%if %build_core
--enable-compat-libdns_sd\
--enable-compat-howl\
@@ -686,6 +685,7 @@
--enable-glib\
--enable-gobject\
--enable-gtk\
+ --disable-gtk3\
--enable-pygtk\
%else
--disable-glib\
@@ -693,6 +693,7 @@
%if ! %build_mono
--disable-gtk\
%endif
+ --disable-gtk3\
--disable-pygtk\
%endif
%if %build_qt3
@@ -782,7 +783,7 @@
%if ! %build_glib2
# Note: This file is intentionally installed here. It is needed for
avahi-utils-gtk and python-avahi-gtk:
install -d $RPM_BUILD_ROOT%{_datadir}/avahi/interfaces
-install -m 644 avahi-discover-standalone/avahi-discover.glade
$RPM_BUILD_ROOT%{_datadir}/avahi/interfaces
+install -m 644 avahi-discover-standalone/avahi-discover.ui
$RPM_BUILD_ROOT%{_datadir}/avahi/interfaces
%endif
%find_lang %{name}
%else
@@ -812,7 +813,7 @@
rm $RPM_BUILD_ROOT%{_mandir}/man8/avahi-dnsconfd.8*
rm $RPM_BUILD_ROOT%{_mandir}/man8/avahi-dnsconfd.action.8*
# Note: This file was intentionally moved to avahi. It is needed for
avahi-utils-gtk and python-avahi-gtk:
-rm $RPM_BUILD_ROOT%{_datadir}/avahi/interfaces/avahi-discover.glade
+rm $RPM_BUILD_ROOT%{_datadir}/avahi/interfaces/avahi-discover.ui
rmdir $RPM_BUILD_ROOT%{_datadir}/avahi/interfaces
rmdir $RPM_BUILD_ROOT%{_datadir}/avahi
%else
@@ -860,9 +861,9 @@

%postun -n libavahi-common3 -p /sbin/ldconfig

-%post -n libavahi-core6 -p /sbin/ldconfig
+%post -n libavahi-core7 -p /sbin/ldconfig

-%postun -n libavahi-core6 -p /sbin/ldconfig
+%postun -n libavahi-core7 -p /sbin/ldconfig

%post -n libdns_sd -p /sbin/ldconfig

@@ -951,6 +952,10 @@
%{_sysconfdir}/dbus-1/system.d/*.conf
%{_sysconfdir}/init.d/avahi-dnsconfd
%{_sysconfdir}/init.d/avahi-daemon
+%{_datadir}/dbus-1/system-services/org.freedesktop.Avahi.service
+/lib/systemd/system/avahi-daemon.service
+/lib/systemd/system/avahi-daemon.socket
+/lib/systemd/system/avahi-dnsconfd.service
# Common file for avahi-utils-gtk and python-avahi-gtk:
%dir %{_datadir}/avahi/
%{_datadir}/avahi/interfaces
@@ -966,7 +971,7 @@
%defattr(-,root,root)
%{_libdir}/libavahi-common*.so.*

-%files -n libavahi-core6
+%files -n libavahi-core7
%defattr(-,root,root)
%{_libdir}/libavahi-core*.so.*

@@ -986,7 +991,8 @@
%doc %{_mandir}/man1/avahi-bookmarks.1*
%{_sbindir}/rcavahi-bookmarks
%{_sysconfdir}/init.d/avahi-bookmarks
-%{python_sitelib}/avahi
+%dir %{python_sitelib}/avahi
+%{python_sitelib}/avahi/__init__.py*
%{python_sitelib}/avahi/ServiceTypeDatabase.py

%files utils
@@ -997,7 +1003,6 @@
%{_bindir}/avahi-set-host-name
%dir %{_datadir}/avahi/
%{_datadir}/avahi/avahi-service.dtd
-%{_datadir}/avahi/introspection
%dir %{_libdir}/avahi/
%{_libdir}/avahi/service-types.db
%doc %{_mandir}/man1/avahi-browse*.1*
@@ -1010,6 +1015,7 @@
# FIXME: Maybe split to particular subpackages.
#%doc doc/api/html
#%doc doc/*.html doc/*.txt doc/file-boilerplate.c doc/TODO
+%{_datadir}/dbus-1/interfaces/org.freedesktop.Avahi.*.xml
%{_includedir}/avahi-client
%{_includedir}/avahi-common
%{_includedir}/avahi-core
@@ -1053,6 +1059,8 @@
%files -n libavahi-gobject0
%defattr(-,root,root)
%{_libdir}/libavahi-gobject*.so.*
+%{_libdir}/girepository-1.0/Avahi-0.6.typelib
+%{_libdir}/girepository-1.0/AvahiCore-0.6.typelib

%files -n python-avahi-gtk
%defattr(-,root,root)
@@ -1089,6 +1097,7 @@
%{_libdir}/libavahi-gobject*.*a
%{_libdir}/libavahi-gobject*.so
%{_libdir}/pkgconfig/avahi-gobject.pc
+%{_datadir}/gir-1.0/*.gir
%endif
%if %build_qt3


++++++ avahi.spec ++++++
--- /var/tmp/diff_new_pack.vxGs7y/_old 2010-09-11 11:39:04.000000000 +0200
+++ /var/tmp/diff_new_pack.vxGs7y/_new 2010-09-11 11:39:04.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package avahi (Version 0.6.25)
+# spec file for package avahi (Version 0.6.27)
#
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -32,15 +32,15 @@
%define build_mono 0
%define build_qt3 0
%define build_qt4 0
-Version: 0.6.25
-Release: 10
+Version: 0.6.27
+Release: 1
%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})
%endif
%define avahi_client_soname 3
%define avahi_common_soname 3
-%define avahi_core_soname 6
+%define avahi_core_soname 7
%define avahi_ui_soname 0
%define avahi_glib_soname 1
%define avahi_gobject_soname 0
@@ -70,12 +70,12 @@
Patch2: avahi-init-lsb.patch
#PATCH-FIX-UPSTREAM avahi-empty-share-dir.patch jpr@xxxxxxxxxx -- mailed
maintainer
Patch3: avahi-empty-share-dir.patch
-#PATCH-FIX-UPSTREAM avahi-0.6.25-fixcrash.patch lnussel@xxxxxxx -- mailed
maintainer
-Patch4: avahi-0.6.25-fixcrash.patch
+# PATCH-FIX-UPSTREAM avahi-gobject-introspection-1.1.patch vuntz@xxxxxxxxxxxx
-- New version of introspection format; http://www.avahi.org/ticket/318
+Patch4: avahi-gobject-introspection-1.1.patch
+# PATCH-FIX-UPSTREAM avahi-fix-howl.pc.patch vuntz@xxxxxxxxxxxx -- Fix howl.pc
to be correctly generated, mailed upstream
+Patch5: avahi-fix-howl.pc.patch
#PATCH-FIX-OPENSUSE avahi-unicastdomains.patch bnc433359 lnussel@xxxxxxx --
disable pre-set unicast domains by default
Patch10: avahi-unicastdomains.patch
-# PATCH-FIX-UPSTREAM avahi-init_unused-not-dead.patch bnc#329708
dimstar@xxxxxxxxxxxx -- Report unused instead of dead
-Patch11: avahi-init_unused-not-dead.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: dbus-1-python fdupes gcc-c++ gdbm-devel intltool
libdaemon-devel libexpat-devel pkg-config translation-update-upstream
# Even if we are not building python bindings, we need python to build service
types database:
@@ -88,8 +88,6 @@
PreReq: pwdutils
Requires: %{_name}-lang = %{version}
BuildRequires: dbus-1-devel doxygen graphviz python-gdbm zlib-devel
-# For update of avahi-discover.glade from == 11.0:
-Conflicts: avahi-utils-gtk <= 0.6.22
# For python bindings and utilities:
#BuildRequires: dbus-1-python
#Requires: dbus-1
@@ -104,7 +102,7 @@
Obsoletes: mDNSResponder < 107.5
%endif
%if %build_glib2
-BuildRequires: libglade2-devel python-gtk-devel update-desktop-files
+BuildRequires: gobject-introspection-devel python-gtk-devel
update-desktop-files
BuildRequires: libavahi-devel
%endif
%if %build_qt3
@@ -116,7 +114,7 @@
BuildRequires: libavahi-devel
%endif
%if %build_mono
-BuildRequires: gtk-sharp2 libavahi-glib-devel libglade2-devel mono-devel
monodoc-core
+BuildRequires: gtk-sharp2 libavahi-glib-devel mono-devel monodoc-core
# Please copy this line to avahi-mono definition below for build all-in-once:
Requires: gtk-sharp2 libavahi-client3 >= %{version} libavahi-common3 >=
%{version} libavahi-ui0 >= %{version} libavahi-glib1 >= %{version}
%endif
@@ -172,12 +170,12 @@
addition, it supports some nifty things, like correct mDNS reflection
across LAN segments.

-%package -n libavahi-core6
+%package -n libavahi-core7
License: LGPLv2.1+
Summary: D-BUS Service for Zeroconf and Bonjour
Group: System/Libraries

-%description -n libavahi-core6
+%description -n libavahi-core7
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
@@ -230,14 +228,14 @@

%package -n libhowl0
License: LGPLv2.1+
-Summary: howl Compatibility Package for D-BUS Service for
Zeroconf/Bonjour
+Summary: Howl Compatibility Package for D-BUS Service for
Zeroconf/Bonjour
Group: System/Libraries
# Old name used for <= 10.3:
Provides: avahi-compat-howl = %{version}
Obsoletes: avahi-compat-howl < %{version}

%description -n libhowl0
-howl compatibility layer for avahi.
+Howl compatibility layer for avahi.

Avahi is an Implementation the DNS Service Discovery and Multicast DNS
specifications for Zeroconf Computing. It uses D-BUS for communication
@@ -298,7 +296,7 @@
License: LGPLv2.1+
Summary: Include Files and Libraries Mandatory for Development
#
-Requires: %{_name} = %{version} libavahi-common3 = %{version}
libavahi-core6 = %{version} libavahi-client3 = %{version} dbus-1-devel
glibc-devel
+Requires: %{_name} = %{version} libavahi-common3 = %{version}
libavahi-core7 = %{version} libavahi-client3 = %{version} dbus-1-devel
glibc-devel
Group: Development/Libraries/C and C++
# Last appeared in OpenSUSE 10.3:
Provides: avahi-devel = %{version}
@@ -342,12 +340,12 @@

%package compat-howl-devel
License: LGPLv2.1+
-Summary: howl Compatibility Package for D-BUS Service for
Zeroconf/Bonjour
+Summary: Howl Compatibility Package for D-BUS Service for
Zeroconf/Bonjour
Requires: libavahi-devel = %{version} libhowl0 = %{version}
Group: Development/Libraries/C and C++

%description compat-howl-devel
-howl compatibility layer for avahi.
+Howl compatibility layer for avahi.

Avahi is an Implementation the DNS Service Discovery and Multicast DNS
specifications for Zeroconf Computing. It uses D-BUS for communication
@@ -649,8 +647,8 @@
%patch2
%patch3
%patch4 -p1
+%patch5 -p1
%patch10 -p1
-%patch11 -p1
%if !%build_core
# Replace all .la references from local .la files to installed versions
# with exception of libavahi-glib.la.
@@ -675,6 +673,7 @@
--libexecdir=%{_prefix}/lib\
--disable-static\
--with-distro=suse\
+ --with-systemdsystemunitdir=/lib/systemd/system\
%if %build_core
--enable-compat-libdns_sd\
--enable-compat-howl\
@@ -686,6 +685,7 @@
--enable-glib\
--enable-gobject\
--enable-gtk\
+ --disable-gtk3\
--enable-pygtk\
%else
--disable-glib\
@@ -693,6 +693,7 @@
%if ! %build_mono
--disable-gtk\
%endif
+ --disable-gtk3\
--disable-pygtk\
%endif
%if %build_qt3
@@ -782,7 +783,7 @@
%if ! %build_glib2
# Note: This file is intentionally installed here. It is needed for
avahi-utils-gtk and python-avahi-gtk:
install -d $RPM_BUILD_ROOT%{_datadir}/avahi/interfaces
-install -m 644 avahi-discover-standalone/avahi-discover.glade
$RPM_BUILD_ROOT%{_datadir}/avahi/interfaces
+install -m 644 avahi-discover-standalone/avahi-discover.ui
$RPM_BUILD_ROOT%{_datadir}/avahi/interfaces
%endif
%find_lang %{name}
%else
@@ -812,7 +813,7 @@
rm $RPM_BUILD_ROOT%{_mandir}/man8/avahi-dnsconfd.8*
rm $RPM_BUILD_ROOT%{_mandir}/man8/avahi-dnsconfd.action.8*
# Note: This file was intentionally moved to avahi. It is needed for
avahi-utils-gtk and python-avahi-gtk:
-rm $RPM_BUILD_ROOT%{_datadir}/avahi/interfaces/avahi-discover.glade
+rm $RPM_BUILD_ROOT%{_datadir}/avahi/interfaces/avahi-discover.ui
rmdir $RPM_BUILD_ROOT%{_datadir}/avahi/interfaces
rmdir $RPM_BUILD_ROOT%{_datadir}/avahi
%else
@@ -860,9 +861,9 @@

%postun -n libavahi-common3 -p /sbin/ldconfig

-%post -n libavahi-core6 -p /sbin/ldconfig
+%post -n libavahi-core7 -p /sbin/ldconfig

-%postun -n libavahi-core6 -p /sbin/ldconfig
+%postun -n libavahi-core7 -p /sbin/ldconfig

%post -n libdns_sd -p /sbin/ldconfig

@@ -951,6 +952,10 @@
%{_sysconfdir}/dbus-1/system.d/*.conf
%{_sysconfdir}/init.d/avahi-dnsconfd
%{_sysconfdir}/init.d/avahi-daemon
+%{_datadir}/dbus-1/system-services/org.freedesktop.Avahi.service
+/lib/systemd/system/avahi-daemon.service
+/lib/systemd/system/avahi-daemon.socket
+/lib/systemd/system/avahi-dnsconfd.service
# Common file for avahi-utils-gtk and python-avahi-gtk:
%dir %{_datadir}/avahi/
%{_datadir}/avahi/interfaces
@@ -966,7 +971,7 @@
%defattr(-,root,root)
%{_libdir}/libavahi-common*.so.*

-%files -n libavahi-core6
+%files -n libavahi-core7
%defattr(-,root,root)
%{_libdir}/libavahi-core*.so.*

@@ -986,7 +991,8 @@
%doc %{_mandir}/man1/avahi-bookmarks.1*
%{_sbindir}/rcavahi-bookmarks
%{_sysconfdir}/init.d/avahi-bookmarks
-%{python_sitelib}/avahi
+%dir %{python_sitelib}/avahi
+%{python_sitelib}/avahi/__init__.py*
%{python_sitelib}/avahi/ServiceTypeDatabase.py

%files utils
@@ -997,7 +1003,6 @@
%{_bindir}/avahi-set-host-name
%dir %{_datadir}/avahi/
%{_datadir}/avahi/avahi-service.dtd
-%{_datadir}/avahi/introspection
%dir %{_libdir}/avahi/
%{_libdir}/avahi/service-types.db
%doc %{_mandir}/man1/avahi-browse*.1*
@@ -1010,6 +1015,7 @@
# FIXME: Maybe split to particular subpackages.
#%doc doc/api/html
#%doc doc/*.html doc/*.txt doc/file-boilerplate.c doc/TODO
+%{_datadir}/dbus-1/interfaces/org.freedesktop.Avahi.*.xml
%{_includedir}/avahi-client
%{_includedir}/avahi-common
%{_includedir}/avahi-core
@@ -1053,6 +1059,8 @@
%files -n libavahi-gobject0
%defattr(-,root,root)
%{_libdir}/libavahi-gobject*.so.*
+%{_libdir}/girepository-1.0/Avahi-0.6.typelib
+%{_libdir}/girepository-1.0/AvahiCore-0.6.typelib

%files -n python-avahi-gtk
%defattr(-,root,root)
@@ -1089,6 +1097,7 @@
%{_libdir}/libavahi-gobject*.*a
%{_libdir}/libavahi-gobject*.so
%{_libdir}/pkgconfig/avahi-gobject.pc
+%{_datadir}/gir-1.0/*.gir
%endif
%if %build_qt3


++++++ avahi-0.6.25.tar.bz2 -> avahi-0.6.27.tar.bz2 ++++++
++++ 108003 lines of diff (skipped)

++++++ avahi-fix-howl.pc.patch ++++++
Index: avahi-0.6.27/Makefile.am
===================================================================
--- avahi-0.6.27.orig/Makefile.am
+++ avahi-0.6.27/Makefile.am
@@ -155,6 +155,7 @@ pkgconfigdir = $(libdir)/pkgconfig
%.pc: %.pc.in
$(AM_V_GEN)sed -e 's,@prefix\@,$(prefix),g' \
-e 's,@libdir\@,$(libdir),g' \
+ -e 's,@HOWL_COMPAT_VERSION\@,$(HOWL_COMPAT_VERSION),g' \
-e 's,@PACKAGE_VERSION\@,$(PACKAGE_VERSION),g' $< > $@

pkgconfig_DATA = avahi-core.pc
++++++ avahi-gacdir.patch ++++++
--- /var/tmp/diff_new_pack.vxGs7y/_old 2010-09-11 11:39:32.000000000 +0200
+++ /var/tmp/diff_new_pack.vxGs7y/_new 2010-09-11 11:39:32.000000000 +0200
@@ -14,16 +14,16 @@
===================================================================
--- avahi-sharp/Makefile.am.orig
+++ avahi-sharp/Makefile.am
-@@ -75,10 +75,10 @@ monodoc_DATA = avahi-sharp-docs.zip avah
+@@ -73,10 +73,10 @@ monodoc_DATA = avahi-sharp-docs.zip avah
endif

install-data-hook: $(ASSEMBLY)
-- $(GACUTIL) /i $(ASSEMBLY) /package avahi-sharp /gacdir $(libdir) /root
$(DESTDIR)$(libdir)
-+ $(GACUTIL) /i $(ASSEMBLY) /package avahi-sharp /gacdir $(prefix)/lib
/root $(DESTDIR)$(prefix)/lib
+- $(AM_V_GEN)MONO_SHARED_DIR=. $(GACUTIL) /i $(ASSEMBLY) /package
avahi-sharp /gacdir $(libdir) /root $(DESTDIR)$(libdir)
++ $(AM_V_GEN)MONO_SHARED_DIR=. $(GACUTIL) /i $(ASSEMBLY) /package
avahi-sharp /gacdir $(prefix)/lib /root $(DESTDIR)$(prefix)/lib

uninstall-hook: $(ASSEMBLY)
-- $(GACUTIL) /u avahi-sharp /package avahi-sharp /gacdir $(libdir) /root
$(DESTDIR)$(libdir)
-+ $(GACUTIL) /u avahi-sharp /package avahi-sharp /gacdir $(prefix)/lib
/root $(DESTDIR)$(prefix)/lib
+- $(AM_V_GEN)MONO_SHARED_DIR=. $(GACUTIL) /u avahi-sharp /package
avahi-sharp /gacdir $(libdir) /root $(DESTDIR)$(libdir)
++ $(AM_V_GEN)MONO_SHARED_DIR=. $(GACUTIL) /u avahi-sharp /package
avahi-sharp /gacdir $(prefix)/lib /root $(DESTDIR)$(prefix)/lib

endif
endif
@@ -31,24 +31,24 @@
===================================================================
--- avahi-sharp/Makefile.in.orig
+++ avahi-sharp/Makefile.in
-@@ -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
+@@ -611,10 +611,10 @@ $(ASSEMBLY).config: $(ASSEMBLY).config.i
+ @HAVE_DBUS_TRUE@@HAVE_MONODOC_TRUE@@HAVE_MONO_TRUE@
$(AM_V_GEN)$(MDASSEMBLER) --out avahi-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-sharp /gacdir $(libdir) /root $(DESTDIR)$(libdir)
-+@HAVE_DBUS_TRUE@@HAVE_MONO_TRUE@ $(GACUTIL) /i $(ASSEMBLY) /package
avahi-sharp /gacdir $(prefix)/lib /root $(DESTDIR)$(prefix)/lib
+-@HAVE_DBUS_TRUE@@HAVE_MONO_TRUE@ $(AM_V_GEN)MONO_SHARED_DIR=. $(GACUTIL)
/i $(ASSEMBLY) /package avahi-sharp /gacdir $(libdir) /root $(DESTDIR)$(libdir)
++@HAVE_DBUS_TRUE@@HAVE_MONO_TRUE@ $(AM_V_GEN)MONO_SHARED_DIR=. $(GACUTIL)
/i $(ASSEMBLY) /package avahi-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-sharp /package
avahi-sharp /gacdir $(libdir) /root $(DESTDIR)$(libdir)
-+@HAVE_DBUS_TRUE@@HAVE_MONO_TRUE@ $(GACUTIL) /u avahi-sharp /package
avahi-sharp /gacdir $(prefix)/lib /root $(DESTDIR)$(prefix)/lib
+-@HAVE_DBUS_TRUE@@HAVE_MONO_TRUE@ $(AM_V_GEN)MONO_SHARED_DIR=. $(GACUTIL)
/u avahi-sharp /package avahi-sharp /gacdir $(libdir) /root $(DESTDIR)$(libdir)
++@HAVE_DBUS_TRUE@@HAVE_MONO_TRUE@ $(AM_V_GEN)MONO_SHARED_DIR=. $(GACUTIL)
/u avahi-sharp /package avahi-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:
Index: avahi-ui-sharp/Makefile.am
===================================================================
--- avahi-ui-sharp/Makefile.am.orig
+++ avahi-ui-sharp/Makefile.am
-@@ -62,10 +62,10 @@ monodoc_DATA = avahi-ui-sharp-docs.zip a
+@@ -60,10 +60,10 @@ monodoc_DATA = avahi-ui-sharp-docs.zip a
endif

install-data-hook: $(ASSEMBLY)
@@ -65,8 +65,8 @@
===================================================================
--- avahi-ui-sharp/Makefile.in.orig
+++ avahi-ui-sharp/Makefile.in
-@@ -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
+@@ -600,10 +600,10 @@ bssh.exe: $(srcdir)/bssh.cs $(ASSEMBLY)
+ @HAVE_DBUS_TRUE@@HAVE_GTK_TRUE@@HAVE_MONODOC_TRUE@@HAVE_MONO_TRUE@
$(AM_V_GEN)$(MDASSEMBLER) --out avahi-ui-sharp-docs --ecma $(srcdir)/en

@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)
@@ -75,6 +75,6 @@
@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-gobject-introspection-1.1.patch ++++++
Index: avahi-0.6.27/avahi-gobject/AvahiCore-0.6.gir
===================================================================
--- avahi-0.6.27.orig/avahi-gobject/AvahiCore-0.6.gir
+++ avahi-0.6.27/avahi-gobject/AvahiCore-0.6.gir
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<repository version="1.0"
+<repository version="1.1"
xmlns="http://www.gtk.org/introspection/core/1.0";
xmlns:c="http://www.gtk.org/introspection/c/1.0";
xmlns:glib="http://www.gtk.org/introspection/glib/1.0";>


++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx

< Previous Next >
This Thread