Compare commits

...

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

7 changed files with 82 additions and 3 deletions

View File

@ -1 +1 @@
628f76dd61d81b6fcabb458644f0426f4ed34c34 SOURCES/c2esp-27.tar.gz
628f76dd61d81b6fcabb458644f0426f4ed34c34 c2esp-27.tar.gz

4
.gitignore vendored
View File

@ -1 +1,3 @@
SOURCES/c2esp-27.tar.gz
/c2esp26.tar.gz
/c2esp27~rc1.tar.gz
/c2esp-27.tar.gz

33
c2esp-gcc10.patch Normal file
View File

@ -0,0 +1,33 @@
diff --git a/src/c2espcommon.c b/src/c2espcommon.c
index 51291f7..409e7f6 100644
--- a/src/c2espcommon.c
+++ b/src/c2espcommon.c
@@ -43,11 +43,11 @@
* Globals...
*/
char CallerName[50]; /* String that identifies the calling program */
-int DoBack; /* Enables the back channel comms */
+extern int DoBack; /* Enables the back channel comms */
char BackBuf[32000]; //for the back channel replies from the printer
int BackBufLen=sizeof(BackBuf)-1;
FILE *LogFile = NULL; //file descriptor for log file
-time_t StartTime;
+extern time_t StartTime;
int BlackPercent, ColourPercent;
time_t KeepAwake(time_t Start, int Interval, FILE *PrintFile)
diff --git a/src/c2espcommon.h b/src/c2espcommon.h
index b726204..967e9ce 100644
--- a/src/c2espcommon.h
+++ b/src/c2espcommon.h
@@ -35,8 +35,8 @@
/*
* Globals...
*/
-char BackBuf[32000]; //for the back channel replies from the printer
-int ColourPercent, BlackPercent; //to store the detected marker levels
+extern char BackBuf[32000]; //for the back channel replies from the printer
+extern int ColourPercent, BlackPercent; //to store the detected marker levels
time_t KeepAwake(time_t Start, int Interval, FILE *PrintFile);

View File

@ -2,7 +2,7 @@
Name: c2esp
Version: 2.7
Release: 14%{?dist}
Release: 24%{?dist}
Summary: CUPS driver for Kodak AiO printers
License: GPLv2+
@ -10,6 +10,7 @@ URL: http://sourceforge.net/projects/cupsdriverkodak/
Source0: http://downloads.sourceforge.net/cupsdriverkodak/c2esp-%{version_no_dot}.tar.gz
Patch01: c2esp-ftbfs-gcc7.patch
Patch02: c2esp-gcc10.patch
# _cups_serverbin macro
BuildRequires: cups-devel
@ -25,6 +26,8 @@ BuildRequires: jbigkit-devel
# Needs gcc for compilation
BuildRequires: gcc
# uses make
BuildRequires: make
# directory structure
Requires: cups-filesystem
@ -35,6 +38,7 @@ CUPS filters and drivers for Kodak ESP and Hero all in one printers.
%prep
%setup -q -n c2esp-%{version_no_dot}
%patch01 -p1 -b .ftbfs-gcc7
%patch02 -p1 -b .gcc10
%build
%configure
@ -53,6 +57,37 @@ make -C src/ install DESTDIR=%{buildroot}
%{_datadir}/cups/drv/c2esp
%changelog
* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 2.7-24
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
Related: rhbz#1991688
* Thu Apr 15 2021 Mohan Boddu <mboddu@redhat.com> - 2.7-23
- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.7-22
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
* Thu Nov 05 2020 Zdenek Dohnal <zdohnal@redhat.com> - 2.7-21
- make is no more in buildroot by default
* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.7-20
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Mon Feb 03 2020 Zdenek Dohnal <zdohnal@redhat.com> - 2.7-19
- FTBFS with GCC 10
* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.7-18
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
* Wed Jul 24 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.7-17
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.7-16
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
* Thu Jul 12 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.7-15
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
* Mon Feb 19 2018 Zdenek Dohnal <zdohnal@redhat.com> - 2.7-14
- gcc is no longer in buildroot by default

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}

1
sources Normal file
View File

@ -0,0 +1 @@
dd63fb1aa1c551ecfd1f3c585b36db74 c2esp-27.tar.gz