[cups: 2/2] Merge branch 'f19'

[Tim Waugh]

commit 4ca8dddf86dd3bfa510d6d2611d1b3fa06a1423d
Merge: 2529e37 58a593e
Author: Tim Waugh <twaugh at redhat.com>
Date:   Wed Jul 24 09:11:27 2013 +0100

    Merge branch 'f19'

 cups-multilib.patch |    8 ++++----
 cups.spec           |    5 ++++-
 2 files changed, 8 insertions(+), 5 deletions(-)
---
diff --cc cups.spec
index a3b74f6,560ea09..7f7fcd7
--- a/cups.spec
+++ b/cups.spec
@@@ -13,8 -10,8 +13,8 @@@
  Summary: CUPS printing system
  Name: cups
  Epoch: 1
 -Version: 1.6.3
 -Release: 4%{?dist}
 +Version: 1.7
- Release: 0.20.%{prever}%{?dist}
++Release: 0.21.%{prever}%{?dist}
  License: GPLv2
  Group: System Environment/Daemons
  Url: http://www.cups.org/
@@@ -630,7 -634,10 +630,10 @@@ rm -f %{cups_serverbin}/backend/sm
  %{_mandir}/man5/ipptoolfile.5.gz
  
  %changelog
 -* Wed Jul 24 2013 Tim Waugh <twaugh at redhat.com> - 1:1.6.3-4
++* Wed Jul 24 2013 Tim Waugh <twaugh at redhat.com> - 1:1.7-0.21.rc1
+ - Fixed cups-config, broken by last change (bug #987660).
+ 
 -* Mon Jul 22 2013 Tim Waugh <twaugh at redhat.com> - 1:1.6.3-3
 +* Mon Jul 22 2013 Tim Waugh <twaugh at redhat.com> - 1:1.7-0.20.rc1
  - Removed stale comment in spec file.
  - Link against OpenSSL instead of GnuTLS.