rpms/hplip
6
0
Fork 0
Code Issues Pull Requests Releases Activity

Merge branch 'f22' into f23

Browse Source
This commit is contained in:
Jiri Popelka 2015-08-11 13:22:00 +02:00
commit f33ef87b7e
2 changed files with 30 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
hplip-CommonDefinations.patch Normal file
View File

@ -0,0 +1,22 @@
*** hplip-3.15.7_original/prnt/hpcups/CommonDefinitions.h 2015-07-13 13:18:53.000000000 +0530
--- hplip-3.15.7_latest/prnt/hpcups/CommonDefinitions.h 2015-07-28 20:07:24.018247373 +0530
***************
*** 441,447 ****
{
int media_source;
int color_mode;
- int HPSPDClass;
DUPLEXMODE e_duplex_mode;
int print_borderless;
int krgb_mode;
--- 441,446 ----
***************
*** 466,471 ****
--- 465,471 ----
int integer_values[16];
int printer_platform_version;
int pre_process_raster;
+ int HPSPDClass;
} JobAttributes;
#endif // COMMON_DEFINITIONS_H

9
hplip.spec
View File

@ -10,7 +10,7 @@
Summary: HP Linux Imaging and Printing Project Summary: HP Linux Imaging and Printing Project
Name: hplip Name: hplip
Version: 3.15.7 Version: 3.15.7
Release: 3%{?dist} Release: 4%{?dist}
License: GPLv2+ and MIT and BSD License: GPLv2+ and MIT and BSD
Url: http://hplip.sourceforge.net/ Url: http://hplip.sourceforge.net/
@ -39,6 +39,7 @@ Patch20: hplip-dj990c-margin.patch
Patch21: hplip-strncpy.patch Patch21: hplip-strncpy.patch
Patch22: hplip-no-write-bytecode.patch Patch22: hplip-no-write-bytecode.patch
Patch23: hplip-silence-ioerror.patch Patch23: hplip-silence-ioerror.patch
Patch24: hplip-CommonDefinations.patch
Requires: %{name}-libs%{?_isa} = %{version}-%{release} Requires: %{name}-libs%{?_isa} = %{version}-%{release}
# due to hp-plugin (BZ#1196237) # due to hp-plugin (BZ#1196237)
@ -221,6 +222,9 @@ done
# Ignore IOError when logging output (bug #712537). # Ignore IOError when logging output (bug #712537).
%patch23 -p1 -b .silence-ioerror %patch23 -p1 -b .silence-ioerror
# https://bugs.launchpad.net/hplip/+bug/1476920
%patch24 -p1 -b .CommonDefinations
sed -i.duplex-constraints \ sed -i.duplex-constraints \
-e 's,\(UIConstraints.* \*Duplex\),//\1,' \ -e 's,\(UIConstraints.* \*Duplex\),//\1,' \
prnt/drv/hpcups.drv.in prnt/drv/hpcups.drv.in
@ -493,6 +497,9 @@ rm -f %{buildroot}%{_sysconfdir}/xdg/autostart/hplip-systray.desktop
%postun libs -p /sbin/ldconfig %postun libs -p /sbin/ldconfig
%changelog %changelog
* Tue Aug 11 2015 Jiri Popelka <jpopelka@redhat.com> - 3.15.7-4
- Upstream fix for 'Stopped "Filter Failed"' (Launchpad #1476920)
* Thu Jul 30 2015 Jiri Popelka <jpopelka@redhat.com> - 3.15.7-3 * Thu Jul 30 2015 Jiri Popelka <jpopelka@redhat.com> - 3.15.7-3
- fix hpijs Obsoletes & Provides - fix hpijs Obsoletes & Provides
- remove Group tag - remove Group tag