rpms/avahi
6
0
Fork 0
Code Issues Pull Requests Releases Activity

resurrect ui-tools, not just for python (#1885513)

Browse Source
This commit is contained in:
Rex Dieter 2020-10-15 11:32:12 -05:00
parent 2c08e02ed6
commit d8904eb58e
1 changed files with 29 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
avahi.spec
View File

@ -98,7 +98,6 @@ BuildRequires: python3-devel
%else %else
Obsoletes: python2-avahi < %{version}-%{release} Obsoletes: python2-avahi < %{version}-%{release}
Obsoletes: python3-avahi < %{version}-%{release} Obsoletes: python3-avahi < %{version}-%{release}
Obsoletes: avahi-ui-tools < %{version}-%{release}
%if %{without bootstrap} %if %{without bootstrap}
BuildRequires: pygtk2 BuildRequires: pygtk2
%endif %endif
@ -161,10 +160,10 @@ Requires: %{name}-glib%{?_isa} = %{version}-%{release}
Requires: %{name}-ui-gtk3%{?_isa} = %{version}-%{release} Requires: %{name}-ui-gtk3%{?_isa} = %{version}-%{release}
Requires: tigervnc Requires: tigervnc
Requires: openssh-clients Requires: openssh-clients
%if %{WITH_PYTHON}
Requires: gdbm
Requires: pygtk2 Requires: pygtk2
Requires: pygtk2-libglade Requires: pygtk2-libglade
Requires: gdbm
%if %{WITH_PYTHON}
Requires: python2-avahi = %{version}-%{release} Requires: python2-avahi = %{version}-%{release}
Requires: %{python2_dbus} Requires: %{python2_dbus}
Requires: python2-gobject-base Requires: python2-gobject-base
@ -644,22 +643,37 @@ exit 0
%{_unitdir}/avahi-dnsconfd.service %{_unitdir}/avahi-dnsconfd.service
%files tools %files tools
%{_bindir}/* %{_bindir}/avahi-browse
%{_mandir}/man1/* %{_bindir}/avahi-browse-domains
%if %{WITH_PYTHON} %{_bindir}/avahi-publish
%exclude %{_bindir}/b* %{_bindir}/avahi-publish-address
%exclude %{_bindir}/avahi-discover* %{_bindir}/avahi-publish-service
%exclude %{_bindir}/avahi-bookmarks %{_bindir}/avahi-resolve
%exclude %{_mandir}/man1/b* %{_bindir}/avahi-resolve-address
%exclude %{_mandir}/man1/avahi-discover* %{_bindir}/avahi-resolve-host-name
%exclude %{_mandir}/man1/avahi-bookmarks* %{_bindir}/avahi-set-host-name
%{_mandir}/man1/avahi-browse.1*
%{_mandir}/man1/avahi-browse-domains.1*
%{_mandir}/man1/avahi-publish.1*
%{_mandir}/man1/avahi-publish-address.1*
%{_mandir}/man1/avahi-publish-service.1*
%{_mandir}/man1/avahi-resolve.1*
%{_mandir}/man1/avahi-resolve-address.1*
%{_mandir}/man1/avahi-resolve-host-name.1*
%{_mandir}/man1/avahi-set-host-name.1*
%files ui-tools %files ui-tools
%{_bindir}/b* %{_bindir}/bshell
%{_bindir}/avahi-discover %{_bindir}/bssh
%{_bindir}/bvnc
%{_bindir}/avahi-discover-standalone
%{_mandir}/man1/bshell.1*
%{_mandir}/man1/bssh.1*
%{_mandir}/man1/bvnc.1*
%if %{WITH_PYTHON}
# avahi-bookmarks is not really a UI tool, but I won't create a seperate package for it... # avahi-bookmarks is not really a UI tool, but I won't create a seperate package for it...
%{_bindir}/avahi-bookmarks %{_bindir}/avahi-bookmarks
%{_mandir}/man1/b*
%{_mandir}/man1/avahi-discover* %{_mandir}/man1/avahi-discover*
%{_mandir}/man1/avahi-bookmarks* %{_mandir}/man1/avahi-bookmarks*
%{_datadir}/applications/b*.desktop %{_datadir}/applications/b*.desktop