Accepting request 590334 from GNOME:Factory

OBS-URL: https://build.opensuse.org/request/show/590334
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/avahi?expand=0&rev=122
This commit is contained in:
Dominique Leuenberger 2018-03-24 15:09:42 +00:00 committed by Git OBS Bridge
commit cf9a91886d
5 changed files with 9 additions and 328 deletions

View File

@ -25,7 +25,6 @@
# NOTE: build_glib2 also controls build of gobject, gtk2, gtk3 code.
%define build_glib2 1
%define build_mono 0
%define build_qt3 0
%define build_qt4 0
%define avahi_client_sover 3
%define avahi_common_sover 3
@ -34,7 +33,6 @@
%define avahi_glib_sover 1
%define avahi_gobject_sover 0
%define avahi_gtk3_sover 0
%define avahi_qt3_sover 1
%define avahi_qt4_sover 1
%if %{build_glib2}
%define debug_package_requires libavahi-ui%{avahi_ui_sover} = %{version}-%{release}
@ -88,7 +86,7 @@ BuildRequires: python-devel
BuildRequires: python-gdbm
BuildRequires: translation-update-upstream
# FIXME: on upgrade, ensure to verify if -DGTK_DISABLE_DEPRECATED=1 can remain in avahi=ui/Makefile.am (GtkStock deprecated with GTK+ 3.9.10).
%if !%{build_glib2} && !%{build_mono} && !%{build_qt3} && !%{build_qt4}
%if !%{build_glib2} && !%{build_mono} && !%{build_qt4}
# Create split spec files only when building per partes:
#%(sh %{_sourcedir}/%{_name}_spec-prepare.sh %{_sourcedir} %{name})
%endif
@ -127,10 +125,6 @@ BuildRequires: python-gtk-devel
BuildRequires: update-desktop-files
BuildRequires: pkgconfig(pygobject-3.0)
%endif
%if %{build_qt3}
BuildRequires: libavahi-devel
BuildRequires: qt3-devel
%endif
%if %{build_qt4}
BuildRequires: libavahi-devel
BuildRequires: libqt4-devel
@ -597,55 +591,6 @@ across LAN segments.
%endif
%if %{build_qt3}
%package -n libavahi-qt3-1
Summary: Qt3 Bindings for avahi, the D-BUS Service for Zeroconf and Bonjour
# Old name used for <= 10.3:
Group: System/GUI/KDE
Provides: avahi-qt3 = %{version}
Obsoletes: avahi-qt3 < %{version}
%description -n libavahi-qt3-1
Qt3 bindings for avahi.
Avahi is an implementation the DNS Service Discovery and Multicast DNS
specifications for Zeroconf Computing. It uses D-BUS for communication
between user applications and a system daemon. The daemon is used to
coordinate application efforts in caching replies, necessary to
minimize the traffic imposed on networks.
The Avahi mDNS responder is now feature complete implementing all MUSTs
and the majority of the SHOULDs of the mDNS/DNS-SD RFCs. It passes all
tests in the Apple Bonjour conformance test suite. In addition it
supports some nifty things that have never been seen elsewhere like
correct mDNS reflection across LAN segments.
%package -n libavahi-qt3-devel
Summary: Include Files and Libraries Mandatory for Development
Group: Development/Libraries/C and C++
Requires: libavahi-devel = %{version}
Requires: libavahi-qt3-1 = %{version}
Requires: qt3-devel
# Last appeared in OpenSUSE 10.3:
Provides: avahi-devel:%{_libdir}/libavahi-qt3.so
%description -n libavahi-qt3-devel
Qt3 bindings for avahi.
Avahi is an implementation the DNS Service Discovery and Multicast DNS
specifications for Zeroconf Computing. It uses D-BUS for communication
between user applications and a system daemon. The daemon is used to
coordinate application efforts in caching replies, necessary to
minimize the traffic imposed on networks.
The Avahi mDNS responder is now feature complete implementing all MUSTs
and the majority of the SHOULDs of the mDNS/DNS-SD RFCs. It passes all
tests in the Apple Bonjour conformance test suite. In addition it
supports some nifty things that have never been seen elsewhere like
correct mDNS reflection across LAN segments.
%endif
%if %{build_qt4}
%package -n libavahi-qt4-1
Summary: Qt4 Bindings for avahi, the D-BUS Service for Zeroconf and Bonjour
@ -787,11 +732,7 @@ intltoolize -f
%endif
--disable-gtk3\
%endif
%if %{build_qt3}
--enable-qt3\
%else
--disable-qt3\
%endif
%if %{build_qt4}
--enable-qt4\
%else
@ -813,9 +754,6 @@ make %{?_smp_mflags}
cd ..
done
%endif
%if %{build_qt3} && !%{build_core}
cd avahi-qt
%endif
%if %{build_qt4} && !%{build_core}
cd avahi-qt
%endif
@ -835,9 +773,6 @@ cd ..
done
cd -
%endif
%if %{build_qt3} && !%{build_core}
cd avahi-qt
%endif
%if %{build_qt4} && !%{build_core}
cd avahi-qt
%endif
@ -1005,11 +940,6 @@ chown -R avahi-autoipd:avahi-autoipd %{_localstatedir}/lib/avahi-autoipd
%desktop_database_post
%endif
%if %{build_qt3}
%post -n libavahi-qt3-1 -p /sbin/ldconfig
%postun -n libavahi-qt3-1 -p /sbin/ldconfig
%endif
%if %{build_qt4}
%post -n libavahi-qt4-1 -p /sbin/ldconfig
%postun -n libavahi-qt4-1 -p /sbin/ldconfig
@ -1185,17 +1115,6 @@ chown -R avahi-autoipd:avahi-autoipd %{_localstatedir}/lib/avahi-autoipd
%{_datadir}/gir-1.0/*.gir
%endif
%if %{build_qt3}
%files -n libavahi-qt3-devel
%{_includedir}/avahi-qt3
%{_libdir}/libavahi-qt3*.*a
%{_libdir}/libavahi-qt3*.so
%{_libdir}/pkgconfig/avahi-qt3.pc
%files -n libavahi-qt3-1
%{_libdir}/libavahi-qt3*.so.*
%endif
%if %{build_qt4}
%files -n libavahi-qt4-devel
%{_includedir}/avahi-qt4

View File

@ -25,7 +25,6 @@
# NOTE: build_glib2 also controls build of gobject, gtk2, gtk3 code.
%define build_glib2 0
%define build_mono 1
%define build_qt3 0
%define build_qt4 0
%define avahi_client_sover 3
%define avahi_common_sover 3
@ -34,7 +33,6 @@
%define avahi_glib_sover 1
%define avahi_gobject_sover 0
%define avahi_gtk3_sover 0
%define avahi_qt3_sover 1
%define avahi_qt4_sover 1
%if %{build_glib2}
%define debug_package_requires libavahi-ui%{avahi_ui_sover} = %{version}-%{release}
@ -88,7 +86,7 @@ BuildRequires: python-devel
BuildRequires: python-gdbm
BuildRequires: translation-update-upstream
# FIXME: on upgrade, ensure to verify if -DGTK_DISABLE_DEPRECATED=1 can remain in avahi=ui/Makefile.am (GtkStock deprecated with GTK+ 3.9.10).
%if !%{build_glib2} && !%{build_mono} && !%{build_qt3} && !%{build_qt4}
%if !%{build_glib2} && !%{build_mono} && !%{build_qt4}
# Create split spec files only when building per partes:
#%(sh %{_sourcedir}/%{_name}_spec-prepare.sh %{_sourcedir} %{name})
%endif
@ -127,10 +125,6 @@ BuildRequires: python-gtk-devel
BuildRequires: update-desktop-files
BuildRequires: pkgconfig(pygobject-3.0)
%endif
%if %{build_qt3}
BuildRequires: libavahi-devel
BuildRequires: qt3-devel
%endif
%if %{build_qt4}
BuildRequires: libavahi-devel
BuildRequires: libqt4-devel
@ -596,55 +590,6 @@ across LAN segments.
%endif
%if %{build_qt3}
%package -n libavahi-qt3-1
Summary: Qt3 Bindings for avahi, the D-BUS Service for Zeroconf and Bonjour
# Old name used for <= 10.3:
Group: System/GUI/KDE
Provides: avahi-qt3 = %{version}
Obsoletes: avahi-qt3 < %{version}
%description -n libavahi-qt3-1
Qt3 bindings for avahi.
Avahi is an implementation the DNS Service Discovery and Multicast DNS
specifications for Zeroconf Computing. It uses D-BUS for communication
between user applications and a system daemon. The daemon is used to
coordinate application efforts in caching replies, necessary to
minimize the traffic imposed on networks.
The Avahi mDNS responder is now feature complete implementing all MUSTs
and the majority of the SHOULDs of the mDNS/DNS-SD RFCs. It passes all
tests in the Apple Bonjour conformance test suite. In addition it
supports some nifty things that have never been seen elsewhere like
correct mDNS reflection across LAN segments.
%package -n libavahi-qt3-devel
Summary: Include Files and Libraries Mandatory for Development
Group: Development/Libraries/C and C++
Requires: libavahi-devel = %{version}
Requires: libavahi-qt3-1 = %{version}
Requires: qt3-devel
# Last appeared in OpenSUSE 10.3:
Provides: avahi-devel:%{_libdir}/libavahi-qt3.so
%description -n libavahi-qt3-devel
Qt3 bindings for avahi.
Avahi is an implementation the DNS Service Discovery and Multicast DNS
specifications for Zeroconf Computing. It uses D-BUS for communication
between user applications and a system daemon. The daemon is used to
coordinate application efforts in caching replies, necessary to
minimize the traffic imposed on networks.
The Avahi mDNS responder is now feature complete implementing all MUSTs
and the majority of the SHOULDs of the mDNS/DNS-SD RFCs. It passes all
tests in the Apple Bonjour conformance test suite. In addition it
supports some nifty things that have never been seen elsewhere like
correct mDNS reflection across LAN segments.
%endif
%if %{build_qt4}
%package -n libavahi-qt4-1
Summary: Qt4 Bindings for avahi, the D-BUS Service for Zeroconf and Bonjour
@ -787,11 +732,7 @@ intltoolize -f
%endif
--disable-gtk3\
%endif
%if %{build_qt3}
--enable-qt3\
%else
--disable-qt3\
%endif
%if %{build_qt4}
--enable-qt4\
%else
@ -813,9 +754,6 @@ make %{?_smp_mflags}
cd ..
done
%endif
%if %{build_qt3} && !%{build_core}
cd avahi-qt
%endif
%if %{build_qt4} && !%{build_core}
cd avahi-qt
%endif
@ -835,9 +773,6 @@ cd ..
done
cd -
%endif
%if %{build_qt3} && !%{build_core}
cd avahi-qt
%endif
%if %{build_qt4} && !%{build_core}
cd avahi-qt
%endif
@ -1005,11 +940,6 @@ chown -R avahi-autoipd:avahi-autoipd %{_localstatedir}/lib/avahi-autoipd
%desktop_database_post
%endif
%if %{build_qt3}
%post -n libavahi-qt3-1 -p /sbin/ldconfig
%postun -n libavahi-qt3-1 -p /sbin/ldconfig
%endif
%if %{build_qt4}
%post -n libavahi-qt4-1 -p /sbin/ldconfig
%postun -n libavahi-qt4-1 -p /sbin/ldconfig
@ -1185,17 +1115,6 @@ chown -R avahi-autoipd:avahi-autoipd %{_localstatedir}/lib/avahi-autoipd
%{_datadir}/gir-1.0/*.gir
%endif
%if %{build_qt3}
%files -n libavahi-qt3-devel
%{_includedir}/avahi-qt3
%{_libdir}/libavahi-qt3*.*a
%{_libdir}/libavahi-qt3*.so
%{_libdir}/pkgconfig/avahi-qt3.pc
%files -n libavahi-qt3-1
%{_libdir}/libavahi-qt3*.so.*
%endif
%if %{build_qt4}
%files -n libavahi-qt4-devel
%{_includedir}/avahi-qt4

View File

@ -25,7 +25,6 @@
# NOTE: build_glib2 also controls build of gobject, gtk2, gtk3 code.
%define build_glib2 0
%define build_mono 0
%define build_qt3 0
%define build_qt4 1
%define avahi_client_sover 3
%define avahi_common_sover 3
@ -34,7 +33,6 @@
%define avahi_glib_sover 1
%define avahi_gobject_sover 0
%define avahi_gtk3_sover 0
%define avahi_qt3_sover 1
%define avahi_qt4_sover 1
%if %{build_glib2}
%define debug_package_requires libavahi-ui%{avahi_ui_sover} = %{version}-%{release}
@ -88,7 +86,7 @@ BuildRequires: python-devel
BuildRequires: python-gdbm
BuildRequires: translation-update-upstream
# FIXME: on upgrade, ensure to verify if -DGTK_DISABLE_DEPRECATED=1 can remain in avahi=ui/Makefile.am (GtkStock deprecated with GTK+ 3.9.10).
%if !%{build_glib2} && !%{build_mono} && !%{build_qt3} && !%{build_qt4}
%if !%{build_glib2} && !%{build_mono} && !%{build_qt4}
# Create split spec files only when building per partes:
#%(sh %{_sourcedir}/%{_name}_spec-prepare.sh %{_sourcedir} %{name})
%endif
@ -127,10 +125,6 @@ BuildRequires: python-gtk-devel
BuildRequires: update-desktop-files
BuildRequires: pkgconfig(pygobject-3.0)
%endif
%if %{build_qt3}
BuildRequires: libavahi-devel
BuildRequires: qt3-devel
%endif
%if %{build_qt4}
BuildRequires: libavahi-devel
BuildRequires: libqt4-devel
@ -599,55 +593,6 @@ across LAN segments.
%endif
%if %{build_qt3}
%package -n libavahi-qt3-1
Summary: Qt3 Bindings for avahi, the D-BUS Service for Zeroconf and Bonjour
# Old name used for <= 10.3:
Group: System/GUI/KDE
Provides: avahi-qt3 = %{version}
Obsoletes: avahi-qt3 < %{version}
%description -n libavahi-qt3-1
Qt3 bindings for avahi.
Avahi is an implementation the DNS Service Discovery and Multicast DNS
specifications for Zeroconf Computing. It uses D-BUS for communication
between user applications and a system daemon. The daemon is used to
coordinate application efforts in caching replies, necessary to
minimize the traffic imposed on networks.
The Avahi mDNS responder is now feature complete implementing all MUSTs
and the majority of the SHOULDs of the mDNS/DNS-SD RFCs. It passes all
tests in the Apple Bonjour conformance test suite. In addition it
supports some nifty things that have never been seen elsewhere like
correct mDNS reflection across LAN segments.
%package -n libavahi-qt3-devel
Summary: Include Files and Libraries Mandatory for Development
Group: Development/Libraries/C and C++
Requires: libavahi-devel = %{version}
Requires: libavahi-qt3-1 = %{version}
Requires: qt3-devel
# Last appeared in OpenSUSE 10.3:
Provides: avahi-devel:%{_libdir}/libavahi-qt3.so
%description -n libavahi-qt3-devel
Qt3 bindings for avahi.
Avahi is an implementation the DNS Service Discovery and Multicast DNS
specifications for Zeroconf Computing. It uses D-BUS for communication
between user applications and a system daemon. The daemon is used to
coordinate application efforts in caching replies, necessary to
minimize the traffic imposed on networks.
The Avahi mDNS responder is now feature complete implementing all MUSTs
and the majority of the SHOULDs of the mDNS/DNS-SD RFCs. It passes all
tests in the Apple Bonjour conformance test suite. In addition it
supports some nifty things that have never been seen elsewhere like
correct mDNS reflection across LAN segments.
%endif
%if %{build_qt4}
%package -n libavahi-qt4-1
Summary: Qt4 Bindings for avahi, the D-BUS Service for Zeroconf and Bonjour
@ -789,11 +734,7 @@ intltoolize -f
%endif
--disable-gtk3\
%endif
%if %{build_qt3}
--enable-qt3\
%else
--disable-qt3\
%endif
%if %{build_qt4}
--enable-qt4\
%else
@ -815,9 +756,6 @@ make %{?_smp_mflags}
cd ..
done
%endif
%if %{build_qt3} && !%{build_core}
cd avahi-qt
%endif
%if %{build_qt4} && !%{build_core}
cd avahi-qt
%endif
@ -837,9 +775,6 @@ cd ..
done
cd -
%endif
%if %{build_qt3} && !%{build_core}
cd avahi-qt
%endif
%if %{build_qt4} && !%{build_core}
cd avahi-qt
%endif
@ -1007,11 +942,6 @@ chown -R avahi-autoipd:avahi-autoipd %{_localstatedir}/lib/avahi-autoipd
%desktop_database_post
%endif
%if %{build_qt3}
%post -n libavahi-qt3-1 -p /sbin/ldconfig
%postun -n libavahi-qt3-1 -p /sbin/ldconfig
%endif
%if %{build_qt4}
%post -n libavahi-qt4-1 -p /sbin/ldconfig
%postun -n libavahi-qt4-1 -p /sbin/ldconfig
@ -1187,17 +1117,6 @@ chown -R avahi-autoipd:avahi-autoipd %{_localstatedir}/lib/avahi-autoipd
%{_datadir}/gir-1.0/*.gir
%endif
%if %{build_qt3}
%files -n libavahi-qt3-devel
%{_includedir}/avahi-qt3
%{_libdir}/libavahi-qt3*.*a
%{_libdir}/libavahi-qt3*.so
%{_libdir}/pkgconfig/avahi-qt3.pc
%files -n libavahi-qt3-1
%{_libdir}/libavahi-qt3*.so.*
%endif
%if %{build_qt4}
%files -n libavahi-qt4-devel
%{_includedir}/avahi-qt4

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Thu Mar 22 12:50:43 UTC 2018 - tchvatal@suse.com
- Drop the qt3 parts
-------------------------------------------------------------------
Sat Mar 10 08:39:00 UTC 2018 - jengelh@inai.de

View File

@ -27,7 +27,6 @@
# NOTE: build_glib2 also controls build of gobject, gtk2, gtk3 code.
%define build_glib2 0
%define build_mono 0
%define build_qt3 0
%define build_qt4 0
%define avahi_client_sover 3
%define avahi_common_sover 3
@ -36,7 +35,6 @@
%define avahi_glib_sover 1
%define avahi_gobject_sover 0
%define avahi_gtk3_sover 0
%define avahi_qt3_sover 1
%define avahi_qt4_sover 1
%if %{build_glib2}
%define debug_package_requires libavahi-ui%{avahi_ui_sover} = %{version}-%{release}
@ -90,7 +88,7 @@ BuildRequires: python-devel
BuildRequires: python-gdbm
BuildRequires: translation-update-upstream
# FIXME: on upgrade, ensure to verify if -DGTK_DISABLE_DEPRECATED=1 can remain in avahi=ui/Makefile.am (GtkStock deprecated with GTK+ 3.9.10).
%if !%{build_glib2} && !%{build_mono} && !%{build_qt3} && !%{build_qt4}
%if !%{build_glib2} && !%{build_mono} && !%{build_qt4}
# Create split spec files only when building per partes:
#%(sh %{_sourcedir}/%{_name}_spec-prepare.sh %{_sourcedir} %{name})
%endif
@ -129,10 +127,6 @@ BuildRequires: python-gtk-devel
BuildRequires: update-desktop-files
BuildRequires: pkgconfig(pygobject-3.0)
%endif
%if %{build_qt3}
BuildRequires: libavahi-devel
BuildRequires: qt3-devel
%endif
%if %{build_qt4}
BuildRequires: libavahi-devel
BuildRequires: libqt4-devel
@ -599,55 +593,6 @@ across LAN segments.
%endif
%if %{build_qt3}
%package -n libavahi-qt3-1
Summary: Qt3 Bindings for avahi, the D-BUS Service for Zeroconf and Bonjour
# Old name used for <= 10.3:
Group: System/GUI/KDE
Provides: avahi-qt3 = %{version}
Obsoletes: avahi-qt3 < %{version}
%description -n libavahi-qt3-1
Qt3 bindings for avahi.
Avahi is an implementation the DNS Service Discovery and Multicast DNS
specifications for Zeroconf Computing. It uses D-BUS for communication
between user applications and a system daemon. The daemon is used to
coordinate application efforts in caching replies, necessary to
minimize the traffic imposed on networks.
The Avahi mDNS responder is now feature complete implementing all MUSTs
and the majority of the SHOULDs of the mDNS/DNS-SD RFCs. It passes all
tests in the Apple Bonjour conformance test suite. In addition it
supports some nifty things that have never been seen elsewhere like
correct mDNS reflection across LAN segments.
%package -n libavahi-qt3-devel
Summary: Include Files and Libraries Mandatory for Development
Group: Development/Libraries/C and C++
Requires: libavahi-devel = %{version}
Requires: libavahi-qt3-1 = %{version}
Requires: qt3-devel
# Last appeared in OpenSUSE 10.3:
Provides: avahi-devel:%{_libdir}/libavahi-qt3.so
%description -n libavahi-qt3-devel
Qt3 bindings for avahi.
Avahi is an implementation the DNS Service Discovery and Multicast DNS
specifications for Zeroconf Computing. It uses D-BUS for communication
between user applications and a system daemon. The daemon is used to
coordinate application efforts in caching replies, necessary to
minimize the traffic imposed on networks.
The Avahi mDNS responder is now feature complete implementing all MUSTs
and the majority of the SHOULDs of the mDNS/DNS-SD RFCs. It passes all
tests in the Apple Bonjour conformance test suite. In addition it
supports some nifty things that have never been seen elsewhere like
correct mDNS reflection across LAN segments.
%endif
%if %{build_qt4}
%package -n libavahi-qt4-1
Summary: Qt4 Bindings for avahi, the D-BUS Service for Zeroconf and Bonjour
@ -789,11 +734,7 @@ intltoolize -f
%endif
--disable-gtk3\
%endif
%if %{build_qt3}
--enable-qt3\
%else
--disable-qt3\
%endif
%if %{build_qt4}
--enable-qt4\
%else
@ -815,9 +756,6 @@ make %{?_smp_mflags}
cd ..
done
%endif
%if %{build_qt3} && !%{build_core}
cd avahi-qt
%endif
%if %{build_qt4} && !%{build_core}
cd avahi-qt
%endif
@ -837,9 +775,6 @@ cd ..
done
cd -
%endif
%if %{build_qt3} && !%{build_core}
cd avahi-qt
%endif
%if %{build_qt4} && !%{build_core}
cd avahi-qt
%endif
@ -1007,11 +942,6 @@ chown -R avahi-autoipd:avahi-autoipd %{_localstatedir}/lib/avahi-autoipd
%desktop_database_post
%endif
%if %{build_qt3}
%post -n libavahi-qt3-1 -p /sbin/ldconfig
%postun -n libavahi-qt3-1 -p /sbin/ldconfig
%endif
%if %{build_qt4}
%post -n libavahi-qt4-1 -p /sbin/ldconfig
%postun -n libavahi-qt4-1 -p /sbin/ldconfig
@ -1187,17 +1117,6 @@ chown -R avahi-autoipd:avahi-autoipd %{_localstatedir}/lib/avahi-autoipd
%{_datadir}/gir-1.0/*.gir
%endif
%if %{build_qt3}
%files -n libavahi-qt3-devel
%{_includedir}/avahi-qt3
%{_libdir}/libavahi-qt3*.*a
%{_libdir}/libavahi-qt3*.so
%{_libdir}/pkgconfig/avahi-qt3.pc
%files -n libavahi-qt3-1
%{_libdir}/libavahi-qt3*.so.*
%endif
%if %{build_qt4}
%files -n libavahi-qt4-devel
%{_includedir}/avahi-qt4