rebase 22.03-LTS from master

(cherry picked from commit e912992d591cfcb66a6ad42f6deb541924734947)

avahi.spec

@@ -3,7 +3,7 @@
 
 Name:             avahi
 Version:          0.8
-Release:          17
+Release:          18
 Summary:          Avahi is a local network service discovery
 License:          LGPLv2+
 URL:              http://avahi.org
@@ -29,9 +29,13 @@ Patch6009:        backport-CVE-2023-38469.patch
 
 BuildRequires:    gcc automake libtool desktop-file-utils gtk2-devel glib2-devel gcc-c++
 BuildRequires:    libcap-devel expat-devel gdbm-devel make
-BuildRequires:    intltool perl-XML-Parser xmltoman systemd libevent-devel
+BuildRequires:    intltool perl-XML-Parser systemd libevent-devel
-BuildRequires:    dbus-devel >= 0.90 dbus-glib-devel >= 0.70 gtk3-devel >= 2.99.0 libdaemon-devel >= 0.11
+BuildRequires:    dbus-devel >= 0.90 dbus-glib-devel >= 0.70 libdaemon-devel >= 0.11
-BuildRequires:    pkgconfig(pygobject-3.0) pkgconfig(libevent) >= 2.0.21 
+BuildRequires:    pkgconfig(libevent) >= 2.0.21
+%if 0%{?build_cross} == 0
+BuildRequires:    pkgconfig(pygobject-3.0) xmltoman gtk3-devel >= 2.99.0
+%endif
+
 %if %{WITH_QT5}
 BuildRequires:    qt5-qtbase-devel
 %endif
@@ -80,6 +84,7 @@ Requires:         python2-gobject-base
 %description ui-tools
 Avahi Graphical user interface tools for mDNS services.
 
+%if 0%{?build_cross} == 0
 %package ui
 Summary:          Gtk uesr interface library for Avahi (Gtk2)
 Requires:         %{name}-libs = %{version}-%{release}
@@ -88,6 +93,7 @@ Requires:         gtk2
 
 %description ui
 This package contains a Gtk 2.x widget for browsing services.
+%endif
 
 %package autoipd
 Summary:          Link-local IPv4 address automatic configuration daemon (IPv4LL)
@@ -206,6 +212,7 @@ Requires:         %{name}-gobject%{?_isa} = %{version}-%{release}
 The avahi-gobject-devel package contains the header files and libraries
 necessary for developing programs using avahi-gobject.
 
+%if 0%{?build_cross} == 0
 %package ui-gtk3
 Summary:          Gtk user interface library for Avahi (Gtk+ 3 version)
 Requires:         %{name}-libs = %{version}-%{release}
@@ -224,6 +231,7 @@ Requires:         %{name}-ui-gtk3%{?_isa} = %{version}-%{release}
 %description ui-devel
 The avahi-ui-devel package contains the header files and libraries
 necessary for developing programs using avahi-ui.
+%endif
 
 %package libs
 Summary:          Libraries for avahi run-time use
@@ -267,7 +275,11 @@ NOCONFIGURE=1 ./autogen.sh
         --with-systemdsystemunitdir=%{_unitdir}  --enable-introspection=no \
         --enable-shared=yes --enable-static=no  --disable-silent-rules \
         --enable-compat-libdns_sd --enable-compat-howl --disable-qt3 \
+	%if 0%{?build_cross} == 0
         --disable-qt4 --disable-mono --enable-gtk\
+	%else
+        --disable-qt4 --disable-mono --disable-gtk --disable-gtk3\
+	%endif
         --with-distro=none\
 %if ! %{WITH_PYTHON}
     --disable-python \
@@ -381,9 +393,11 @@ fi
 
 %postun compat-libdns_sd -p /sbin/ldconfig
 
+%if 0%{?build_cross} == 0
 %post   ui -p /sbin/ldconfig
 
 %postun ui -p /sbin/ldconfig
+%endif
 
 %post   libs -p /sbin/ldconfig
 
@@ -393,9 +407,11 @@ fi
 
 %postun glib -p /sbin/ldconfig
 
+%if 0%{?build_cross} == 0
 %post   ui-gtk3 -p /sbin/ldconfig
 
 %postun ui-gtk3 -p /sbin/ldconfig
+%endif
 
 %post   gobject -p /sbin/ldconfig
 
@@ -465,6 +481,7 @@ fi
 %{_includedir}/avahi-gobject
 %{_libdir}/pkgconfig/avahi-gobject.pc
 
+%if 0%{?build_cross} == 0
 %files ui-gtk3
 %{_libdir}/libavahi-ui-gtk3.so.*
 
@@ -474,6 +491,7 @@ fi
 %{_includedir}/avahi-ui
 %{_libdir}/pkgconfig/avahi-ui.pc
 %{_libdir}/pkgconfig/avahi-ui-gtk3.pc
+%endif
 
 %files  devel
 %{_libdir}/libavahi-common.so
@@ -484,7 +502,9 @@ fi
 %{_libdir}/pkgconfig/avahi-client.pc
 %{_libdir}/pkgconfig/avahi-libevent.pc
 %{_includedir}/*
+%if 0%{?build_cross} == 0
 %exclude %{_includedir}/avahi-ui
+%endif
 %exclude %{_includedir}/avahi-compat-howl
 %exclude %{_includedir}/avahi-compat-libdns_sd
 %exclude %{_includedir}/dns_sd.h
@@ -520,8 +540,10 @@ fi
 %{python2_sitelib}/avahi_discover/
 %endif
 
+%if 0%{?build_cross} == 0
 %files ui
 %{_libdir}/libavahi-ui.so.*
+%endif
 
 %files compat-howl
 %{_libdir}/libhowl.so.*
@@ -563,15 +585,18 @@ fi
 %{_mandir}/man8/*
 
 %changelog
-* Mon Nov 6 2023 zhangpan <zhangpan103@h-partners.com> - 0.8-17
+* Mon Nov 6 2023 zhangpan <zhangpan103@h-partners.com> - 0.8-18
 - fix CVE-2023-38469 CVE-2023-38471 CVE-2023-38472 CVE-2023-38473
 
-* Mon Oct 16 2023 zhangpan <zhangpan103@h-partners.com> - 0.8-16
+* Mon Oct 16 2023 zhangpan <zhangpan103@h-partners.com> - 0.8-17
 - fix CVE-2023-38470
 
-* Wed Apr 12 2023 zhouwenpei <zhouwenpei1@h-partners.com> - 0.8-15
+* Wed Apr 12 2023 zhouwenpei <zhouwenpei1@h-partners.com> - 0.8-16
 - fix CVE-2023-1981
 
+* Mon Mar 27 2023 zhangpan <zhangpan103@h-partners.com> - 0.8-15
+- add build_cross to avoid install packages and files in self-build
+
 * Tue Dec 20 2022 zhouwenpei <zhouwenpei1@h-partners.com> - 0.8-14
 - add BuildRequires make