diff --git a/.gitignore b/.gitignore index 07b4277..f174f38 100644 --- a/.gitignore +++ b/.gitignore @@ -70,3 +70,4 @@ hplip-3.10.6.tar.gz /hplip-3.15.4.tar.gz /hplip-3.15.6.tar.gz /hplip-3.15.7.tar.gz +/hplip-3.15.9.tar.gz diff --git a/hplip-CommonDefinations.patch b/hplip-CommonDefinations.patch deleted file mode 100644 index 8ee6624..0000000 --- a/hplip-CommonDefinations.patch +++ /dev/null @@ -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 diff --git a/hplip.spec b/hplip.spec index efb3399..98986e2 100644 --- a/hplip.spec +++ b/hplip.spec @@ -7,7 +7,7 @@ Summary: HP Linux Imaging and Printing Project Name: hplip Version: 3.15.7 -Release: 5%{?dist} +Release: 1%{?dist} License: GPLv2+ and MIT and BSD Url: http://hplip.sourceforge.net/ @@ -36,7 +36,6 @@ Patch20: hplip-dj990c-margin.patch Patch21: hplip-strncpy.patch Patch22: hplip-no-write-bytecode.patch Patch23: hplip-silence-ioerror.patch -Patch24: hplip-CommonDefinations.patch Requires: %{name}-libs%{?_isa} = %{version}-%{release} Requires: python3-pillow @@ -206,9 +205,6 @@ done # Ignore IOError when logging output (bug #712537). %patch23 -p1 -b .silence-ioerror -# https://bugs.launchpad.net/hplip/+bug/1476920 -%patch24 -p1 -b .CommonDefinations - sed -i.duplex-constraints \ -e 's,\(UIConstraints.* \*Duplex\),//\1,' \ prnt/drv/hpcups.drv.in @@ -452,6 +448,9 @@ rm -f %{buildroot}%{_sysconfdir}/xdg/autostart/hplip-systray.desktop %postun libs -p /sbin/ldconfig %changelog +* Tue Sep 15 2015 Jiri Popelka - 3.15.9-1 +- 3.15.9 + * Tue Aug 18 2015 Jiri Popelka - 3.15.7-5 - remove compat-libs subpackage (bug #1196237) - make copy-deviceid.py Python 3 compatible diff --git a/sources b/sources index f82d261..131159c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -13be6f818c4dd27518320b2b230c907f hplip-3.15.7.tar.gz +8188653d1e65ae1c4850da78319007ee hplip-3.15.9.tar.gz