fix pkgconfig versioned requirement for libevent [release 0.8-4mamba;Sat Jul 09 2022]

avahi-0.8-libevent-2.1.12.patch

@@ -0,0 +1,10 @@
+--- avahi-0.8/avahi-libevent.pc.in.orig	2022-07-09 17:35:32.002142320 +0200
++++ avahi-0.8/avahi-libevent.pc.in	2022-07-09 17:35:43.164083632 +0200
+@@ -6,6 +6,6 @@
+ Name: avahi-libevent
+ Description: Avahi Multicast DNS Responder (libevent Support)
+ Version: @PACKAGE_VERSION@
+-Requires: libevent-2.1.5
++Requires: libevent >= 2.1.5
+ Libs: -L${libdir} -lavahi-libevent
+ Cflags: -D_REENTRANT -I${includedir}

avahi.spec

@@ -5,7 +5,7 @@
 
 Name:          avahi
 Version:       0.8
-Release:       2mamba
+Release:       4mamba
 Summary:       A system which facilitates service discovery on a local network
 Group:         Applications/Networking
 Vendor:        openmamba
@@ -13,81 +13,60 @@ Distribution:  openmamba
 Packager:      Silvan Calarco <silvan.calarco@mambasoft.it>
 URL:           http://avahi.org
 Source:        https://github.com/lathiat/avahi.git/v%{version}/avahi-%{version}.tar.bz2
-#Source:        http://avahi.org/download/avahi-%{version}.tar.gz
 Patch0:        avahi-0.6.31-gtk-3.12.patch
 Patch1:        avahi-0.6.31-SO_REUSEPORT_may_not_exist_in_running_kernel.patch
+Patch2:        avahi-0.8-libevent-2.1.12.patch
 License:       LGPL
 ## AUTOBUILDREQ-BEGIN
 BuildRequires: glibc-devel
-%if "%{stage1}" != "1"
+BuildRequires: gtk-sharp2-devel
-BuildRequires: gtk-sharp-devel
-%endif
 BuildRequires: libatk-devel
+BuildRequires: libbrotli-devel
 BuildRequires: libbzip2-devel
 BuildRequires: libcairo-devel
 BuildRequires: libcap-devel
 BuildRequires: libdaemon-devel
 BuildRequires: libdbus-devel
+BuildRequires: libevent-devel
 BuildRequires: libexpat-devel
-BuildRequires: libffi-devel
-BuildRequires: libfontconfig-devel
 BuildRequires: libfreetype-devel
 BuildRequires: libgcc
 BuildRequires: libgdbm-devel
 BuildRequires: libgdk-pixbuf-devel
-BuildRequires: libGL-devel
 BuildRequires: libglib-devel
 BuildRequires: libgraphite2-devel
-BuildRequires: libgtk2-devel
+BuildRequires: libgtk3-devel
-BuildRequires: libgtk-devel
 BuildRequires: libharfbuzz-devel
-BuildRequires: libICE-devel
-BuildRequires: libicu-devel
-BuildRequires: libjpeg-devel
-BuildRequires: liblcms-devel
-BuildRequires: libmng-devel
 BuildRequires: libpango-devel
-BuildRequires: libpng15-devel
 BuildRequires: libpng-devel
-BuildRequires: libpthread-stubs-devel
+BuildRequires: libpython3-devel
-BuildRequires: libpython-devel
-%if "%{stage1}" != "1"
-BuildRequires: libqt3-devel
-%endif
-BuildRequires: libqt4-devel
-BuildRequires: libselinux-devel
-BuildRequires: libSM-devel
 BuildRequires: libssp-devel
 BuildRequires: libstdc++6-devel
-BuildRequires: libuuid-devel
+BuildRequires: libsystemd-devel
-BuildRequires: libX11-devel
-BuildRequires: libXau-devel
-BuildRequires: libxcb-devel
-BuildRequires: libXcursor-devel
-BuildRequires: libXdmcp-devel
-BuildRequires: libXext-devel
-BuildRequires: libXfixes-devel
-BuildRequires: libXft-devel
-BuildRequires: libXinerama-devel
-BuildRequires: libXmu-devel
-BuildRequires: libXrandr-devel
-BuildRequires: libXrender-devel
-BuildRequires: libXt-devel
 BuildRequires: libz-devel
-BuildRequires: mono-core
+BuildRequires: mono-devel
+BuildRequires: qt5-qtbase-devel
 ## AUTOBUILDREQ-END
-BuildRequires: pygtk-devel
+#BuildRequires: pygtk-devel
 BuildRequires: python-dbus-devel
 BuildRequires: systemd-devel
 BuildRequires: mono-devel
 Requires:      libnss_mdns
 Requires:      libavahi = %{?epoch:%epoch:}%{version}-%{release}
 Requires:      python-avahi = %{?epoch:%epoch:}%{version}-%{release}
