Remove the ssh.service example file

* Move it to the example documentation instead.
 * There's no guarantee that openssh-server is installed
   and enabled, so we shouldn't be installing this file just because
   avahi is present.
This commit is contained in:
Stef Walter 2012-04-02 21:58:43 +02:00
parent 76be9eb414
commit 3e5a7dced8

View File

@ -10,7 +10,7 @@
Name: avahi
Version: 0.6.31
Release: 4%{?dist}
Release: 5%{?dist}
Summary: Local network service discovery
Group: System Environment/Base
License: LGPLv2
@ -333,6 +333,7 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
rm -f $RPM_BUILD_ROOT%{_libdir}/*.a
# remove example
rm -f $RPM_BUILD_ROOT%{_sysconfdir}/avahi/services/ssh.service
rm -f $RPM_BUILD_ROOT%{_sysconfdir}/avahi/services/sftp-ssh.service
# create /var/run/avahi-daemon to ensure correct selinux policy for it:
@ -473,7 +474,7 @@ fi
%files -f %{name}.lang
%defattr(0644,root,root,0755)
%doc docs/* avahi-daemon/example.service avahi-daemon/sftp-ssh.service
%doc docs/* avahi-daemon/example.service avahi-daemon/sftp-ssh.service avahi-daemon/ssh.service
%dir %{_sysconfdir}/avahi
%dir %{_sysconfdir}/avahi/etc
%ghost %{_sysconfdir}/avahi/etc/localtime
@ -481,7 +482,6 @@ fi
%dir %{_sysconfdir}/avahi/services
%ghost %attr(0755,avahi,avahi) %dir %{_localstatedir}/run/avahi-daemon
%config(noreplace) %{_sysconfdir}/avahi/avahi-daemon.conf
%config(noreplace) %{_sysconfdir}/avahi/services/ssh.service
%config(noreplace) %{_sysconfdir}/dbus-1/system.d/avahi-dbus.conf
%attr(0755,root,root) %{_sbindir}/avahi-daemon
%dir %{_datadir}/avahi
@ -657,6 +657,11 @@ fi
%endif
%changelog
* Mon Aug 6 2012 Stef Walter <stefw@redhat.com> - 0.6.31-5
- Don't ship ssh service by default file since openssh-server isn't
running by default, and shouldn't be advertised without user
confirmation.
* Wed Jul 18 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.6.31-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild