Merge branch 'f20' into f21

This commit is contained in:
Jiri Popelka 2014-08-27 10:40:58 +02:00
commit 9ad9772159

View File

@ -1,7 +1,7 @@
Summary: A firewall daemon with D-Bus interface providing a dynamic firewall Summary: A firewall daemon with D-Bus interface providing a dynamic firewall
Name: firewalld Name: firewalld
Version: 0.3.11 Version: 0.3.11
Release: 2%{?dist} Release: 3%{?dist}
URL: http://fedorahosted.org/firewalld URL: http://fedorahosted.org/firewalld
License: GPLv2+ License: GPLv2+
Source0: https://fedorahosted.org/released/firewalld/%{name}-%{version}.tar.bz2 Source0: https://fedorahosted.org/released/firewalld/%{name}-%{version}.tar.bz2
@ -317,6 +317,9 @@ fi
%endif %endif
%changelog %changelog
* Wed Aug 27 2014 Jiri Popelka <jpopelka@redhat.com> - 0.3.11-3
- Quiet systemctl if cups-browsed.service is not installed
* Mon Aug 25 2014 Jiri Popelka <jpopelka@redhat.com> - 0.3.11-2 * Mon Aug 25 2014 Jiri Popelka <jpopelka@redhat.com> - 0.3.11-2
- add few Requires to spec (RHBZ#1133167) - add few Requires to spec (RHBZ#1133167)