-BuildRoot:     %{_tmppath}/%{name}-%{version}-root
 
 %description
 Avahi is a system which facilitates service discovery on a local network. This means that you can plug your laptop or computer into a network and instantly be able to view other people who you can chat with, find printers to print to or find files being shared. This kind of technology is already found in Apple MacOS X (branded Rendezvous, Bonjour and sometimes Zeroconf) and is very convenient.
 
+%package gui
+Summary:       GUI tools avahi-discover, bssh and bvnc provided with Avahi
+Group:         System/Libraries
+Requires:      avahi = %{?epoch:%epoch:}%{version}-%{release}
+
+%description gui
+Avahi is a system which facilitates service discovery on a local network. This means that you can plug your laptop or computer into a network and instantly be able to view other people who you can chat with, find printers to print to or find files being shared. This kind of technology is already found in Apple MacOS X (branded Rendezvous, Bonjour and sometimes Zeroconf) and is very convenient.
+This package contains the GUI tools avahi-discover, bssh and bvnc provided with Avahi
+
 %package -n libavahi
 Summary:       A system which facilitates service discovery on a local network
 Group:         System/Libraries
@@ -149,8 +128,8 @@ This package contains static libraries and header files need for development of
 Summary:       QT5 binding library for avahi
 Group:         System/Libraries
 Requires:      libavahi = %{?epoch:%epoch:}%{version}-%{release}
-Obsoletes:     libavahi-qt3
+Obsoletes:     libavahi-qt3 < 0.8-3mamba
-Obsoletes:     libavahi-qt4
+Obsoletes:     libavahi-qt4 < 0.8-3mamba
 
 %description -n libavahi-qt5
 Avahi is a system which facilitates service discovery on a local network. This means that you can plug your laptop or computer into a network and instantly be able to view other people who you can chat with, find printers to print to or find files being shared. This kind of technology is already found in Apple MacOS X (branded Rendezvous, Bonjour and sometimes Zeroconf) and is very convenient.
@@ -160,8 +139,8 @@ This package contains the QT5 binding library.
 Summary:       Devel package for %{name} QT5 binding library
 Group:         Development/Libraries
 Requires:      libavahi-devel = %{?epoch:%epoch:}%{version}-%{release}
-Obsoletes:     libavahi-qt3-devel
+Obsoletes:     libavahi-qt3-devel < 0.8-3mamba
-Obsoletes:     libavahi-qt4-devel
+Obsoletes:     libavahi-qt4-devel < 0.8-3mamba
 
 %description -n libavahi-qt5-devel
 Avahi is a system which facilitates service discovery on a local network. This means that you can plug your laptop or computer into a network and instantly be able to view other people who you can chat with, find printers to print to or find files being shared. This kind of technology is already found in Apple MacOS X (branded Rendezvous, Bonjour and sometimes Zeroconf) and is very convenient.
@@ -182,7 +161,7 @@ Summary:       A system which facilitates service discovery on a local network
 Group:         System/Libraries
 Requires:      avahi = %{?epoch:%epoch:}%{version}-%{release}
 Provides:      avahi-python
-Obsoletes:     avahi-python
+Obsoletes:     avahi-python < 0.8-3mamba
 
 %description -n python-avahi
 Avahi is a system which facilitates service discovery on a local network. This means that you can plug your laptop or computer into a network and instantly be able to view other people who you can chat with, find printers to print to or find files being shared. This kind of technology is already found in Apple MacOS X (branded Rendezvous, Bonjour and sometimes Zeroconf) and is very convenient.
@@ -209,9 +188,9 @@ Header files for development with the howl compatibility libraries.
 Summary:   Libraries for Apple Bonjour mDNSResponder compatibility.
 Group:     Development/Libraries
 Provides:  libzeroconf
-Obsoletes: libzeroconf
+Obsoletes: libzeroconf < 0.8-3mamba
 Provides:  zeroconf
-Obsoletes: zeroconf
+Obsoletes: zeroconf < 0.8-3mamba
 
 %description compat-libdns_sd
 Avahi is a system which facilitates service discovery on a local network. This means that you can plug your laptop or computer into a network and instantly be able to view other people who you can chat with, find printers to print to or find files being shared. This kind of technology is already found in Apple MacOS X (branded Rendezvous, Bonjour and sometimes Zeroconf) and is very convenient.
@@ -223,7 +202,7 @@ Group:     Development/Libraries
 Requires:  avahi-compat-libdns_sd = %{?epoch:%epoch:}%{version}-%{release}
 Requires:  libavahi-devel = %{?epoch:%epoch:}%{version}-%{release}
 Provides:  libzeroconf-devel
