|
|
@@ -1,34 +1,63 @@
|
|
|
-%define _localstatedir %{_var}
|
|
|
+%bcond_with systemd
|
|
|
+
|
|
|
+%define avahi_user_uid 70
|
|
|
+%global unitfiles avahi-daemon.socket avahi-daemon.service avahi-dnsconfd.service
|
|
|
|
|
|
%define build_compat32 %{?_with_compat32:1}%{!?_with_compat32:0}
|
|
|
|
|
|
Summary: Local network service discovery
|
|
|
Summary(ja): ローカルネットワークサービス検出システム
|
|
|
Name: avahi
|
|
|
-Version: 0.7
|
|
|
-Release: 2%{?_dist_release}
|
|
|
+Version: 0.8
|
|
|
+Release: 1%{?_dist_release}%{?with_systemd:.systemd}
|
|
|
Group: System Environment/Base
|
|
|
+Vendor: Project Vine
|
|
|
+Distribution: Vine Linux
|
|
|
+
|
|
|
License: LGPL
|
|
|
URL: http://avahi.org
|
|
|
-
|
|
|
Source0: %{name}-%{version}.tar.gz
|
|
|
|
|
|
-Patch0: avahi-0.6.31-no-deprecations.patch
|
|
|
-Patch10: avahi-0.6.31-vine.patch
|
|
|
+## upstream patches
|
|
|
+Patch6: 0006-avahi-dnsconfd.service-Drop-Also-avahi-daemon.socket.patch
|
|
|
+Patch7: 0007-man-add-missing-bshell.1-symlink.patch
|
|
|
+Patch8: 0008-Ship-avahi-discover-1-bssh-1-and-bvnc-1-also-for-GTK.patch
|
|
|
+Patch9: 0009-fix-requires-in-pc-file.patch
|
|
|
+Patch10: 0010-fix-bytestring-decoding-for-proper-display.patch
|
|
|
+Patch11: 0011-avahi_dns_packet_consume_uint32-fix-potential-undefi.patch
|
|
|
|
|
|
-BuildRoot: %{_tmppath}/%{name}-%{version}-root
|
|
|
+Patch1000: avahi-0.6.31-vine.patch
|
|
|
+
|
|
|
+BuildRoot: %{_tmppath}/%{name}-%{version}-root
|
|
|
+BuildRequires: dbus-devel, dbus-glib-devel
|
|
|
+BuildRequires: desktop-file-utils
|
|
|
+BuildRequires: expat-devel
|
|
|
BuildRequires: glib2-devel
|
|
|
-BuildRequires: gtk3-devel, gobject-introspection-devel
|
|
|
+BuildRequires: gobject-introspection-devel
|
|
|
+BuildRequires: gtk3-devel
|
|
|
+#BuildRequires: python, dbus-python, libxml2-python
|
|
|
+BuildRequires: gdbm-devel
|
|
|
+BuildRequires: intltool
|
|
|
+BuildRequires: libcap-devel
|
|
|
BuildRequires: libdaemon-devel >= 0.12
|
|
|
-BuildRequires: libcap-devel, dbus-devel, expat-devel
|
|
|
-BuildRequires: python, dbus-python, gdbm-devel, libmng-devel
|
|
|
-BuildRequires: xorg-x11-devel, mesa-libGL-devel
|
|
|
-Requires: dbus, libdaemon, expat, python, dbus-python, libcap
|
|
|
+BuildRequires: libevent-devel
|
|
|
+BuildRequires: mesa-libGL-devel
|
|
|
+BuildRequires: xmltoman
|
|
|
+BuildRequires: xorg-x11-devel
|
|
|
+Requires: dbus
|
|
|
+
|
|
|
+Requires(post): dbus
|
|
|
+Requires(pre): shadow-utils
|
|
|
+Requires(pre): coreutils
|
|
|
+%if %{with systemd}
|
|
|
+BuildRequires: systemd
|
|
|
+%{?systemd_requires}
|
|
|
+%else
|
|
|
Requires(post): initscripts, chkconfig >= 1.3.34
|
|
|
-Obsoletes: howl, howl-libs
|
|
|
+%endif
|
|
|
+
|
|
|
+Obsoletes: howl, howl-libs
|
|
|
|
|
|
-Vendor: Project Vine
|
|
|
-Distribution: Vine Linux
|
|
|
|
|
|
%description
|
|
|
Avahi is a system which facilitates service discovery on
|
|
|
@@ -223,15 +252,16 @@ Requires: compat32-%{name} = %{version}-%{release}
|
|
|
The avahi-devel package contains the header files and libraries
|
|
|
necessary for developing programs using avahi.
|
|
|
|
|
|
-%define avahi_user_uid 70
|
|
|
|
|
|
%prep
|
|
|
%setup -q
|
|
|
-#patch0 -p1 -b .nodep
|
|
|
-%patch10 -p1 -b .vine
|
|
|
+%autopatch -p1
|
|
|
+
|
|
|
+rm -fv docs/INSTALL
|
|
|
+
|
|
|
|
|
|
%build
|
|
|
-autoreconf -i
|
|
|
+autoreconf -ivf
|
|
|
|
|
|
%configure --with-distro=vine \
|
|
|
--disable-monodoc \
|
|
|
@@ -246,83 +276,135 @@ autoreconf -i
|
|
|
--disable-gtk \
|
|
|
--disable-qt3 \
|
|
|
--disable-qt4 \
|
|
|
+ --disable-qt5 \
|
|
|
--disable-mono \
|
|
|
+ --disable-python \
|
|
|
+ --enable-shared=yes \
|
|
|
+ --enable-static=no \
|
|
|
+ --disable-silent-rules \
|
|
|
+%if %{with systemd}
|
|
|
+ --with-systemdsystemunitdir=%{_unitdir} \
|
|
|
+%endif
|
|
|
--enable-introspection=no
|
|
|
|
|
|
-%__make -C avahi-python clean
|
|
|
%__make %{?_smp_mflags}
|
|
|
|
|
|
+
|
|
|
%install
|
|
|
rm -rf $RPM_BUILD_ROOT
|
|
|
make install DESTDIR=$RPM_BUILD_ROOT
|
|
|
|
|
|
-rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
|
|
|
-rm -f $RPM_BUILD_ROOT%{_libdir}/*.a
|
|
|
+# omit libtool .la files
|
|
|
+rm -fv %{buildroot}%{_libdir}/lib*.la
|
|
|
|
|
|
# remove example
|
|
|
-rm -f $RPM_BUILD_ROOT%{_sysconfdir}/avahi/services/ssh.service
|
|
|
+rm -fv %{buildroot}%{_sysconfdir}/avahi/services/ssh.service
|
|
|
+rm -fv %{buildroot}%{_sysconfdir}/avahi/services/sftp-ssh.service
|
|
|
|
|
|
# remove desktop file for avahi-discover
|
|
|
rm -f $RPM_BUILD_ROOT%{_datadir}/applications/avahi-discover.desktop
|
|
|
|
|
|
# create /var/run/avahi-daemon to ensure correct selinux policy for it:
|
|
|
-mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/run/avahi-daemon
|
|
|
+mkdir -p %{buildroot}%{_localstatedir}/run/avahi-daemon
|
|
|
+mkdir -p %{buildroot}%{_localstatedir}/lib/avahi-autoipd
|
|
|
|
|
|
-# remove the documentation directory - let \%doc handle it:
|
|
|
-rm -rf $RPM_BUILD_ROOT%{_datadir}/%{name}-%{version}
|
|
|
+# remove the documentation directory - let % doc handle it:
|
|
|
+rm -rfv %{buildroot}%{_datadir}/%{name}-%{version}
|
|
|
|
|
|
# remove avahi-bookmarks - unusable without python-twisted,
|
|
|
# which has been judged dangerous and is removed from the
|
|
|
# Fedora Core distribution:
|
|
|
rm -f $RPM_BUILD_ROOT/%{_bindir}/avahi-bookmarks $RPM_BUILD_ROOT/%{_mandir}/man1/avahi-bookmarks*
|
|
|
#
|
|
|
+%if %{with systemd}
|
|
|
+rm -fv %{buildroot}%{_sysconfdir}/init.d/avahi-daemon
|
|
|
+rm -fv %{buildroot}%{_sysconfdir}/init.d/avahi-dnsconfd
|
|
|
+%else
|
|
|
# move initscripts into /etc/rc.d/init.d :
|
|
|
mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/rc.d/init.d
|
|
|
mv $RPM_BUILD_ROOT/%{_sysconfdir}/init.d/* $RPM_BUILD_ROOT/%{_sysconfdir}/rc.d/init.d
|
|
|
rm -rf $RPM_BUILD_ROOT/%{_sysconfdir}/init.d/*
|
|
|
-#
|
|
|
+%endif
|
|
|
+
|
|
|
# Make /etc/avahi/etc/localtime owned by avahi:
|
|
|
-mkdir -p $RPM_BUILD_ROOT/etc/avahi/etc
|
|
|
-touch $RPM_BUILD_ROOT/etc/avahi/etc/localtime
|
|
|
-:;
|
|
|
+mkdir -p %{buildroot}/etc/avahi/etc
|
|
|
+touch %{buildroot}/etc/avahi/etc/localtime
|
|
|
+
|
|
|
+# fix bug 197414 - add missing symlinks for avahi-compat-howl and avahi-compat-dns-sd
|
|
|
+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-compat-libdns_sd/dns_sd.h %{buildroot}/%{_includedir}/
|
|
|
+
|
|
|
+# unpackaged files
|
|
|
+rm -fv %{buildroot}%{_datadir}/applications/{bssh,bvnc}.desktop
|
|
|
+rm -fv %{buildroot}%{_datadir}/avahi/interfaces/avahi-discover.ui
|
|
|
+
|
|
|
+%find_lang %{name}
|
|
|
+
|
|
|
|
|
|
%clean
|
|
|
rm -rf $RPM_BUILD_ROOT
|
|
|
|
|
|
%pre
|
|
|
# Add the "avahi" group
|
|
|
-/usr/sbin/groupadd -f -r avahi
|
|
|
+getent group avahi >/dev/null || /usr/sbin/groupadd -f -r avahi
|
|
|
# Add the "avahi" user
|
|
|
-/usr/sbin/useradd -g avahi -c 'Avahi daemon' -u %{avahi_user_uid} \
|
|
|
- -s /sbin/nologin -r -d '/' avahi 2> /dev/null || :
|
|
|
+if ! getent passwd avahi > /dev/null ; then
|
|
|
+ if ! getent passwd %{avahi_user_uid} > /dev/null ; then
|
|
|
+ useradd -r -l -u %{avahi_user_uid} -g avahi -d %{_localstatedir}/run/avahi-daemon -s /sbin/nologin -c "Avahi mDNS/DNS-SD Stack" avahi
|
|
|
+ else
|
|
|
+ useradd -r -l -g avahi -d %{_localstatedir}/run/avahi-daemon -s /sbin/nologin -c "Avahi mDNS/DNS-SD Stack" avahi
|
|
|
+ fi
|
|
|
+fi
|
|
|
+getent group avahi-autoipd >/dev/null || groupadd -f -g 170 -r avahi-autoipd
|
|
|
+if ! getent passwd avahi-autoipd > /dev/null ; then
|
|
|
+ if ! getent passwd 170 > /dev/null; then
|
|
|
+ useradd -r -u 170 -l -g avahi-autoipd -d %{_localstatedir}/lib/avahi-autoipd -s /sbin/nologin -c "Avahi IPv4LL Stack" avahi-autoipd
|
|
|
+ else
|
|
|
+ useradd -r -l -g avahi-autoipd -d %{_localstatedir}/lib/avahi-autoipd -s /sbin/nologin -c "Avahi IPv4LL Stack" avahi-autoipd
|
|
|
+ fi
|
|
|
+fi
|
|
|
+exit 0
|
|
|
|
|
|
%post
|
|
|
/sbin/ldconfig
|
|
|
dbus-send --system --type=method_call --dest=org.freedesktop.DBus / org.freedesktop.DBus.ReloadConfig >/dev/null 2>&1 || :
|
|
|
-/sbin/chkconfig --add avahi-daemon >/dev/null 2>&1 ||:
|
|
|
-/sbin/chkconfig avahi-daemon resetpriorities >/dev/null 2>&1 ||:
|
|
|
-/sbin/chkconfig --add avahi-dnsconfd >/dev/null 2>&1 ||:
|
|
|
-/sbin/chkconfig avahi-dnsconfd resetpriorities >/dev/null 2>&1 ||:
|
|
|
if [ "$1" -eq 1 ]; then
|
|
|
if [ -s /etc/localtime ]; then
|
|
|
cp -fp /etc/localtime /etc/avahi/etc/localtime || :;
|
|
|
fi
|
|
|
fi
|
|
|
+%if %{with systemd}
|
|
|
+%systemd_post %{unitfiles}
|
|
|
+%else
|
|
|
+/sbin/chkconfig --add avahi-daemon >/dev/null 2>&1 ||:
|
|
|
+/sbin/chkconfig avahi-daemon resetpriorities >/dev/null 2>&1 ||:
|
|
|
+/sbin/chkconfig --add avahi-dnsconfd >/dev/null 2>&1 ||:
|
|
|
+/sbin/chkconfig avahi-dnsconfd resetpriorities >/dev/null 2>&1 ||:
|
|
|
+%endif
|
|
|
|
|
|
-%postun
|
|
|
-/sbin/ldconfig
|
|
|
-if [ "$1" -eq "0" ]; then
|
|
|
- /sbin/service avahi-daemon condrestart >/dev/null 2>&1
|
|
|
- /sbin/service avahi-dnsconfd condrestart >/dev/null 2>&1
|
|
|
-fi
|
|
|
-
|
|
|
%preun
|
|
|
+%if %{with systemd}
|
|
|
+%systemd_preun %{unitfiles}
|
|
|
+%else
|
|
|
if [ "$1" -eq "0" ]; then
|
|
|
/sbin/service avahi-daemon stop > /dev/null 2>&1
|
|
|
/sbin/chkconfig --del avahi-daemon
|
|
|
/sbin/service avahi-dnsconfd stop >/dev/null 2>&1
|
|
|
/sbin/chkconfig --del avahi-dnsconfd
|
|
|
fi
|
|
|
+%endif
|
|
|
+
|
|
|
+%postun
|
|
|
+/sbin/ldconfig
|
|
|
+%if %{with systemd}
|
|
|
+%systemd_postun_with_restart %{unitfiles}
|
|
|
+%else
|
|
|
+if [ "$1" -eq "0" ]; then
|
|
|
+ /sbin/service avahi-daemon condrestart >/dev/null 2>&1
|
|
|
+ /sbin/service avahi-dnsconfd condrestart >/dev/null 2>&1
|
|
|
+fi
|
|
|
+%endif
|
|
|
|
|
|
%post ui-gtk3 -p /sbin/ldconfig
|
|
|
|
|
|
@@ -352,10 +434,15 @@ fi
|
|
|
|
|
|
%postun -n compat32-%{name}-gobject -p /sbin/ldconfig
|
|
|
|
|
|
-%files
|
|
|
+%files -f %{name}.lang
|
|
|
%defattr(-,root,root)
|
|
|
%doc docs/* avahi-daemon/example.service avahi-daemon/ssh.service
|
|
|
+%if %{with systemd}
|
|
|
+%{_unitdir}/*
|
|
|
+%{_datadir}/dbus-1/system-services/org.freedesktop.Avahi.service
|
|
|
+%else
|
|
|
%attr(755,root,root) %{_sysconfdir}/rc.d/init.d/*
|
|
|
+%endif
|
|
|
%dir %{_sysconfdir}/avahi
|
|
|
%dir %{_sysconfdir}/avahi/etc
|
|
|
%ghost %{_sysconfdir}/avahi/etc/localtime
|
|
|
@@ -365,16 +452,15 @@ fi
|
|
|
%config %{_sysconfdir}/avahi/avahi-autoipd.action
|
|
|
%config %{_sysconfdir}/avahi/avahi-daemon.conf
|
|
|
%config %{_sysconfdir}/avahi/avahi-dnsconfd.action
|
|
|
-%config %{_sysconfdir}/avahi/services/*
|
|
|
%config %{_sysconfdir}/dbus-1/system.d/avahi-dbus.conf
|
|
|
%attr(755,root,root) %{_sbindir}/*
|
|
|
%{_libdir}/libavahi-common.so.*
|
|
|
%{_libdir}/libavahi-core.so.*
|
|
|
%{_libdir}/libavahi-client.so.*
|
|
|
+%{_libdir}/libavahi-libevent.so.*
|
|
|
%{_libdir}/libhowl.so.*
|
|
|
%{_libdir}/libdns_sd.so.*
|
|
|
%attr(755,root,root) %{_datadir}/avahi
|
|
|
-%{_datadir}/locale/*
|
|
|
%{_datadir}/dbus-1/interfaces/*.xml
|
|
|
%{_libdir}/avahi
|
|
|
%exclude %{_datadir}/avahi/interfaces
|
|
|
@@ -384,16 +470,17 @@ fi
|
|
|
%files tools
|
|
|
%defattr(-, root, root)
|
|
|
%{_bindir}/*
|
|
|
-%{python_sitelib}/*
|
|
|
+#%{python_sitelib}/*
|
|
|
%{_mandir}/man1/*
|
|
|
%{_datadir}/avahi/interfaces/
|
|
|
-%{_datadir}/applications/*
|
|
|
+#%{_datadir}/applications/*
|
|
|
|
|
|
%files devel
|
|
|
%defattr(-, root, root)
|
|
|
%{_libdir}/libavahi-common.so
|
|
|
%{_libdir}/libavahi-core.so
|
|
|
%{_libdir}/libavahi-client.so
|
|
|
+%{_libdir}/libavahi-libevent.so
|
|
|
%{_libdir}/libhowl.so
|
|
|
%{_libdir}/libdns_sd.so
|
|
|
%{_includedir}/avahi-client
|
|
|
@@ -401,10 +488,15 @@ fi
|
|
|
%{_includedir}/avahi-core
|
|
|
%{_includedir}/avahi-compat-howl
|
|
|
%{_includedir}/avahi-compat-libdns_sd
|
|
|
+%{_includedir}/avahi-libevent
|
|
|
+%{_includedir}/dns_sd.h
|
|
|
%{_libdir}/pkgconfig/avahi-core.pc
|
|
|
%{_libdir}/pkgconfig/avahi-client.pc
|
|
|
%{_libdir}/pkgconfig/avahi-compat-howl.pc
|
|
|
%{_libdir}/pkgconfig/avahi-compat-libdns_sd.pc
|
|
|
+%{_libdir}/pkgconfig/avahi-libevent.pc
|
|
|
+%{_libdir}/pkgconfig/howl.pc
|
|
|
+%{_libdir}/pkgconfig/libdns_sd.pc
|
|
|
|
|
|
%files ui-gtk3
|
|
|
%defattr(-, root, root)
|
|
|
@@ -454,10 +546,6 @@ fi
|
|
|
%{_libdir}/libavahi-client.so
|
|
|
%{_libdir}/libhowl.so
|
|
|
%{_libdir}/libdns_sd.so
|
|
|
-%{_libdir}/pkgconfig/avahi-core.pc
|
|
|
-%{_libdir}/pkgconfig/avahi-client.pc
|
|
|
-%{_libdir}/pkgconfig/avahi-compat-howl.pc
|
|
|
-%{_libdir}/pkgconfig/avahi-compat-libdns_sd.pc
|
|
|
|
|
|
%files -n compat32-%{name}-ui-gtk3
|
|
|
%defattr(-, root, root)
|
|
|
@@ -466,7 +554,6 @@ fi
|
|
|
%files -n compat32-%{name}-ui-gtk3-devel
|
|
|
%defattr(-, root, root)
|
|
|
%{_libdir}/libavahi-ui-gtk3.so
|
|
|
-%{_libdir}/pkgconfig/avahi-ui-gtk3.pc
|
|
|
|
|
|
%files -n compat32-%{name}-glib
|
|
|
%defattr(-, root, root)
|
|
|
@@ -475,7 +562,6 @@ fi
|
|
|
%files -n compat32-%{name}-glib-devel
|
|
|
%defattr(-, root, root)
|
|
|
%{_libdir}/libavahi-glib.so
|
|
|
-%{_libdir}/pkgconfig/avahi-glib.pc
|
|
|
|
|
|
%files -n compat32-%{name}-gobject
|
|
|
%defattr(-, root, root)
|
|
|
@@ -484,10 +570,13 @@ fi
|
|
|
%files -n compat32-%{name}-gobject-devel
|
|
|
%defattr(-, root, root)
|
|
|
%{_libdir}/libavahi-gobject.so
|
|
|
-%{_libdir}/pkgconfig/avahi-gobject.pc
|
|
|
%endif
|
|
|
|
|
|
%changelog
|
|
|
+* Sat Apr 25 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 0.8-1
|
|
|
+- new upstream release.
|
|
|
+- added systemd support (disabled as default).
|
|
|
+
|
|
|
* Mon May 13 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 0.7-2
|
|
|
- rebuilt with gdbm-1.18.1.
|
|
|
- dropped GTK+2, Qt3 and Qt4 support.
|
tomop