[cups/f21: 2/2] Merge branch 'f20' into f21

[Jiří Popelka]

commit 2f16865a8fca7e1cb3f0fe37321690a24b290579
Merge: f01be03 3e91a79
Author: Jiri Popelka <jpopelka at redhat.com>
Date:   Mon Jul 14 16:22:53 2014 +0200

    Merge branch 'f20' into f21

 .gitignore                    |    1 +
 cups-1.7.3-source.tar.bz2.sig |  Bin 543 -> 0 bytes
 cups-1.7.4-source.tar.bz2.sig |  Bin 0 -> 543 bytes
 cups.spec                     |    7 +++++--
 sources                       |    2 +-
 5 files changed, 7 insertions(+), 3 deletions(-)
---
diff --cc cups.spec
index c8cc799,4b57885..076b03c
--- a/cups.spec
+++ b/cups.spec
@@@ -671,9 -640,9 +671,12 @@@ rm -f %{cups_serverbin}/backend/sm
  %{_mandir}/man5/ipptoolfile.5.gz
  
  %changelog
+ * Mon Jul 14 2014 Jiri Popelka <jpopelka at redhat.com> - 1:1.7.4-1
+ - 1.7.4: CVE-2014-3537
+ 
 +* Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:1.7.3-2
 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
 +
  * Wed May 28 2014 Jiri Popelka <jpopelka at redhat.com> - 1:1.7.3-1
  - 1.7.3
  - str4386.patch merged upstream in STR #4403