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-09-15 12:02:02 +02:00
commit dcc79ef740
4 changed files with 6 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -70,3 +70,4 @@ hplip-3.10.6.tar.gz
/hplip-3.15.4.tar.gz /hplip-3.15.4.tar.gz
/hplip-3.15.6.tar.gz /hplip-3.15.6.tar.gz
/hplip-3.15.7.tar.gz /hplip-3.15.7.tar.gz
/hplip-3.15.9.tar.gz

22
hplip-CommonDefinations.patch
View File

@ -1,22 +0,0 @@
*** 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

@ -7,7 +7,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: 5%{?dist} Release: 1%{?dist}
License: GPLv2+ and MIT and BSD License: GPLv2+ and MIT and BSD
Url: http://hplip.sourceforge.net/ Url: http://hplip.sourceforge.net/
@ -36,7 +36,6 @@ 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}
Requires: python3-pillow Requires: python3-pillow
@ -206,9 +205,6 @@ 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
@ -452,6 +448,9 @@ rm -f %{buildroot}%{_sysconfdir}/xdg/autostart/hplip-systray.desktop
%postun libs -p /sbin/ldconfig %postun libs -p /sbin/ldconfig
%changelog %changelog
* Tue Sep 15 2015 Jiri Popelka <jpopelka@redhat.com> - 3.15.9-1
- 3.15.9
* Tue Aug 18 2015 Jiri Popelka <jpopelka@redhat.com> - 3.15.7-5 * Tue Aug 18 2015 Jiri Popelka <jpopelka@redhat.com> - 3.15.7-5
- remove compat-libs subpackage (bug #1196237) - remove compat-libs subpackage (bug #1196237)
- make copy-deviceid.py Python 3 compatible - make copy-deviceid.py Python 3 compatible

2
sources
View File

@ -1 +1 @@
13be6f818c4dd27518320b2b230c907f hplip-3.15.7.tar.gz 8188653d1e65ae1c4850da78319007ee hplip-3.15.9.tar.gz