Merge branch 'f14' into f15
This commit is contained in:
commit
99e97dbad0
@ -50,7 +50,7 @@ diff -up hplip-3.11.7/fax/filters/pstotiff.pstotiff-is-rubbish hplip-3.11.7/fax/
|
||||
+fi
|
||||
+
|
||||
+TMPFILE=`mktemp /tmp/pstotiff.XXXXXX` || exit 1
|
||||
+gs -I/usr/share/cups/fonts -sDEVICE=tiffg4 -dMaxStripSize=0 -r204x196
|
||||
+gs -I/usr/share/cups/fonts -sDEVICE=tiffg4 -dMaxStripSize=0 -r204x196 \
|
||||
+ -dNOPAUSE -dBATCH -dSAFER -dPARANOIDSAFER \
|
||||
+ -dSHORTERRORS -dWRITESYSTEMDICT -dGHOSTSCRIPT \
|
||||
+ -sstdout=%stderr -sOutputFile="$TMPFILE" "$IN"
|
||||
|
@ -1,7 +1,7 @@
|
||||
Summary: HP Linux Imaging and Printing Project
|
||||
Name: hplip
|
||||
Version: 3.11.7
|
||||
Release: 4%{?dist}
|
||||
Release: 5%{?dist}
|
||||
License: GPLv2+ and MIT
|
||||
Group: System Environment/Daemons
|
||||
Conflicts: system-config-printer < 0.6.132
|
||||
@ -542,6 +542,9 @@ fi
|
||||
%postun libs -p /sbin/ldconfig
|
||||
|
||||
%changelog
|
||||
* Fri Sep 23 2011 Tim Waugh <twaugh@redhat.com> 3.11.7-5
|
||||
- Fixed broken patch for pstotiff.
|
||||
|
||||
* Tue Sep 06 2011 Jiri Popelka <jpopelka@redhat.com> 3.11.7-4
|
||||
- Fixed xsane crash when doing a multi-image scan (bug #725878)
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user