[cups/f16] 1.5.4

[Jiří Popelka]

commit 8a1260b5d5d3e1f23a242640a6138b62e64e9558
Author: Jiri Popelka <jpopelka at redhat.com>
Date:   Thu Jul 26 02:10:39 2012 +0200

    1.5.4

 .gitignore |    1 +
 cups.spec  |    7 +++++--
 sources    |    2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 2bf96dc..bad004b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -51,3 +51,4 @@ cups-1.4.4-source.tar.bz2
 /cups-1.5.0-source.tar.bz2
 /cups-1.5.2-source.tar.bz2
 /cups-1.5.3-source.tar.bz2
+/cups-1.5.4-source.tar.bz2
diff --git a/cups.spec b/cups.spec
index 03a25e3..b6641d2 100644
--- a/cups.spec
+++ b/cups.spec
@@ -18,8 +18,8 @@
 
 Summary: Common Unix Printing System
 Name: cups
-Version: 1.5.3
-Release: 2%{?dist}
+Version: 1.5.4
+Release: 1%{?dist}
 License: GPLv2
 Group: System Environment/Daemons
 Source: http://ftp.easysw.com/pub/cups/%{version}/cups-%{version}-source.tar.bz2
@@ -654,6 +654,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/ipptool.1.gz
 
 %changelog
+* Thu Jul 26 2012 Jiri Popelka <jpopelka at redhat.com> 1:1.5.4-1
+- 1.5.4
+
 * Mon May 28 2012 Jiri Popelka <jpopelka at redhat.com> 1:1.5.3-2
 - Buildrequire libusb1 (STR #3477)
 
diff --git a/sources b/sources
index ffc3098..bb2ced0 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-e1ad15257aa6f162414ea3beae0c5df8  cups-1.5.3-source.tar.bz2
+de3006e5cf1ee78a9c6145ce62c4e982  cups-1.5.4-source.tar.bz2