[hplip/f21: 6/6] Merge branch 'f20'

[Tim Waugh]

commit 0bcf74f83769bec4dcad04037a9a3dd7c6851ae0
Merge: 85f9eb8 89fade9
Author: Tim Waugh <twaugh at redhat.com>
Date:   Wed Jan 21 17:13:38 2015 +0000

    Merge branch 'f20'

 hplip-strncpy.patch |   48 ++++++++++++++++++++++++++++++++++++++++++++++++
 hplip.spec          |    9 ++++++++-
 2 files changed, 56 insertions(+), 1 deletions(-)
---
diff --cc hplip.spec
index f9b31ba,b4ee381..9c0036a
--- a/hplip.spec
+++ b/hplip.spec
@@@ -7,7 -7,7 +7,7 @@@
  Summary: HP Linux Imaging and Printing Project
  Name: hplip
  Version: 3.14.10
- Release: 6%{?dist}
 -Release: 4%{?dist}
++Release: 7%{?dist}
  License: GPLv2+ and MIT
  
  Url: http://hplip.sourceforge.net/
@@@ -35,8 -35,7 +35,9 @@@ Patch18: hplip-log-stderr.patc
  Patch19: hplip-avahi-parsing.patch
  Patch20: hplip-reportlab.patch
  Patch21: hplip-device_open.patch
 -Patch22: hplip-strncpy.patch
 +Patch22: hplip-jpeg.patch
 +Patch23: hplip-dj990c-margin.patch
++Patch24: hplip-strncpy.patch
  
  %global hpijs_epoch 1
  Requires: hpijs%{?_isa} = %{hpijs_epoch}:%{version}-%{release}
@@@ -261,12 -260,9 +262,15 @@@ don
  # port device is used (bug #1159161).
  %patch21 -p1 -b .device_open
  
 +# Fixed build against libjpeg-turbo 1.3.90.
 +%patch22 -p1 -b .jpeg
 +
 +# Fixed left/right margins for HP DeskJet 990C (LP #1405212).
 +%patch23 -p1 -b .dj990c-margin
 +
+ # Fixed uses of strncpy throughout.
 -%patch22 -p1 -b .strncpy
++%patch24 -p1 -b .strncpy
+ 
  sed -i.duplex-constraints \
      -e 's,\(UIConstraints.* \*Duplex\),//\1,' \
      prnt/drv/hpcups.drv.in
@@@ -503,13 -499,10 +507,16 @@@ rm -f %{buildroot}%{_sysconfdir}/xdg/au
  %postun libs -p /sbin/ldconfig
  
  %changelog
 -* Wed Jan 21 2015 Tim Waugh <twaugh at redhat.com> - 3.14.10-4
++* Wed Jan 21 2015 Tim Waugh <twaugh at redhat.com> - 3.14.10-7
+ - Fixed uses of strncpy throughout.
+ 
 -* Tue Nov  4 2014 Tim Waugh <twaugh at redhat.com> - 3.14.10-3
 +* Wed Jan 14 2015 Tim Waugh <twaugh at redhat.com> - 3.14.10-6
 +- Requires python3-cups to get postscriptdriver() tags.
 +
 +* Tue Dec 23 2014 Tim Waugh <twaugh at redhat.com> - 3.14.10-5
 +- Fixed left/right margins for HP DeskJet 990C (LP #1405212).
 +
 +* Tue Nov  4 2014 Tim Waugh <twaugh at redhat.com> - 3.14.10-4
  - IEEE 1284 Device ID for HP LaserJet Professional M1132 MFP
    (bug #1158743 comment #5).
  - IEEE 1284 Device ID for HP LaserJet Color M451dn (bug #1159380).