Accepting request 725223 from GNOME:Next

Subbing for feedback

OBS-URL: https://build.opensuse.org/request/show/725223
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/avahi?expand=0&rev=158

avahi-glib2.changes

@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Mon Aug 12 17:29:45 UTC 2019 - Bjørn Lie <bjorn.lie@gmail.com>
+
+- Drop gtk2-devel and python-gtk-devel BuildRequires: No longer
+  build gtk2 support. Following this, pass --disable-gtk to
+  configure. Drop sub-package libavahi-ui0, no longer built.
+- Drop long disabled sub-packages libavahi-qt4-1 and
+  libavahi-qt4-devel.
+
 -------------------------------------------------------------------
 Fri Jul  5 12:22:21 UTC 2019 - matthias.gerstner@suse.com
 

avahi-glib2.spec

@@ -12,7 +12,7 @@
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.
 
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
 #
 
 
@@ -25,7 +25,6 @@
 # NOTE: build_glib2 also controls build of gobject, gtk2, gtk3 and pygobject code.
 %define         build_glib2 1
 %define         build_mono 0
-%define         build_qt4 0
 %define avahi_client_sover 3
 %define avahi_common_sover 3
 %define avahi_core_sover 7
@@ -33,7 +32,6 @@
 %define avahi_glib_sover 1
 %define avahi_gobject_sover 0
 %define avahi_gtk3_sover 0
-%define avahi_qt4_sover 1
 %if %{build_glib2}
 %define debug_package_requires libavahi-ui%{avahi_ui_sover} = %{version}-%{release}
 %endif
@@ -91,7 +89,7 @@ BuildRequires:  python3-dbus-python
 BuildRequires:  python3-devel
 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_qt4}
+%if !%{build_glib2} && !%{build_mono}
 # Create split spec files only when building per partes:
 #%(sh %{_sourcedir}/%{_name}_spec-prepare.sh %{_sourcedir} %{name})
 %endif
@@ -121,17 +119,11 @@ Obsoletes:      mDNSResponder < 107.5
 %endif
 %if %{build_glib2}
 BuildRequires:  gobject-introspection-devel
-BuildRequires:  gtk2-devel
 BuildRequires:  gtk3-devel
 BuildRequires:  libavahi-devel
-BuildRequires:  python-gtk-devel
 BuildRequires:  update-desktop-files
 BuildRequires:  pkgconfig(pygobject-3.0)
 %endif
-%if %{build_qt4}
-BuildRequires:  libavahi-devel
-BuildRequires:  libqt4-devel
-%endif
 %if %{build_mono}
 BuildRequires:  gtk-sharp2
 BuildRequires:  libavahi-glib-devel
@@ -142,7 +134,6 @@ Requires:       gtk-sharp2
 Requires:       libavahi-client3 >= %{version}
 Requires:       libavahi-common3 >= %{version}
 Requires:       libavahi-glib1 >= %{version}
-Requires:       libavahi-ui0 >= %{version}
 %endif
 
 %description
@@ -397,23 +388,6 @@ 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-ui0
-Summary:        D-Bus Service for Zeroconf and Bonjour
-Group:          System/Libraries
-
-%description -n libavahi-ui0
-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-ui-gtk3-%{avahi_gtk3_sover}
 Summary:        D-Bus Service for Zeroconf and Bonjour
 Group:          System/Libraries
@@ -546,7 +520,6 @@ Group:          Development/Libraries/C and C++
 Requires:       libavahi-devel = %{version}
 Requires:       libavahi-glib1 = %{version}
 Requires:       libavahi-ui-gtk3-%{avahi_gtk3_sover} = %{version}
-Requires:       libavahi-ui0 = %{version}
 Requires:       typelib-1_0-Avahi-0_6 = %{version}
 # Last appeared in OpenSUSE 10.3:
 Provides:       avahi-devel:%{_libdir}/libavahi-glib.so
