Merge branch 'f20' into f21

This commit is contained in:
Jiri Popelka 2014-07-14 16:22:53 +02:00
commit 2f16865a8f
5 changed files with 7 additions and 3 deletions

1
.gitignore vendored
View File

@ -60,3 +60,4 @@ cups-1.4.4-source.tar.bz2
/cups-1.7.1-source.tar.bz2 /cups-1.7.1-source.tar.bz2
/cups-1.7.2-source.tar.bz2 /cups-1.7.2-source.tar.bz2
/cups-1.7.3-source.tar.bz2 /cups-1.7.3-source.tar.bz2
/cups-1.7.4-source.tar.bz2

Binary file not shown.

Binary file not shown.

View File

@ -10,8 +10,8 @@
Summary: CUPS printing system Summary: CUPS printing system
Name: cups Name: cups
Epoch: 1 Epoch: 1
Version: 1.7.3 Version: 1.7.4
Release: 2%{?dist} Release: 1%{?dist}
License: GPLv2 License: GPLv2
Url: http://www.cups.org/ Url: http://www.cups.org/
Source: http://www.cups.org/software/%{version}/cups-%{version}-source.tar.bz2 Source: http://www.cups.org/software/%{version}/cups-%{version}-source.tar.bz2
@ -671,6 +671,9 @@ rm -f %{cups_serverbin}/backend/smb
%{_mandir}/man5/ipptoolfile.5.gz %{_mandir}/man5/ipptoolfile.5.gz
%changelog %changelog
* Mon Jul 14 2014 Jiri Popelka <jpopelka@redhat.com> - 1:1.7.4-1
- 1.7.4: CVE-2014-3537
* Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1:1.7.3-2 * Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1:1.7.3-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild

View File

@ -1 +1 @@
d498c3020acda0904ab0c13b6389a1ec cups-1.7.3-source.tar.bz2 1a2295c2b2d2f422db2e50f40ed2fb99 cups-1.7.4-source.tar.bz2