[cups/f15: 2/2] Merge branch 'f14' into f15

[Tim Waugh]

commit f4afb07a4fc968d2ada06090b4c78c72ecccb854
Merge: 6d47608 f9ab380
Author: Tim Waugh <twaugh at redhat.com>
Date:   Fri Jul 15 17:40:27 2011 +0100

    Merge branch 'f14' into f15

 cups.spec   |   11 ++++++++++-
 macros.cups |    1 +
 2 files changed, 11 insertions(+), 1 deletions(-)
---
diff --cc cups.spec
index f80bbce,0d98b7d..63022b9
--- a/cups.spec
+++ b/cups.spec
@@@ -13,7 -8,7 +13,7 @@@
  Summary: Common Unix Printing System
  Name: cups
  Version: 1.4.7
--Release: 7%{?dist}
++Release: 8%{?dist}
  License: GPLv2
  Group: System Environment/Daemons
  Source: http://ftp.easysw.com/pub/cups/%{version}/cups-%{version}-source.tar.bz2
@@@ -615,7 -562,7 +620,8 @@@ rm -rf $RPM_BUILD_ROO
  %{_bindir}/cups-config
  %{_libdir}/*.so
  %{_includedir}/cups
 +%{_mandir}/man1/cups-config.1*
+ %{_sysconfdir}/rpm/macros.cups
  
  %files lpd
  %defattr(-,root,root)
@@@ -630,13 -577,16 +636,16 @@@
  %{php_extdir}/phpcups.so
  
  %changelog
 -* Fri Jul 15 2011 Tim Waugh <twaugh at redhat.com> 1:1.4.7-7
++* Fri Jul 15 2011 Tim Waugh <twaugh at redhat.com> 1:1.4.7-8
+ - Ship an rpm macro for where to put driver executables.
+ 
 -* Wed Jul 13 2011 Tim Waugh <twaugh at redhat.com> 1:1.4.7-6
 +* Wed Jul 13 2011 Tim Waugh <twaugh at redhat.com> 1:1.4.7-7
  - Avoid busy loop in cups-polld (bug #720921).
  
 -* Thu Jul  7 2011 Jiri Popelka <jpopelka at redhat.com> 1:1.4.7-5
 +* Thu Jul  7 2011 Jiri Popelka <jpopelka at redhat.com> 1:1.4.7-6
  - Fix SNMP supply level crasher (STR #3875, bug #719057).
  
 -* Thu Jul  7 2011 Tim Waugh <twaugh at redhat.com> 1:1.4.7-4
 +* Thu Jul  7 2011 Tim Waugh <twaugh at 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.