[cups: 4/4] Merge branch 'f20'

[Tim Waugh]

commit c874e6e680d0e3815a1601a689197e7d66e28ad6
Merge: 4c07778 7632e7a
Author: Tim Waugh <twaugh at redhat.com>
Date:   Thu Oct 24 16:50:13 2013 +0100

    Merge branch 'f20'

 .gitignore               |    1 +
 cups-build.patch         |   12 ---
 cups-ipp-multifile.patch |   17 ++---
 cups-jobhistory.patch    |   12 +++
 cups-libusb-quirks.patch |   26 +++---
 cups-lspp.patch          |  216 +++++++++++++++++++++++-----------------------
 cups-synconclose.patch   |  134 ----------------------------
 cups.spec                |   36 +++++---
 sources                  |    2 +-
 9 files changed, 163 insertions(+), 293 deletions(-)
---
diff --cc cups.spec
index 4845f28,16b67a5..2a208bf
--- a/cups.spec
+++ b/cups.spec
@@@ -70,10 -67,8 +67,9 @@@ Patch37: cups-gz-crc.patc
  Patch39: cups-ipp-multifile.patch
  Patch40: cups-full-relro.patch
  Patch41: cups-web-devices-timeout.patch
- Patch42: cups-synconclose.patch
  Patch43: cups-final-content-type.patch
- Patch44: cups-journal.patch
+ Patch44: cups-jobhistory.patch
++Patch45: cups-journal.patch
  
  Patch100: cups-lspp.patch
  
@@@ -271,10 -264,8 +265,10 @@@ Sends IPP requests to the specified UR
  # Reverted upstream change to FINAL_CONTENT_TYPE in order to fix
  # printing to remote CUPS servers (bug #1010580).
  %patch43 -p1 -b .final-content-type
+ # Fix job history logging.
+ %patch44 -p1 -b .jobhistory
 +# Allow "journal" log type for log output to system journal.
- %patch44 -p1 -b .journal
++%patch45 -p1 -b .journal
  
  %if %lspp
  # LSPP support.
@@@ -649,9 -646,12 +649,15 @@@ rm -f %{cups_serverbin}/backend/sm
  %{_mandir}/man5/ipptoolfile.5.gz
  
  %changelog
+ * Thu Oct 24 2013 Tim Waugh <twaugh at redhat.com> - 1:1.7.0-1
+ - 1.7.0.
+ 
 -* Thu Oct 24 2013 Tim Waugh <twaugh at redhat.com> - 1:1.7-0.27.rc1
++* Thu Oct 24 2013 Tim Waugh <twaugh at redhat.com>
+ - Fix job history logging.
+ 
 +* Mon Oct 21 2013 Tim Waugh <twaugh at redhat.com> - 1:1.7-0.27.rc1
 +- Allow "journal" log type for log output to system journal.
 +
  * Fri Sep 27 2013 Tim Waugh <twaugh at redhat.com> - 1:1.7-0.26.rc1
  - Reverted upstream change to FINAL_CONTENT_TYPE in order to fix
    printing to remote CUPS servers (bug #1010580).