Hello community,
here is the log from the commit of package avahi for openSUSE:Factory
checked in at Mon May 2 12:17:25 CEST 2011.
--------
avahi-mono.changes: same change
avahi-qt4.changes: same change
--- avahi/avahi.changes 2011-02-17 16:42:48.000000000 +0100
+++ /mounts/work_src_done/STABLE/avahi/avahi.changes 2011-03-03 14:08:26.000000000 +0100
@@ -1,0 +2,14 @@
+Fri Feb 25 09:56:01 UTC 2011 - fcrozat(a)novell.com
+
+- Enable gtk3 support:
+ + Add gtk3-devel BuildRequires for avahi-glib2.
+ + Add libavahi-ui-gtk3-0 subpackage.
+ + Pass --enable-gtk3 instead of --disable-gtk3 to configure in
+ avahi-glib2.
+- Remove explicit Requires of glib2-devel and gtk2-devel in
+ libavahi-glib-devel: they will automatically be added the
+ pkgconfig() way.
+- Use sysconfig PreReq instead of sysvinit(network) on 11.3 and
+ earlier.
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ avahi-glib2.spec ++++++
--- /var/tmp/diff_new_pack.hRk6jq/_old 2011-05-02 12:16:01.000000000 +0200
+++ /var/tmp/diff_new_pack.hRk6jq/_new 2011-05-02 12:16:01.000000000 +0200
@@ -25,13 +25,13 @@
# For build all at once, set all to 1.
# If you set build_core to 0, you cannot set more than one other option to 1.
%define build_core 0
-# NOTE: build_glib2 also controls build of gobject, gtk2 and pygtk code.
+# NOTE: build_glib2 also controls build of gobject, gtk2, gtk3 and pygtk code.
%define build_glib2 1
%define build_mono 0
%define build_qt3 0
%define build_qt4 0
Version: 0.6.28
-Release: 4
+Release: 5
%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})
@@ -42,6 +42,7 @@
%define avahi_ui_soname 0
%define avahi_glib_soname 1
%define avahi_gobject_soname 0
+%define avahi_gtk3_soname 0
%define avahi_qt3_soname 1
%define avahi_qt4_soname 1
%if %build_glib2
@@ -85,7 +86,12 @@
%endif
%if %build_core
Source5: %{_name}_spec-prepare.sh
-PreReq: pwdutils sysvinit(network)
+PreReq: pwdutils
+%if %suse_version >= 1140
+PreReq: sysvinit(network)
+%else
+PreReq: sysconfig
+%endif
Recommends: %{_name}-lang
BuildRequires: dbus-1-devel doxygen graphviz python-gdbm zlib-devel
# For python bindings and utilities:
@@ -102,7 +108,7 @@
Obsoletes: mDNSResponder < 107.5
%endif
%if %build_glib2
-BuildRequires: gobject-introspection-devel python-gtk-devel update-desktop-files
+BuildRequires: gobject-introspection-devel gtk2-devel gtk3-devel python-gtk-devel update-desktop-files
BuildRequires: libavahi-devel
%endif
%if %build_qt3
@@ -380,6 +386,25 @@
addition, it supports some nifty things, like correct mDNS reflection
across LAN segments.
+%package -n libavahi-ui-gtk3-%{avahi_gtk3_soname}
+
+License: LGPLv2.1+
+Summary: D-BUS Service for Zeroconf and Bonjour
+Group: System/Libraries
+
+%description -n libavahi-ui-gtk3-%{avahi_gtk3_soname}
+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.
+
%package -n libavahi-glib1
License: LGPLv2.1+
Summary: Glib Bindings for avahi, the D-BUS Service for Zeroconf and Bonjour
@@ -474,7 +499,10 @@
%package -n libavahi-glib-devel
License: LGPLv2.1+
Summary: Include Files and Libraries Mandatory for Development
-Requires: libavahi-devel = %{version} libavahi-ui0 = %{version} libavahi-glib1 = %{version} glib2-devel gtk2-devel
+Requires: libavahi-devel = %{version}
+Requires: libavahi-glib1 = %{version}
+Requires: libavahi-ui0 = %{version}
+Requires: libavahi-ui-gtk3-%{avahi_gtk3_soname} = %{version}
Group: Development/Libraries/C and C++
# Last appeared in OpenSUSE 10.3:
Provides: avahi-devel:%{_libdir}/libavahi-glib.so
@@ -686,7 +714,7 @@
--enable-glib\
--enable-gobject\
--enable-gtk\
- --disable-gtk3\
+ --enable-gtk3\
--enable-pygtk\
%else
--disable-glib\
@@ -907,6 +935,10 @@
%postun -n libavahi-ui0 -p /sbin/ldconfig
+%post -n libavahi-ui-gtk3-%{avahi_gtk3_soname} -p /sbin/ldconfig
+
+%postun -n libavahi-ui-gtk3-%{avahi_gtk3_soname} -p /sbin/ldconfig
+
%post -n libavahi-gobject0 -p /sbin/ldconfig
%postun -n libavahi-gobject0 -p /sbin/ldconfig
@@ -1063,7 +1095,11 @@
%files -n libavahi-ui0
%defattr(-,root,root)
-%{_libdir}/libavahi-ui*.so.*
+%{_libdir}/libavahi-ui.so.*
+
+%files -n libavahi-ui-gtk3-%{avahi_gtk3_soname}
+%defattr(-,root,root)
+%{_libdir}/libavahi-ui-gtk3.so.%{avahi_gtk3_soname}*
%files -n libavahi-glib1
%defattr(-,root,root)
@@ -1103,6 +1139,7 @@
%{_libdir}/libavahi-ui*.*so
%{_libdir}/pkgconfig/avahi-glib.pc
%{_libdir}/pkgconfig/avahi-ui.pc
+%{_libdir}/pkgconfig/avahi-ui-gtk3.pc
%files -n libavahi-gobject-devel
%defattr(-,root,root)
++++++ avahi-mono.spec ++++++
--- /var/tmp/diff_new_pack.hRk6jq/_old 2011-05-02 12:16:01.000000000 +0200
+++ /var/tmp/diff_new_pack.hRk6jq/_new 2011-05-02 12:16:01.000000000 +0200
@@ -25,13 +25,13 @@
# For build all at once, set all to 1.
# If you set build_core to 0, you cannot set more than one other option to 1.
%define build_core 0
-# NOTE: build_glib2 also controls build of gobject, gtk2 and pygtk code.
+# NOTE: build_glib2 also controls build of gobject, gtk2, gtk3 and pygtk code.
%define build_glib2 0
%define build_mono 1
%define build_qt3 0
%define build_qt4 0
Version: 0.6.28
-Release: 4
+Release: 5
%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})
@@ -42,6 +42,7 @@
%define avahi_ui_soname 0
%define avahi_glib_soname 1
%define avahi_gobject_soname 0
+%define avahi_gtk3_soname 0
%define avahi_qt3_soname 1
%define avahi_qt4_soname 1
%if %build_glib2
@@ -85,7 +86,12 @@
%endif
%if %build_core
Source5: %{_name}_spec-prepare.sh
-PreReq: pwdutils sysvinit(network)
+PreReq: pwdutils
+%if %suse_version >= 1140
+PreReq: sysvinit(network)
+%else
+PreReq: sysconfig
+%endif
Recommends: %{_name}-lang
BuildRequires: dbus-1-devel doxygen graphviz python-gdbm zlib-devel
# For python bindings and utilities:
@@ -102,7 +108,7 @@
Obsoletes: mDNSResponder < 107.5
%endif
%if %build_glib2
-BuildRequires: gobject-introspection-devel python-gtk-devel update-desktop-files
+BuildRequires: gobject-introspection-devel gtk2-devel gtk3-devel python-gtk-devel update-desktop-files
BuildRequires: libavahi-devel
%endif
%if %build_qt3
@@ -379,6 +385,25 @@
addition, it supports some nifty things, like correct mDNS reflection
across LAN segments.
+%package -n libavahi-ui-gtk3-%{avahi_gtk3_soname}
+
+License: LGPLv2.1+
+Summary: D-BUS Service for Zeroconf and Bonjour
+Group: System/Libraries
+
+%description -n libavahi-ui-gtk3-%{avahi_gtk3_soname}
+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.
+
%package -n libavahi-glib1
License: LGPLv2.1+
Summary: Glib Bindings for avahi, the D-BUS Service for Zeroconf and Bonjour
@@ -473,7 +498,10 @@
%package -n libavahi-glib-devel
License: LGPLv2.1+
Summary: Include Files and Libraries Mandatory for Development
-Requires: libavahi-devel = %{version} libavahi-ui0 = %{version} libavahi-glib1 = %{version} glib2-devel gtk2-devel
+Requires: libavahi-devel = %{version}
+Requires: libavahi-glib1 = %{version}
+Requires: libavahi-ui0 = %{version}
+Requires: libavahi-ui-gtk3-%{avahi_gtk3_soname} = %{version}
Group: Development/Libraries/C and C++
# Last appeared in OpenSUSE 10.3:
Provides: avahi-devel:%{_libdir}/libavahi-glib.so
@@ -685,7 +713,7 @@
--enable-glib\
--enable-gobject\
--enable-gtk\
- --disable-gtk3\
+ --enable-gtk3\
--enable-pygtk\
%else
--disable-glib\
@@ -906,6 +934,10 @@
%postun -n libavahi-ui0 -p /sbin/ldconfig
+%post -n libavahi-ui-gtk3-%{avahi_gtk3_soname} -p /sbin/ldconfig
+
+%postun -n libavahi-ui-gtk3-%{avahi_gtk3_soname} -p /sbin/ldconfig
+
%post -n libavahi-gobject0 -p /sbin/ldconfig
%postun -n libavahi-gobject0 -p /sbin/ldconfig
@@ -1062,7 +1094,11 @@
%files -n libavahi-ui0
%defattr(-,root,root)
-%{_libdir}/libavahi-ui*.so.*
+%{_libdir}/libavahi-ui.so.*
+
+%files -n libavahi-ui-gtk3-%{avahi_gtk3_soname}
+%defattr(-,root,root)
+%{_libdir}/libavahi-ui-gtk3.so.%{avahi_gtk3_soname}*
%files -n libavahi-glib1
%defattr(-,root,root)
@@ -1102,6 +1138,7 @@
%{_libdir}/libavahi-ui*.*so
%{_libdir}/pkgconfig/avahi-glib.pc
%{_libdir}/pkgconfig/avahi-ui.pc
+%{_libdir}/pkgconfig/avahi-ui-gtk3.pc
%files -n libavahi-gobject-devel
%defattr(-,root,root)
++++++ avahi-qt4.spec ++++++
--- /var/tmp/diff_new_pack.hRk6jq/_old 2011-05-02 12:16:01.000000000 +0200
+++ /var/tmp/diff_new_pack.hRk6jq/_new 2011-05-02 12:16:01.000000000 +0200
@@ -25,13 +25,13 @@
# For build all at once, set all to 1.
# If you set build_core to 0, you cannot set more than one other option to 1.
%define build_core 0
-# NOTE: build_glib2 also controls build of gobject, gtk2 and pygtk code.
+# NOTE: build_glib2 also controls build of gobject, gtk2, gtk3 and pygtk code.
%define build_glib2 0
%define build_mono 0
%define build_qt3 0
%define build_qt4 1
Version: 0.6.28
-Release: 4
+Release: 5
%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})
@@ -42,6 +42,7 @@
%define avahi_ui_soname 0
%define avahi_glib_soname 1
%define avahi_gobject_soname 0
+%define avahi_gtk3_soname 0
%define avahi_qt3_soname 1
%define avahi_qt4_soname 1
%if %build_glib2
@@ -85,7 +86,12 @@
%endif
%if %build_core
Source5: %{_name}_spec-prepare.sh
-PreReq: pwdutils sysvinit(network)
+PreReq: pwdutils
+%if %suse_version >= 1140
+PreReq: sysvinit(network)
+%else
+PreReq: sysconfig
+%endif
Recommends: %{_name}-lang
BuildRequires: dbus-1-devel doxygen graphviz python-gdbm zlib-devel
# For python bindings and utilities:
@@ -102,7 +108,7 @@
Obsoletes: mDNSResponder < 107.5
%endif
%if %build_glib2
-BuildRequires: gobject-introspection-devel python-gtk-devel update-desktop-files
+BuildRequires: gobject-introspection-devel gtk2-devel gtk3-devel python-gtk-devel update-desktop-files
BuildRequires: libavahi-devel
%endif
%if %build_qt3
@@ -382,6 +388,25 @@
addition, it supports some nifty things, like correct mDNS reflection
across LAN segments.
+%package -n libavahi-ui-gtk3-%{avahi_gtk3_soname}
+
+License: LGPLv2.1+
+Summary: D-BUS Service for Zeroconf and Bonjour
+Group: System/Libraries
+
+%description -n libavahi-ui-gtk3-%{avahi_gtk3_soname}
+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.
+
%package -n libavahi-glib1
License: LGPLv2.1+
Summary: Glib Bindings for avahi, the D-BUS Service for Zeroconf and Bonjour
@@ -476,7 +501,10 @@
%package -n libavahi-glib-devel
License: LGPLv2.1+
Summary: Include Files and Libraries Mandatory for Development
-Requires: libavahi-devel = %{version} libavahi-ui0 = %{version} libavahi-glib1 = %{version} glib2-devel gtk2-devel
+Requires: libavahi-devel = %{version}
+Requires: libavahi-glib1 = %{version}
+Requires: libavahi-ui0 = %{version}
+Requires: libavahi-ui-gtk3-%{avahi_gtk3_soname} = %{version}
Group: Development/Libraries/C and C++
# Last appeared in OpenSUSE 10.3:
Provides: avahi-devel:%{_libdir}/libavahi-glib.so
@@ -688,7 +716,7 @@
--enable-glib\
--enable-gobject\
--enable-gtk\
- --disable-gtk3\
+ --enable-gtk3\
--enable-pygtk\
%else
--disable-glib\
@@ -909,6 +937,10 @@
%postun -n libavahi-ui0 -p /sbin/ldconfig
+%post -n libavahi-ui-gtk3-%{avahi_gtk3_soname} -p /sbin/ldconfig
+
+%postun -n libavahi-ui-gtk3-%{avahi_gtk3_soname} -p /sbin/ldconfig
+
%post -n libavahi-gobject0 -p /sbin/ldconfig
%postun -n libavahi-gobject0 -p /sbin/ldconfig
@@ -1065,7 +1097,11 @@
%files -n libavahi-ui0
%defattr(-,root,root)
-%{_libdir}/libavahi-ui*.so.*
+%{_libdir}/libavahi-ui.so.*
+
+%files -n libavahi-ui-gtk3-%{avahi_gtk3_soname}
+%defattr(-,root,root)
+%{_libdir}/libavahi-ui-gtk3.so.%{avahi_gtk3_soname}*
%files -n libavahi-glib1
%defattr(-,root,root)
@@ -1105,6 +1141,7 @@
%{_libdir}/libavahi-ui*.*so
%{_libdir}/pkgconfig/avahi-glib.pc
%{_libdir}/pkgconfig/avahi-ui.pc
+%{_libdir}/pkgconfig/avahi-ui-gtk3.pc
%files -n libavahi-gobject-devel
%defattr(-,root,root)
++++++ avahi.spec ++++++
--- /var/tmp/diff_new_pack.hRk6jq/_old 2011-05-02 12:16:01.000000000 +0200
+++ /var/tmp/diff_new_pack.hRk6jq/_new 2011-05-02 12:16:01.000000000 +0200
@@ -27,13 +27,13 @@
# For build all at once, set all to 1.
# If you set build_core to 0, you cannot set more than one other option to 1.
%define build_core 1
-# NOTE: build_glib2 also controls build of gobject, gtk2 and pygtk code.
+# NOTE: build_glib2 also controls build of gobject, gtk2, gtk3 and pygtk code.
%define build_glib2 0
%define build_mono 0
%define build_qt3 0
%define build_qt4 0
Version: 0.6.28
-Release: 9
+Release: 10
%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})
@@ -44,6 +44,7 @@
%define avahi_ui_soname 0
%define avahi_glib_soname 1
%define avahi_gobject_soname 0
+%define avahi_gtk3_soname 0
%define avahi_qt3_soname 1
%define avahi_qt4_soname 1
%if %build_glib2
@@ -87,7 +88,12 @@
%endif
%if %build_core
Source5: %{_name}_spec-prepare.sh
-PreReq: pwdutils sysvinit(network)
+PreReq: pwdutils
+%if %suse_version >= 1140
+PreReq: sysvinit(network)
+%else
+PreReq: sysconfig
+%endif
Recommends: %{_name}-lang
BuildRequires: dbus-1-devel doxygen graphviz python-gdbm zlib-devel
# For python bindings and utilities:
@@ -104,7 +110,7 @@
Obsoletes: mDNSResponder < 107.5
%endif
%if %build_glib2
-BuildRequires: gobject-introspection-devel python-gtk-devel update-desktop-files
+BuildRequires: gobject-introspection-devel gtk2-devel gtk3-devel python-gtk-devel update-desktop-files
BuildRequires: libavahi-devel
%endif
%if %build_qt3
@@ -382,6 +388,25 @@
addition, it supports some nifty things, like correct mDNS reflection
across LAN segments.
+%package -n libavahi-ui-gtk3-%{avahi_gtk3_soname}
+
+License: LGPLv2.1+
+Summary: D-BUS Service for Zeroconf and Bonjour
+Group: System/Libraries
+
+%description -n libavahi-ui-gtk3-%{avahi_gtk3_soname}
+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.
+
%package -n libavahi-glib1
License: LGPLv2.1+
Summary: Glib Bindings for avahi, the D-BUS Service for Zeroconf and Bonjour
@@ -476,7 +501,10 @@
%package -n libavahi-glib-devel
License: LGPLv2.1+
Summary: Include Files and Libraries Mandatory for Development
-Requires: libavahi-devel = %{version} libavahi-ui0 = %{version} libavahi-glib1 = %{version} glib2-devel gtk2-devel
+Requires: libavahi-devel = %{version}
+Requires: libavahi-glib1 = %{version}
+Requires: libavahi-ui0 = %{version}
+Requires: libavahi-ui-gtk3-%{avahi_gtk3_soname} = %{version}
Group: Development/Libraries/C and C++
# Last appeared in OpenSUSE 10.3:
Provides: avahi-devel:%{_libdir}/libavahi-glib.so
@@ -688,7 +716,7 @@
--enable-glib\
--enable-gobject\
--enable-gtk\
- --disable-gtk3\
+ --enable-gtk3\
--enable-pygtk\
%else
--disable-glib\
@@ -909,6 +937,10 @@
%postun -n libavahi-ui0 -p /sbin/ldconfig
+%post -n libavahi-ui-gtk3-%{avahi_gtk3_soname} -p /sbin/ldconfig
+
+%postun -n libavahi-ui-gtk3-%{avahi_gtk3_soname} -p /sbin/ldconfig
+
%post -n libavahi-gobject0 -p /sbin/ldconfig
%postun -n libavahi-gobject0 -p /sbin/ldconfig
@@ -1065,7 +1097,11 @@
%files -n libavahi-ui0
%defattr(-,root,root)
-%{_libdir}/libavahi-ui*.so.*
+%{_libdir}/libavahi-ui.so.*
+
+%files -n libavahi-ui-gtk3-%{avahi_gtk3_soname}
+%defattr(-,root,root)
+%{_libdir}/libavahi-ui-gtk3.so.%{avahi_gtk3_soname}*
%files -n libavahi-glib1
%defattr(-,root,root)
@@ -1105,6 +1141,7 @@
%{_libdir}/libavahi-ui*.*so
%{_libdir}/pkgconfig/avahi-glib.pc
%{_libdir}/pkgconfig/avahi-ui.pc
+%{_libdir}/pkgconfig/avahi-ui-gtk3.pc
%files -n libavahi-gobject-devel
%defattr(-,root,root)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org