@@ -587,52 +560,6 @@ 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-qt4-1
-Summary:        Qt4 Bindings for avahi, the D-Bus Service for Zeroconf and Bonjour
-# Old name used for <= 10.3:
-Group:          System/GUI/KDE
-Provides:       avahi-qt4 = %{version}
-Obsoletes:      avahi-qt4 < %{version}
-
-%description -n libavahi-qt4-1
-Qt4 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-qt4-devel
-Summary:        Header files for Avahi's Qt4 bindings
-Group:          Development/Libraries/C and C++
-Requires:       libavahi-devel = %{version}
-Requires:       libavahi-qt4-1 = %{version}
-Requires:       libqt4-devel
-# Last appeared in OpenSUSE 10.3:
-Provides:       avahi-devel:%{_libdir}/libavahi-qt4.so
-
-%description -n libavahi-qt4-devel
-Qt4 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.
-
 %if %{build_core}
 %if %{build_mono}
 %package -n avahi-mono
@@ -642,7 +569,6 @@ Requires:       gtk-sharp2
 Requires:       libavahi-client3 >= %{version}
 Requires:       libavahi-common3 >= %{version}
 Requires:       libavahi-glib1 >= %{version}
-Requires:       libavahi-ui0 >= %{version}
 
 %description -n avahi-mono
 This package provides Mono bindings for avahi. Avahi is an
@@ -716,7 +642,7 @@ export PYTHON=%{_bindir}/python3
 %if %{build_glib2}
 	--enable-glib\
 	--enable-gobject\
-	--enable-gtk\
+	--disable-gtk\
 	--enable-gtk3\
 	--enable-pygobject\
 %else
@@ -729,14 +655,10 @@ export PYTHON=%{_bindir}/python3
 	--disable-gtk3\
 %endif
 	--disable-qt3\
-%if %{build_qt4}
-	--enable-qt4\
-%else
 	--disable-qt4\
-%endif
 %if %{build_mono}
 	--enable-mono\
-	--enable-gtk\
+	--disable-gtk\
 %else
 	--disable-mono\
 %endif
@@ -750,9 +672,6 @@ make %{?_smp_mflags}
 cd ..
 done
 %endif
-%if %{build_qt4} && !%{build_core}
-cd avahi-qt
-%endif
 %if %{build_mono} && !%{build_core}
 cd avahi-sharp
 make %{?_smp_mflags}
@@ -769,9 +688,6 @@ cd ..
 done
 cd -
 %endif
-%if %{build_qt4} && !%{build_core}
-cd avahi-qt
-%endif
 %if %{build_mono} && !%{build_core}
 cd avahi-sharp
 %make_install
@@ -847,7 +763,6 @@ rmdir %{buildroot}/%{_datadir}/avahi/interfaces
 rmdir %{buildroot}/%{_datadir}/avahi
 %else
 %if %{build_mono}
