import pnm2ppa-1.13-6.el10

cs10 imports/cs10/pnm2ppa-1.13-6.el10
MSVSphere Packaging Team 3 months ago
parent 34f1a6758d
commit 1731ca51e7
Signed by: sys_gitsync
GPG Key ID: B2B0B9F29E528FE8

@ -0,0 +1,17 @@
diff --git a/defaults.h b/defaults.h
index 4385cc6..c3f28a7 100644
--- a/defaults.h
+++ b/defaults.h
@@ -24,10 +24,10 @@
typedef enum
{
- NOPRINTER = 0xff,
HP7X0 = 0,
HP820,
- HP1000
+ HP1000,
+ NOPRINTER
}
printerModel_t;

@ -2,7 +2,7 @@ Name: pnm2ppa
Summary: Drivers for printing to HP PPA printers Summary: Drivers for printing to HP PPA printers
Epoch: 1 Epoch: 1
Version: 1.13 Version: 1.13
Release: 5%{?dist} Release: 6%{?dist}
URL: http://sourceforge.net/projects/pnm2ppa URL: http://sourceforge.net/projects/pnm2ppa
Source: http://download.sourceforge.net/pnm2ppa/pnm2ppa-%{version}.tar.gz Source: http://download.sourceforge.net/pnm2ppa/pnm2ppa-%{version}.tar.gz
# Following sourcelink is dead currently. # Following sourcelink is dead currently.
@ -17,6 +17,9 @@ Patch3: pnm2ppa-coverity-return-local.patch
Patch4: pnm2ppa-gcc10.patch Patch4: pnm2ppa-gcc10.patch
# add ldflags to Makefile # add ldflags to Makefile
Patch5: pnm2ppa-ldflags.patch Patch5: pnm2ppa-ldflags.patch
# match NOPRINTER enum with its position in global printer table
# fixes crash on aarch64
Patch6: pnm2ppa-aarch-help-crash.patch
# pbm2ppa, pnm2ppa - GPL-2.0-or-later # pbm2ppa, pnm2ppa - GPL-2.0-or-later
# pdq/* - GPL-2.0, but not shipped, thus not mentioned in license tag # pdq/* - GPL-2.0, but not shipped, thus not mentioned in license tag
License: GPL-2.0-or-later License: GPL-2.0-or-later
@ -51,6 +54,7 @@ Install pnm2ppa if you need to print to a PPA printer.
%patch -P 3 -p1 -b .coverity-return-local %patch -P 3 -p1 -b .coverity-return-local
%patch -P 4 -p1 -b .gcc10 %patch -P 4 -p1 -b .gcc10
%patch -P 5 -p1 -b .ldflags %patch -P 5 -p1 -b .ldflags
%patch -P 6 -p1 -b .help-aarch-crash
for file in docs/en/LICENSE pbm2ppa-0.8.6/LICENSE; do for file in docs/en/LICENSE pbm2ppa-0.8.6/LICENSE; do
sed "s|\r||g" $file > $file.new && \ sed "s|\r||g" $file > $file.new && \
@ -110,6 +114,9 @@ done
%config(noreplace) %{_sysconfdir}/pbm2ppa.conf %config(noreplace) %{_sysconfdir}/pbm2ppa.conf
%changelog %changelog
* Tue Dec 03 2024 Zdenek Dohnal <zdohnal@redhat.com> - 1:1.13-6
- RHEL-59030 pnm2ppa --help dumps core on aarch64
* Tue Oct 29 2024 Troy Dawson <tdawson@redhat.com> - 1:1.13-5 * Tue Oct 29 2024 Troy Dawson <tdawson@redhat.com> - 1:1.13-5
- Bump release for October 2024 mass rebuild: - Bump release for October 2024 mass rebuild:
Resolves: RHEL-64018 Resolves: RHEL-64018

Loading…
Cancel
Save