From 2f16865a8fca7e1cb3f0fe37321690a24b290579 Mon Sep 17 00:00:00 2001
From: Jiri Popelka <jpopelka@redhat.com>
Date: Jul 14 2014 14:22:53 +0000
Subject: Merge branch 'f20' into f21


---

diff --git a/.gitignore b/.gitignore
index e755438..15db994 100644
--- a/.gitignore
+++ b/.gitignore
@@ -60,3 +60,4 @@ cups-1.4.4-source.tar.bz2
 /cups-1.7.1-source.tar.bz2
 /cups-1.7.2-source.tar.bz2
 /cups-1.7.3-source.tar.bz2
+/cups-1.7.4-source.tar.bz2
diff --git a/cups-1.7.3-source.tar.bz2.sig b/cups-1.7.3-source.tar.bz2.sig
deleted file mode 100644
index 1a888e0..0000000
Binary files a/cups-1.7.3-source.tar.bz2.sig and /dev/null differ
diff --git a/cups-1.7.4-source.tar.bz2.sig b/cups-1.7.4-source.tar.bz2.sig
new file mode 100644
index 0000000..52c02ac
Binary files /dev/null and b/cups-1.7.4-source.tar.bz2.sig differ
diff --git a/cups.spec b/cups.spec
index c8cc799..076b03c 100644
--- a/cups.spec
+++ b/cups.spec
@@ -10,8 +10,8 @@
 Summary: CUPS printing system
 Name: cups
 Epoch: 1
-Version: 1.7.3
-Release: 2%{?dist}
+Version: 1.7.4
+Release: 1%{?dist}
 License: GPLv2
 Url: http://www.cups.org/
 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
 
 %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
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
 
diff --git a/sources b/sources
index bcab508..9310299 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-d498c3020acda0904ab0c13b6389a1ec  cups-1.7.3-source.tar.bz2
+1a2295c2b2d2f422db2e50f40ed2fb99  cups-1.7.4-source.tar.bz2