-rm %{buildroot}/%{_libdir}/pkgconfig/avahi-ui.pc
 %if 0%{?suse_version} >= 1330
 strip-nondeterminism %{buildroot}/%{_prefix}/lib/monodoc/sources/*.zip
 %endif
@@ -910,8 +825,6 @@ chown -R avahi-autoipd:avahi-autoipd %{_localstatedir}/lib/avahi-autoipd
 %postun -n libdns_sd -p /sbin/ldconfig
 %post -n libhowl0 -p /sbin/ldconfig
 %postun -n libhowl0 -p /sbin/ldconfig
-%post -n libavahi-ui0 -p /sbin/ldconfig
-%postun -n libavahi-ui0 -p /sbin/ldconfig
 %post -n libavahi-ui-gtk3-%{avahi_gtk3_sover} -p /sbin/ldconfig
 %postun -n libavahi-ui-gtk3-%{avahi_gtk3_sover} -p /sbin/ldconfig
 %post -n libavahi-gobject0 -p /sbin/ldconfig
@@ -931,9 +844,6 @@ chown -R avahi-autoipd:avahi-autoipd %{_localstatedir}/lib/avahi-autoipd
 %postun -n avahi-utils-gtk
 %desktop_database_post
 
-%post -n libavahi-qt4-1 -p /sbin/ldconfig
-%postun -n libavahi-qt4-1 -p /sbin/ldconfig
-
 %if %{build_core}
 %files
 %license LICENSE
@@ -1054,9 +964,6 @@ chown -R avahi-autoipd:avahi-autoipd %{_localstatedir}/lib/avahi-autoipd
 %endif
 
 %if %{build_glib2}
-%files -n libavahi-ui0
-%{_libdir}/libavahi-ui.so.*
-
 %files -n libavahi-ui-gtk3-%{avahi_gtk3_sover}
 %{_libdir}/libavahi-ui-gtk3.so.%{avahi_gtk3_sover}*
 
@@ -1073,7 +980,6 @@ chown -R avahi-autoipd:avahi-autoipd %{_localstatedir}/lib/avahi-autoipd
 %files -n python3-avahi-gtk
 %{_bindir}/avahi-discover
 %{_datadir}/applications/avahi-discover.desktop
-%{_mandir}/man1/avahi-discover.1*
 %{python3_sitelib}/avahi_discover
 
 %files -n avahi-utils-gtk
@@ -1083,8 +989,6 @@ chown -R avahi-autoipd:avahi-autoipd %{_localstatedir}/lib/avahi-autoipd
 %{_bindir}/avahi-discover-standalone
 %{_datadir}/applications/bssh.desktop
 %{_datadir}/applications/bvnc.desktop
-%{_mandir}/man1/bssh.1%{ext_man}
-%{_mandir}/man1/bvnc.1%{ext_man}
 
 %files -n libavahi-glib-devel
 %{_includedir}/avahi-glib
@@ -1094,7 +998,6 @@ chown -R avahi-autoipd:avahi-autoipd %{_localstatedir}/lib/avahi-autoipd
 %{_libdir}/libavahi-ui*.*a
 %{_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
@@ -1105,17 +1008,6 @@ chown -R avahi-autoipd:avahi-autoipd %{_localstatedir}/lib/avahi-autoipd
 %{_datadir}/gir-1.0/*.gir
 %endif
 
-%if %{build_qt4}
-%files -n libavahi-qt4-devel
-%{_includedir}/avahi-qt4
-%{_libdir}/libavahi-qt4*.*a
-%{_libdir}/libavahi-qt4*.so
-%{_libdir}/pkgconfig/avahi-qt4.pc
-
-%files -n libavahi-qt4-1
-%{_libdir}/libavahi-qt4*.so.*
-%endif
-
 %if %{build_mono}
 %if %{build_core}
 %files -n avahi-mono
@@ -1128,8 +1020,6 @@ chown -R avahi-autoipd:avahi-autoipd %{_localstatedir}/lib/avahi-autoipd
 %{_prefix}/lib/monodoc/sources/*.*
 %{_prefix}/lib/mono/avahi-sharp
 %{_prefix}/lib/mono/gac/avahi-sharp
-%{_prefix}/lib/mono/avahi-ui-sharp
-%{_prefix}/lib/mono/gac/avahi-ui-sharp
 %endif
 
 %changelog

avahi-mono.changes

@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Mon Aug 12 17:29:45 UTC 2019 - Bjørn Lie <bjorn.lie@gmail.com>
+
+- Drop gtk2-devel and python-gtk-devel BuildRequires: No longer
+  build gtk2 support. Following this, pass --disable-gtk to
+  configure. Drop sub-package libavahi-ui0, no longer built.
+- Drop long disabled sub-packages libavahi-qt4-1 and
+  libavahi-qt4-devel.
+
 -------------------------------------------------------------------
 Fri Jul  5 12:22:21 UTC 2019 - matthias.gerstner@suse.com
 

avahi-mono.spec

@@ -12,7 +12,7 @@
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.
 
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
 #
 
 
@@ -25,7 +25,6 @@
 # NOTE: build_glib2 also controls build of gobject, gtk2, gtk3 and pygobject code.
 %define         build_glib2 0
 %define         build_mono 1
-%define         build_qt4 0
 %define avahi_client_sover 3
 %define avahi_common_sover 3
 %define avahi_core_sover 7
@@ -33,7 +32,6 @@
 %define avahi_glib_sover 1
 %define avahi_gobject_sover 0
 %define avahi_gtk3_sover 0
-%define avahi_qt4_sover 1
 %if %{build_glib2}
 %define debug_package_requires libavahi-ui%{avahi_ui_sover} = %{version}-%{release}
 %endif
@@ -91,7 +89,7 @@ BuildRequires:  python3-dbus-python
 BuildRequires:  python3-devel
 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_qt4}
+%if !%{build_glib2} && !%{build_mono}
 # Create split spec files only when building per partes:
 #%(sh %{_sourcedir}/%{_name}_spec-prepare.sh %{_sourcedir} %{name})
 %endif
@@ -121,17 +119,11 @@ Obsoletes:      mDNSResponder < 107.5
 %endif
 %if %{build_glib2}
 BuildRequires:  gobject-introspection-devel
-BuildRequires:  gtk2-devel
 BuildRequires:  gtk3-devel
 BuildRequires:  libavahi-devel
-BuildRequires:  python-gtk-devel
 BuildRequires:  update-desktop-files
 BuildRequires:  pkgconfig(pygobject-3.0)
 %endif
-%if %{build_qt4}
-BuildRequires:  libavahi-devel
-BuildRequires:  libqt4-devel
-%endif
 %if %{build_mono}
 BuildRequires:  gtk-sharp2
 BuildRequires:  libavahi-glib-devel
@@ -142,7 +134,6 @@ Requires:       gtk-sharp2
 Requires:       libavahi-client3 >= %{version}
 Requires:       libavahi-common3 >= %{version}
 Requires:       libavahi-glib1 >= %{version}
-Requires:       libavahi-ui0 >= %{version}
 %endif
 
 %description
@@ -396,23 +387,6 @@ 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-ui0
-Summary:        D-Bus Service for Zeroconf and Bonjour
-Group:          System/Libraries
-
-%description -n libavahi-ui0
-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-ui-gtk3-%{avahi_gtk3_sover}
 Summary:        D-Bus Service for Zeroconf and Bonjour
 Group:          System/Libraries
@@ -545,7 +519,6 @@ Group:          Development/Libraries/C and C++
 Requires:       libavahi-devel = %{version}
 Requires:       libavahi-glib1 = %{version}
 Requires:       libavahi-ui-gtk3-%{avahi_gtk3_sover} = %{version}
-Requires:       libavahi-ui0 = %{version}
 Requires:       typelib-1_0-Avahi-0_6 = %{version}
 # Last appeared in OpenSUSE 10.3:
 Provides:       avahi-devel:%{_libdir}/libavahi-glib.so
@@ -586,52 +559,6 @@ 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-qt4-1
-Summary:        Qt4 Bindings for avahi, the D-Bus Service for Zeroconf and Bonjour
-# Old name used for <= 10.3:
-Group:          System/GUI/KDE
-Provides:       avahi-qt4 = %{version}
-Obsoletes:      avahi-qt4 < %{version}
-
-%description -n libavahi-qt4-1
-Qt4 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-qt4-devel
-Summary:        Header files for Avahi's Qt4 bindings
-Group:          Development/Libraries/C and C++
-Requires:       libavahi-devel = %{version}
-Requires:       libavahi-qt4-1 = %{version}
-Requires:       libqt4-devel
-# Last appeared in OpenSUSE 10.3:
-Provides:       avahi-devel:%{_libdir}/libavahi-qt4.so
-
-%description -n libavahi-qt4-devel
-Qt4 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.
-
 %if %{build_core}
 %if %{build_mono}
 %package -n avahi-mono
@@ -642,7 +569,6 @@ Requires:       gtk-sharp2
 Requires:       libavahi-client3 >= %{version}
 Requires:       libavahi-common3 >= %{version}
 Requires:       libavahi-glib1 >= %{version}
-Requires:       libavahi-ui0 >= %{version}
 
 %description -n avahi-mono
 This package provides Mono bindings for avahi. Avahi is an
@@ -716,7 +642,7 @@ export PYTHON=%{_bindir}/python3
 %if %{build_glib2}
 	--enable-glib\
 	--enable-gobject\
-	--enable-gtk\
+	--disable-gtk\
 	--enable-gtk3\
 	--enable-pygobject\
 %else
@@ -729,14 +655,10 @@ export PYTHON=%{_bindir}/python3
 	--disable-gtk3\
 %endif
 	--disable-qt3\
-%if %{build_qt4}
-	--enable-qt4\
-%else
 	--disable-qt4\
-%endif
 %if %{build_mono}
 	--enable-mono\
-	--enable-gtk\
+	--disable-gtk\
 %else
 	--disable-mono\
 %endif
@@ -750,9 +672,6 @@ make %{?_smp_mflags}
 cd ..
 done
 %endif
-%if %{build_qt4} && !%{build_core}
-cd avahi-qt
-%endif
 %if %{build_mono} && !%{build_core}
 cd avahi-sharp
 make %{?_smp_mflags}
@@ -769,9 +688,6 @@ cd ..
 done
 cd -
 %endif
-%if %{build_qt4} && !%{build_core}
-cd avahi-qt
-%endif
 %if %{build_mono} && !%{build_core}
 cd avahi-sharp
 %make_install
@@ -847,7 +763,6 @@ rmdir %{buildroot}/%{_datadir}/avahi/interfaces
 rmdir %{buildroot}/%{_datadir}/avahi
 %else
 %if %{build_mono}
-rm %{buildroot}/%{_libdir}/pkgconfig/avahi-ui.pc
 %if 0%{?suse_version} >= 1330
 strip-nondeterminism %{buildroot}/%{_prefix}/lib/monodoc/sources/*.zip
 %endif
@@ -910,8 +825,6 @@ chown -R avahi-autoipd:avahi-autoipd %{_localstatedir}/lib/avahi-autoipd
 %postun -n libdns_sd -p /sbin/ldconfig
 %post -n libhowl0 -p /sbin/ldconfig
 %postun -n libhowl0 -p /sbin/ldconfig
-%post -n libavahi-ui0 -p /sbin/ldconfig
-%postun -n libavahi-ui0 -p /sbin/ldconfig
 %post -n libavahi-ui-gtk3-%{avahi_gtk3_sover} -p /sbin/ldconfig
 %postun -n libavahi-ui-gtk3-%{avahi_gtk3_sover} -p /sbin/ldconfig
 %post -n libavahi-gobject0 -p /sbin/ldconfig
@@ -931,9 +844,6 @@ chown -R avahi-autoipd:avahi-autoipd %{_localstatedir}/lib/avahi-autoipd
 %postun -n avahi-utils-gtk
 %desktop_database_post
 
-%post -n libavahi-qt4-1 -p /sbin/ldconfig
-%postun -n libavahi-qt4-1 -p /sbin/ldconfig
-
 %if %{build_core}
 %files
 %license LICENSE
@@ -1054,9 +964,6 @@ chown -R avahi-autoipd:avahi-autoipd %{_localstatedir}/lib/avahi-autoipd
 %endif
 
 %if %{build_glib2}
-%files -n libavahi-ui0
-%{_libdir}/libavahi-ui.so.*
-
 %files -n libavahi-ui-gtk3-%{avahi_gtk3_sover}
 %{_libdir}/libavahi-ui-gtk3.so.%{avahi_gtk3_sover}*
 
@@ -1073,7 +980,6 @@ chown -R avahi-autoipd:avahi-autoipd %{_localstatedir}/lib/avahi-autoipd
 %files -n python3-avahi-gtk
 %{_bindir}/avahi-discover
 %{_datadir}/applications/avahi-discover.desktop
-%{_mandir}/man1/avahi-discover.1*
 %{python3_sitelib}/avahi_discover
 
 %files -n avahi-utils-gtk
@@ -1083,8 +989,6 @@ chown -R avahi-autoipd:avahi-autoipd %{_localstatedir}/lib/avahi-autoipd
 %{_bindir}/avahi-discover-standalone
 %{_datadir}/applications/bssh.desktop
 %{_datadir}/applications/bvnc.desktop
-%{_mandir}/man1/bssh.1%{ext_man}
-%{_mandir}/man1/bvnc.1%{ext_man}
 
 %files -n libavahi-glib-devel
 %{_includedir}/avahi-glib
@@ -1094,7 +998,6 @@ chown -R avahi-autoipd:avahi-autoipd %{_localstatedir}/lib/avahi-autoipd
 %{_libdir}/libavahi-ui*.*a
 %{_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
@@ -1105,17 +1008,6 @@ chown -R avahi-autoipd:avahi-autoipd %{_localstatedir}/lib/avahi-autoipd
 %{_datadir}/gir-1.0/*.gir
 %endif
 
-%if %{build_qt4}
-%files -n libavahi-qt4-devel
-%{_includedir}/avahi-qt4
-%{_libdir}/libavahi-qt4*.*a
-%{_libdir}/libavahi-qt4*.so
-%{_libdir}/pkgconfig/avahi-qt4.pc
-
-%files -n libavahi-qt4-1
-%{_libdir}/libavahi-qt4*.so.*
-%endif
-
 %if %{build_mono}
 %if %{build_core}
 %files -n avahi-mono
@@ -1128,8 +1020,6 @@ chown -R avahi-autoipd:avahi-autoipd %{_localstatedir}/lib/avahi-autoipd
 %{_prefix}/lib/monodoc/sources/*.*
 %{_prefix}/lib/mono/avahi-sharp
 %{_prefix}/lib/mono/gac/avahi-sharp
-%{_prefix}/lib/mono/avahi-ui-sharp
-%{_prefix}/lib/mono/gac/avahi-ui-sharp
 %endif
 
 %changelog

avahi.changes

@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Mon Aug 12 17:29:45 UTC 2019 - Bjørn Lie <bjorn.lie@gmail.com>
+
+- Drop gtk2-devel and python-gtk-devel BuildRequires: No longer
+  build gtk2 support. Following this, pass --disable-gtk to
+  configure. Drop sub-package libavahi-ui0, no longer built.
+- Drop long disabled sub-packages libavahi-qt4-1 and
+  libavahi-qt4-devel.
+
+-------------------------------------------------------------------
 Fri Jul  5 12:22:21 UTC 2019 - matthias.gerstner@suse.com
 
 - removal of SuSEfirewall2 service, since SuSEfirewall2 has been replaced by

avahi.spec

@@ -12,7 +12,7 @@
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.
 
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
 #
 
 
@@ -27,7 +27,6 @@
 # NOTE: build_glib2 also controls build of gobject, gtk2, gtk3 and pygobject code.
 %define         build_glib2 0
 %define         build_mono 0
-%define         build_qt4 0
 %define avahi_client_sover 3
 %define avahi_common_sover 3
 %define avahi_core_sover 7
@@ -35,7 +34,6 @@
 %define avahi_glib_sover 1
 %define avahi_gobject_sover 0
 %define avahi_gtk3_sover 0
-%define avahi_qt4_sover 1
 %if %{build_glib2}
 %define debug_package_requires libavahi-ui%{avahi_ui_sover} = %{version}-%{release}
 %endif
@@ -93,7 +91,7 @@ BuildRequires:  python3-dbus-python
 BuildRequires:  python3-devel
 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_qt4}
+%if !%{build_glib2} && !%{build_mono}
 # Create split spec files only when building per partes:
 #%(sh %{_sourcedir}/%{_name}_spec-prepare.sh %{_sourcedir} %{name})
 %endif
@@ -123,17 +121,11 @@ Obsoletes:      mDNSResponder < 107.5
 %endif
 %if %{build_glib2}
 BuildRequires:  gobject-introspection-devel
-BuildRequires:  gtk2-devel
 BuildRequires:  gtk3-devel
 BuildRequires:  libavahi-devel
-BuildRequires:  python-gtk-devel
 BuildRequires:  update-desktop-files
 BuildRequires:  pkgconfig(pygobject-3.0)
 %endif
-%if %{build_qt4}
-BuildRequires:  libavahi-devel
-BuildRequires:  libqt4-devel
-%endif
 %if %{build_mono}
 BuildRequires:  gtk-sharp2
 BuildRequires:  libavahi-glib-devel
@@ -144,7 +136,6 @@ Requires:       gtk-sharp2
 Requires:       libavahi-client3 >= %{version}
 Requires:       libavahi-common3 >= %{version}
 Requires:       libavahi-glib1 >= %{version}
-Requires:       libavahi-ui0 >= %{version}
 %endif
 
 %description
@@ -399,23 +390,6 @@ 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-ui0
-Summary:        D-Bus Service for Zeroconf and Bonjour
-Group:          System/Libraries
-
-%description -n libavahi-ui0
-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-ui-gtk3-%{avahi_gtk3_sover}
 Summary:        D-Bus Service for Zeroconf and Bonjour
 Group:          System/Libraries
@@ -548,7 +522,6 @@ Group:          Development/Libraries/C and C++
 Requires:       libavahi-devel = %{version}
 Requires:       libavahi-glib1 = %{version}
 Requires:       libavahi-ui-gtk3-%{avahi_gtk3_sover} = %{version}
-Requires:       libavahi-ui0 = %{version}
 Requires:       typelib-1_0-Avahi-0_6 = %{version}
 # Last appeared in OpenSUSE 10.3:
 Provides:       avahi-devel:%{_libdir}/libavahi-glib.so
@@ -589,52 +562,6 @@ 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-qt4-1
-Summary:        Qt4 Bindings for avahi, the D-Bus Service for Zeroconf and Bonjour
-# Old name used for <= 10.3:
-Group:          System/GUI/KDE
-Provides:       avahi-qt4 = %{version}
-Obsoletes:      avahi-qt4 < %{version}
-
-%description -n libavahi-qt4-1
-Qt4 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-qt4-devel
-Summary:        Header files for Avahi's Qt4 bindings
-Group:          Development/Libraries/C and C++
-Requires:       libavahi-devel = %{version}
-Requires:       libavahi-qt4-1 = %{version}
-Requires:       libqt4-devel
-# Last appeared in OpenSUSE 10.3:
-Provides:       avahi-devel:%{_libdir}/libavahi-qt4.so
-
-%description -n libavahi-qt4-devel
-Qt4 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.
-
 %if %{build_core}
 %if %{build_mono}
 %package -n avahi-mono
@@ -644,7 +571,6 @@ Requires:       gtk-sharp2
 Requires:       libavahi-client3 >= %{version}
 Requires:       libavahi-common3 >= %{version}
 Requires:       libavahi-glib1 >= %{version}
-Requires:       libavahi-ui0 >= %{version}
 
 %description -n avahi-mono
 This package provides Mono bindings for avahi. Avahi is an
@@ -718,7 +644,7 @@ export PYTHON=%{_bindir}/python3
 %if %{build_glib2}
 	--enable-glib\
 	--enable-gobject\
-	--enable-gtk\
+	--disable-gtk\
 	--enable-gtk3\
 	--enable-pygobject\
 %else
@@ -731,14 +657,10 @@ export PYTHON=%{_bindir}/python3
 	--disable-gtk3\
 %endif
 	--disable-qt3\
-%if %{build_qt4}
-	--enable-qt4\
-%else
 	--disable-qt4\
-%endif
 %if %{build_mono}
 	--enable-mono\
-	--enable-gtk\
+	--disable-gtk\
 %else
 	--disable-mono\
 %endif
@@ -752,9 +674,6 @@ make %{?_smp_mflags}
 cd ..
 done
 %endif
-%if %{build_qt4} && !%{build_core}
-cd avahi-qt
-%endif
 %if %{build_mono} && !%{build_core}
 cd avahi-sharp
 make %{?_smp_mflags}
@@ -771,9 +690,6 @@ cd ..
 done
 cd -
 %endif
-%if %{build_qt4} && !%{build_core}
-cd avahi-qt
-%endif
 %if %{build_mono} && !%{build_core}
 cd avahi-sharp
 %make_install
@@ -849,7 +765,6 @@ rmdir %{buildroot}/%{_datadir}/avahi/interfaces
 rmdir %{buildroot}/%{_datadir}/avahi
 %else
 %if %{build_mono}
-rm %{buildroot}/%{_libdir}/pkgconfig/avahi-ui.pc
 %if 0%{?suse_version} >= 1330
 strip-nondeterminism %{buildroot}/%{_prefix}/lib/monodoc/sources/*.zip
 %endif
@@ -912,8 +827,6 @@ chown -R avahi-autoipd:avahi-autoipd %{_localstatedir}/lib/avahi-autoipd
 %postun -n libdns_sd -p /sbin/ldconfig
 %post -n libhowl0 -p /sbin/ldconfig
 %postun -n libhowl0 -p /sbin/ldconfig
-%post -n libavahi-ui0 -p /sbin/ldconfig
-%postun -n libavahi-ui0 -p /sbin/ldconfig
 %post -n libavahi-ui-gtk3-%{avahi_gtk3_sover} -p /sbin/ldconfig
 %postun -n libavahi-ui-gtk3-%{avahi_gtk3_sover} -p /sbin/ldconfig
 %post -n libavahi-gobject0 -p /sbin/ldconfig
@@ -933,9 +846,6 @@ chown -R avahi-autoipd:avahi-autoipd %{_localstatedir}/lib/avahi-autoipd
 %postun -n avahi-utils-gtk
 %desktop_database_post
 
-%post -n libavahi-qt4-1 -p /sbin/ldconfig
-%postun -n libavahi-qt4-1 -p /sbin/ldconfig
-
 %if %{build_core}
 %files
 %license LICENSE
@@ -1056,9 +966,6 @@ chown -R avahi-autoipd:avahi-autoipd %{_localstatedir}/lib/avahi-autoipd
 %endif
 
 %if %{build_glib2}
-%files -n libavahi-ui0
-%{_libdir}/libavahi-ui.so.*
-
 %files -n libavahi-ui-gtk3-%{avahi_gtk3_sover}
 %{_libdir}/libavahi-ui-gtk3.so.%{avahi_gtk3_sover}*
 
@@ -1075,7 +982,6 @@ chown -R avahi-autoipd:avahi-autoipd %{_localstatedir}/lib/avahi-autoipd
 %files -n python3-avahi-gtk
 %{_bindir}/avahi-discover
 %{_datadir}/applications/avahi-discover.desktop
-%{_mandir}/man1/avahi-discover.1*
 %{python3_sitelib}/avahi_discover
 
 %files -n avahi-utils-gtk
@@ -1085,8 +991,6 @@ chown -R avahi-autoipd:avahi-autoipd %{_localstatedir}/lib/avahi-autoipd
 %{_bindir}/avahi-discover-standalone
 %{_datadir}/applications/bssh.desktop
 %{_datadir}/applications/bvnc.desktop
-%{_mandir}/man1/bssh.1%{ext_man}
-%{_mandir}/man1/bvnc.1%{ext_man}
 
 %files -n libavahi-glib-devel
 %{_includedir}/avahi-glib
@@ -1096,7 +1000,6 @@ chown -R avahi-autoipd:avahi-autoipd %{_localstatedir}/lib/avahi-autoipd
 %{_libdir}/libavahi-ui*.*a
 %{_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
@@ -1107,17 +1010,6 @@ chown -R avahi-autoipd:avahi-autoipd %{_localstatedir}/lib/avahi-autoipd
 %{_datadir}/gir-1.0/*.gir
 %endif
 
-%if %{build_qt4}
-%files -n libavahi-qt4-devel
-%{_includedir}/avahi-qt4
-%{_libdir}/libavahi-qt4*.*a
-%{_libdir}/libavahi-qt4*.so
-%{_libdir}/pkgconfig/avahi-qt4.pc
-
-%files -n libavahi-qt4-1
-%{_libdir}/libavahi-qt4*.so.*
-%endif
-
 %if %{build_mono}
 %if %{build_core}
 %files -n avahi-mono
@@ -1130,8 +1022,6 @@ chown -R avahi-autoipd:avahi-autoipd %{_localstatedir}/lib/avahi-autoipd
 %{_prefix}/lib/monodoc/sources/*.*
 %{_prefix}/lib/mono/avahi-sharp
 %{_prefix}/lib/mono/gac/avahi-sharp
-%{_prefix}/lib/mono/avahi-ui-sharp
-%{_prefix}/lib/mono/gac/avahi-ui-sharp
 %endif
 
 %changelog