diff --git a/.gitignore b/.gitignore index 86119a9..936e84b 100644 --- a/.gitignore +++ b/.gitignore @@ -78,3 +78,4 @@ hplip-3.10.6.tar.gz /hplip-3.16.7.tar.gz /hplip-3.16.8.tar.gz /hplip-3.16.9.tar.gz +/hplip-3.16.10.tar.gz diff --git a/hplip-3.16.10.tar.gz.asc b/hplip-3.16.10.tar.gz.asc new file mode 100644 index 0000000..c332146 --- /dev/null +++ b/hplip-3.16.10.tar.gz.asc @@ -0,0 +1,7 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1 + +iEYEABECAAYFAlgJ8wUACgkQc9dwzaWQR7kkhwCcCzsWgk7iZAia6jRoDiR4Vq84 +4rYAnRl6KCB3IJ87N8msFcS/CCqngyCU +=BzIq +-----END PGP SIGNATURE----- diff --git a/hplip-3.16.9.tar.gz.asc b/hplip-3.16.9.tar.gz.asc deleted file mode 100644 index 374bd39..0000000 --- a/hplip-3.16.9.tar.gz.asc +++ /dev/null @@ -1,7 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1 - -iEYEABECAAYFAlff4uUACgkQc9dwzaWQR7kg/QCgzf3QnBOcs+MlWRo/IirTZ0zc -nycAniVTICnUhX89IEEewMfVRtzTGNhD -=JXXj ------END PGP SIGNATURE----- diff --git a/hplip-include-ppdh.patch b/hplip-include-ppdh.patch deleted file mode 100644 index 41dc918..0000000 --- a/hplip-include-ppdh.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff -up hplip-3.16.5/prnt/hpcups/HPCupsFilter.h.ppd hplip-3.16.5/prnt/hpcups/HPCupsFilter.h ---- hplip-3.16.5/prnt/hpcups/HPCupsFilter.h.ppd 2016-07-11 13:37:19.224836291 +0200 -+++ hplip-3.16.5/prnt/hpcups/HPCupsFilter.h 2016-07-11 13:38:05.290523517 +0200 -@@ -37,6 +37,7 @@ - #include "Job.h" - - #include "dbuscomm.h" -+#include - - #define DBITMAPFILEHEADER 14 - #define DBITMAPINFOHEADER 40 -diff -up hplip-3.16.5/prnt/hpijs/hpcupsfax.h.ppd hplip-3.16.5/prnt/hpijs/hpcupsfax.h ---- hplip-3.16.5/prnt/hpijs/hpcupsfax.h.ppd 2016-07-11 13:43:25.837347080 +0200 -+++ hplip-3.16.5/prnt/hpijs/hpcupsfax.h 2016-07-11 13:45:14.590608672 +0200 -@@ -32,6 +32,8 @@ - #ifndef HPCUPSFAX_H - #define HPCUPSFAX_H - -+#include -+ - /* - * Raster data encoding methods - */ diff --git a/hplip.spec b/hplip.spec index 41a8068..0570f76 100644 --- a/hplip.spec +++ b/hplip.spec @@ -6,7 +6,7 @@ Summary: HP Linux Imaging and Printing Project Name: hplip -Version: 3.16.9 +Version: 3.16.10 Release: 1%{?dist} License: GPLv2+ and MIT and BSD @@ -37,8 +37,7 @@ Patch21: hplip-strncpy.patch Patch22: hplip-no-write-bytecode.patch Patch23: hplip-silence-ioerror.patch Patch24: hplip-3165-sourceoption.patch -Patch25: hplip-include-ppdh.patch -Patch26: hplip-badwhitespace.patch +Patch25: hplip-badwhitespace.patch Requires: %{name}-libs%{?_isa} = %{version}-%{release} Requires: python3-pillow @@ -213,11 +212,8 @@ done # [abrt] hplip: hp-scan:663::NameError: name 'source_option' is not defined (bug #1341304) %patch24 -p1 -b .sourceoption -# FTBFS error when rebasing to 3.16.5 - need to include ppd.h -%patch25 -p1 -b .include-ppdh - # Bad whitespaces (bug #1372343) -%patch26 -p1 -b .badwhitespace +%patch25 -p1 -b .badwhitespace sed -i.duplex-constraints \ -e 's,\(UIConstraints.* \*Duplex\),//\1,' \ @@ -470,6 +466,9 @@ rm -f %{buildroot}%{_sysconfdir}/xdg/autostart/hplip-systray.desktop %postun libs -p /sbin/ldconfig %changelog +* Mon Oct 31 2016 Zdenek Dohnal - 3.16.10-1 +- rebase to 3.16.10, removed include-ppdh patch + * Thu Sep 22 2016 Zdenek Dohnal - 3.16.9-1 - rebase to 3.16.9 diff --git a/sources b/sources index f86c3ed..111e200 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -c173ff4a0192645c55763ff3fe503264 hplip-3.16.9.tar.gz +dd3bf0ecd410e6961abd86407b7f802f hplip-3.16.10.tar.gz