From 011ba18f042839175107efa02d7fa57f890deedb Mon Sep 17 00:00:00 2001
From: Tim Waugh <twaugh@redhat.com>
Date: Jul 07 2011 13:47:30 +0000
Subject: Merge branch 'f14' into f15


---

diff --git a/cups.spec b/cups.spec
index 20aad6d..8af42bf 100644
--- a/cups.spec
+++ b/cups.spec
@@ -13,7 +13,7 @@
 Summary: Common Unix Printing System
 Name: cups
 Version: 1.4.7
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPLv2
 Group: System Environment/Daemons
 Source: http://ftp.easysw.com/pub/cups/%{version}/cups-%{version}-source.tar.bz2
@@ -340,7 +340,7 @@ export CFLAGS="$RPM_OPT_FLAGS -fstack-protector-all -DLDAP_DEPRECATED=1"
 	localedir=%{_datadir}/locale
 
 # If we got this far, all prerequisite libraries must be here.
-make %{?_smp_mflags} V=1
+make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -624,6 +624,10 @@ rm -rf $RPM_BUILD_ROOT
 %{php_extdir}/phpcups.so
 
 %changelog
+* Thu Jul  7 2011 Tim Waugh <twaugh@redhat.com> 1:1.4.7-5
+- Undo last change which had no effect.  We already remove the .SILENT
+  target from the Makefile as part of the build.
+
 * Thu Jul  7 2011 Tim Waugh <twaugh@redhat.com> 1:1.4.7-4
 - Make build log verbose enough to include compiler flags used.