-Obsoletes: libzeroconf-devel
+Obsoletes: libzeroconf-devel < 0.8-3mamba
 
 %description compat-libdns_sd-devel
 Avahi is a system which facilitates service discovery on a local network. This means that you can plug your laptop or computer into a network and instantly be able to view other people who you can chat with, find printers to print to or find files being shared. This kind of technology is already found in Apple MacOS X (branded Rendezvous, Bonjour and sometimes Zeroconf) and is very convenient.
@@ -233,12 +212,16 @@ Header files for development with the Apple Bonjour mDNSResponder compatibility
 
 %prep
 %setup -q
+#-D -T
+#:<< _EOF
 #%patch0 -p1
 #%patch1 -p1
+%patch2 -p1
+
 ./autogen.sh --with-distro=fedora
 
 %build
-
+#:<< _EOF
 %configure \
    --with-distro=fedora \
    --enable-compat-howl \
@@ -268,7 +251,7 @@ Header files for development with the Apple Bonjour mDNSResponder compatibility
 ln -s avahi-compat-howl.pc  %{buildroot}%{_libdir}/pkgconfig/howl.pc
 ln -s avahi-compat-libdns_sd.pc %{buildroot}%{_libdir}/pkgconfig/libdns_sd.pc
 
-ln -s avahi-daemon.service %{buildroot}/lib/systemd/system/dbus-org.freedesktop.Avahi.service
+ln -s avahi-daemon.service %{buildroot}%{_unitdir}/dbus-org.freedesktop.Avahi.service
 
 install -d %{buildroot}%{_presetdir}
 cat > %{buildroot}%{_presetdir}/50-avahi.preset << _EOF
@@ -352,9 +335,6 @@ fi
 %{_bindir}/avahi-resolve-address
 %{_bindir}/avahi-resolve-host-name
 %{_bindir}/avahi-set-host-name
-%{_bindir}/bshell
-%{_bindir}/bssh
-%{_bindir}/bvnc
 %{_sbindir}/avahi-autoipd
 %{_sbindir}/avahi-daemon
 %{_sbindir}/avahi-dnsconfd
@@ -364,11 +344,7 @@ fi
 %{_unitdir}/avahi-dnsconfd.service
 %{_unitdir}/dbus-org.freedesktop.Avahi.service
 %{_libdir}/avahi/service-types.db
-%{_datadir}/applications/avahi-discover.desktop
-%{_datadir}/applications/bssh.desktop
-%{_datadir}/applications/bvnc.desktop
 %{_datadir}/avahi/avahi-service.dtd
-%{_datadir}/avahi/interfaces/avahi-discover.ui
 #%{_datadir}/avahi/introspection/*.introspect
 #%{_datadir}/avahi/service-types
 %{_datadir}/dbus-1/interfaces/org.freedesktop.Avahi.*.xml
@@ -394,7 +370,17 @@ fi
 %{_mandir}/man8/avahi-daemon.8*
 %{_mandir}/man8/avahi-dnsconfd.8*
 %{_mandir}/man8/avahi-dnsconfd.action.8*
-%doc ChangeLog LICENSE docs/*
+%doc LICENSE
+
+%files gui
+%defattr(-,root,root)
+%{_bindir}/bshell
+%{_bindir}/bssh
+%{_bindir}/bvnc
+%{_datadir}/applications/avahi-discover.desktop
+%{_datadir}/applications/bssh.desktop
+%{_datadir}/applications/bvnc.desktop
+%{_datadir}/avahi/interfaces/avahi-discover.ui
 
 %files -n libavahi
 %defattr(-,root,root)
@@ -435,6 +421,7 @@ fi
 %{_libdir}/pkgconfig/avahi-client.pc
 %{_libdir}/pkgconfig/avahi-core.pc
 %{_libdir}/pkgconfig/avahi-libevent.pc
+%doc ChangeLog docs/*
 
 %files -n libavahi-glib
 %defattr(-,root,root)
@@ -574,6 +561,12 @@ fi
 %{_libdir}/pkgconfig/libdns_sd.pc
 
 %changelog
+* Sat Jul 09 2022 Silvan Calarco <silvan.calarco@mambasoft.it> 0.8-4mamba
+- fix pkgconfig versioned requirement for libevent
+
+* Fri Jul 08 2022 Silvan Calarco <silvan.calarco@mambasoft.it> 0.8-3mamba
+- moved gui tools into subpackage avahi-gui
+
 * Sun Aug 02 2020 Silvan Calarco <silvan.calarco@mambasoft.it> 0.8-2mamba
 - rebuilt with python3