Compare commits

...

No commits in common. "c8" and "c9s" have entirely different histories.
c8 ... c9s

11 changed files with 102 additions and 6 deletions

4
.gitignore vendored
View File

@ -1,2 +1,2 @@
SOURCES/pnm2ppa-1.04.tar.gz
SOURCES/ppa-0.8.6.tar.gz
pnm2ppa-1.04.tar.gz
ppa-0.8.6.tar.gz

View File

@ -1,2 +1,2 @@
a3cd26788779bc80fa6c8265f3b2aacaaa5acd92 SOURCES/pnm2ppa-1.04.tar.gz
97eedbb777940cd7fa9b2efa181c70f7146325af SOURCES/ppa-0.8.6.tar.gz
a3cd26788779bc80fa6c8265f3b2aacaaa5acd92 pnm2ppa-1.04.tar.gz
97eedbb777940cd7fa9b2efa181c70f7146325af ppa-0.8.6.tar.gz

8
gating.yaml Normal file
View File

@ -0,0 +1,8 @@
--- !Policy
product_versions:
- rhel-9
decision_context: osci_compose_gate
rules:
- !PassingTestCaseRule {test_case_name: baseos-ci.brew-build.tier1.functional}
- !PassingTestCaseRule {test_case_name: baseos-ci.brew-build.tedude.validation}
- !PassingTestCaseRule {test_case_name: baseos-ci.brew-build.acceptance-tier.functional}

25
pnm2ppa-gcc10.patch Normal file
View File

@ -0,0 +1,25 @@
diff --git a/syslog.c b/syslog.c
index e70f12c..af067e2 100644
--- a/syslog.c
+++ b/syslog.c
@@ -27,6 +27,7 @@
#include "global.h"
+char syslog_message[128];
/*
For some reason, BeOS doesn't seem to implement syslog(), even though it is
diff --git a/syslog.h b/syslog.h
index 7d0e436..5c1accd 100644
--- a/syslog.h
+++ b/syslog.h
@@ -39,7 +39,7 @@
#include <syslog.h>
#endif
-char syslog_message[128];
+extern char syslog_message[128];
extern size_t message_size ;
void wrap_syslog( int, char *, char *);

View File

@ -0,0 +1,13 @@
diff --git a/pnm2ppa.c b/pnm2ppa.c
index 4ae36ce..0d60fbb 100644
--- a/pnm2ppa.c
+++ b/pnm2ppa.c
@@ -604,7 +604,7 @@ main (int argc, char *argv[])
int i, opt_index;
FILE *in = NULL, *out = NULL, *gf = NULL;
struct stat tmpstat;
- char c;
+ int c;
BOOLEAN get_Gamma = true;
char *gammaFile=NULL;

View File

@ -2,7 +2,7 @@ Name: pnm2ppa
Summary: Drivers for printing to HP PPA printers
Epoch: 1
Version: 1.04
Release: 40%{?dist}
Release: 52%{?dist}
URL: http://sourceforge.net/projects/pnm2ppa
Source: http://download.sourceforge.net/pnm2ppa/pnm2ppa-%{version}.tar.gz
# Following sourcelink is dead currently.
@ -15,10 +15,19 @@ Patch3: pnm2ppa-redhat.patch
Patch4: pnm2ppa-coverity-return-local.patch
# add ldflags to Makefile
Patch5: pnm2ppa-ldflags.patch
# FTBFS with GCC 10
Patch6: pnm2ppa-gcc10.patch
# fix argument reading for non x86_64 archs - use int instead of char
Patch7: pnm2ppa-optargs-read.patch
License: GPLv2+
# gcc is no longer in buildroot by default
BuildRequires: gcc
# uses make
BuildRequires: make
# foomatic is needed for using the filters in CUPS
Requires: foomatic
%description
Pnm2ppa is a color driver for HP PPA host-based printers such as the
@ -37,6 +46,8 @@ Install pnm2ppa if you need to print to a PPA printer.
%patch3 -p1 -b .rh
%patch4 -p1 -b .coverity-return-local
%patch5 -p1 -b .ldflags
%patch6 -p1 -b .gcc10
%patch7 -p1 -b .optargs-read
for file in docs/en/LICENSE pbm2ppa-0.8.6/LICENSE; do
sed "s|\r||g" $file > $file.new && \
@ -93,9 +104,46 @@ done
%config(noreplace) %{_sysconfdir}/pbm2ppa.conf
%changelog
* Tue Jul 24 2018 Zdenek Dohnal <zdohnal@redhat.com> - 1:1.04-40
* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 1:1.04-52
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
Related: rhbz#1991688
* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 1:1.04-51
- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1:1.04-50
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
* Thu Nov 05 2020 Zdenek Dohnal <zdohnal@redhat.com> - 1:1.04-49
- make is no longer in buildroot by default
* Tue Aug 04 2020 Zdenek Dohnal <zdohnal@redhat.com> - 1:1.04-48
- fix argument reading for non x86_64 archs - use int instead of char
* Mon Aug 03 2020 Zdenek Dohnal <zdohnal@redhat.com> - 1:1.04-47
- add foomatic as a dependency, because pnm2ppa drivers are not available as a driver without it
* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1:1.04-46
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Mon Feb 03 2020 Zdenek Dohnal <zdohnal@redhat.com> - 1:1.04-45
- FTBFS with GCC 10
* Thu Jan 30 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1:1.04-44
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
* Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1:1.04-43
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
* Sat Feb 02 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1:1.04-42
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
* Tue Jul 24 2018 Zdenek Dohnal <zdohnal@redhat.com> - 1:1.04-41
- correcting license
* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1:1.04-40
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
* Wed Jul 11 2018 Zdenek Dohnal <zdohnal@redhat.com> - 1:1.04-39
- ship license in %%license tag

2
sources Normal file
View File

@ -0,0 +1,2 @@
8db1f0dcdb3cf86d8ccb9a34007b9e21 pnm2ppa-1.04.tar.gz
fb40576435d5979db64fbea305ec224b ppa-0.8.6.tar.gz