rebase to 3.16.10, removed include-ppdh patch
This commit is contained in:
commit
1bdae18fda
1
.gitignore
vendored
1
.gitignore
vendored
@ -78,3 +78,4 @@ hplip-3.10.6.tar.gz
|
|||||||
/hplip-3.16.7.tar.gz
|
/hplip-3.16.7.tar.gz
|
||||||
/hplip-3.16.8.tar.gz
|
/hplip-3.16.8.tar.gz
|
||||||
/hplip-3.16.9.tar.gz
|
/hplip-3.16.9.tar.gz
|
||||||
|
/hplip-3.16.10.tar.gz
|
||||||
|
7
hplip-3.16.10.tar.gz.asc
Normal file
7
hplip-3.16.10.tar.gz.asc
Normal file
@ -0,0 +1,7 @@
|
|||||||
|
-----BEGIN PGP SIGNATURE-----
|
||||||
|
Version: GnuPG v1
|
||||||
|
|
||||||
|
iEYEABECAAYFAlgJ8wUACgkQc9dwzaWQR7kkhwCcCzsWgk7iZAia6jRoDiR4Vq84
|
||||||
|
4rYAnRl6KCB3IJ87N8msFcS/CCqngyCU
|
||||||
|
=BzIq
|
||||||
|
-----END PGP SIGNATURE-----
|
@ -1,7 +0,0 @@
|
|||||||
-----BEGIN PGP SIGNATURE-----
|
|
||||||
Version: GnuPG v1
|
|
||||||
|
|
||||||
iEYEABECAAYFAlff4uUACgkQc9dwzaWQR7kg/QCgzf3QnBOcs+MlWRo/IirTZ0zc
|
|
||||||
nycAniVTICnUhX89IEEewMfVRtzTGNhD
|
|
||||||
=JXXj
|
|
||||||
-----END PGP SIGNATURE-----
|
|
@ -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 <cups/ppd.h>
|
|
||||||
|
|
||||||
#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 <cups/ppd.h>
|
|
||||||
+
|
|
||||||
/*
|
|
||||||
* Raster data encoding methods
|
|
||||||
*/
|
|
17
hplip.spec
17
hplip.spec
@ -6,8 +6,8 @@
|
|||||||
|
|
||||||
Summary: HP Linux Imaging and Printing Project
|
Summary: HP Linux Imaging and Printing Project
|
||||||
Name: hplip
|
Name: hplip
|
||||||
Version: 3.16.9
|
Version: 3.16.10
|
||||||
Release: 2%{?dist}
|
Release: 1%{?dist}
|
||||||
License: GPLv2+ and MIT and BSD
|
License: GPLv2+ and MIT and BSD
|
||||||
|
|
||||||
Url: http://hplipopensource.com/
|
Url: http://hplipopensource.com/
|
||||||
@ -37,9 +37,8 @@ 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-3165-sourceoption.patch
|
Patch24: hplip-3165-sourceoption.patch
|
||||||
Patch25: hplip-include-ppdh.patch
|
Patch25: hplip-badwhitespace.patch
|
||||||
Patch26: hplip-noernie.patch
|
Patch26: hplip-noernie.patch
|
||||||
Patch27: hplip-badwhitespace.patch
|
|
||||||
|
|
||||||
Requires: %{name}-libs%{?_isa} = %{version}-%{release}
|
Requires: %{name}-libs%{?_isa} = %{version}-%{release}
|
||||||
Requires: python3-pillow
|
Requires: python3-pillow
|
||||||
@ -214,15 +213,12 @@ done
|
|||||||
# [abrt] hplip: hp-scan:663:<module>:NameError: name 'source_option' is not defined (bug #1341304)
|
# [abrt] hplip: hp-scan:663:<module>:NameError: name 'source_option' is not defined (bug #1341304)
|
||||||
%patch24 -p1 -b .sourceoption
|
%patch24 -p1 -b .sourceoption
|
||||||
|
|
||||||
# missing ppd.h - FTBFS bug when rebasing to 3.16.7
|
# Bad whitespaces (bug #1372343)
|
||||||
%patch25 -p1 -b .include-ppdh
|
%patch25 -p1 -b .badwhitespace
|
||||||
|
|
||||||
# hplip license problem (bug #1364711)
|
# hplip license problem (bug #1364711)
|
||||||
%patch26 -p1 -b .no-ernie
|
%patch26 -p1 -b .no-ernie
|
||||||
|
|
||||||
# Bad whitespaces (bug #1372343)
|
|
||||||
%patch27 -p1 -b .badwhitespace
|
|
||||||
|
|
||||||
rm prnt/hpcups/ErnieFilter.{cpp,h} prnt/hpijs/ernieplatform.h
|
rm prnt/hpcups/ErnieFilter.{cpp,h} prnt/hpijs/ernieplatform.h
|
||||||
|
|
||||||
sed -i.duplex-constraints \
|
sed -i.duplex-constraints \
|
||||||
@ -476,6 +472,9 @@ rm -f %{buildroot}%{_sysconfdir}/xdg/autostart/hplip-systray.desktop
|
|||||||
%postun libs -p /sbin/ldconfig
|
%postun libs -p /sbin/ldconfig
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Mon Oct 31 2016 Zdenek Dohnal <zdohnal@redhat.com> - 3.16.10-1
|
||||||
|
- rebase to 3.16.10, removed include-ppdh patch
|
||||||
|
|
||||||
* Mon Oct 24 2016 Zdenek Dohnal <zdohnal@redhat.com> - 3.16.9-2
|
* Mon Oct 24 2016 Zdenek Dohnal <zdohnal@redhat.com> - 3.16.9-2
|
||||||
- changing url to http://hplipopensource.com/
|
- changing url to http://hplipopensource.com/
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user