From 9f0cb012c1f77d3d3f9830ca80bd5f3786e876b3 Mon Sep 17 00:00:00 2001
From: Zdenek Dohnal <zdohnal@redhat.com>
Date: Aug 11 2021 05:46:31 +0000
Subject: fix xml errors reported by rpminspect


---

diff --git a/gutenprint-xmlfixes.patch b/gutenprint-xmlfixes.patch
new file mode 100644
index 0000000..edd6f74
--- /dev/null
+++ b/gutenprint-xmlfixes.patch
@@ -0,0 +1,107 @@
+diff --git a/src/xml/escp2/inks/claria_xp.xml b/src/xml/escp2/inks/claria_xp.xml
+index 44d38b5..693c2b1 100644
+--- a/src/xml/escp2/inks/claria_xp.xml
++++ b/src/xml/escp2/inks/claria_xp.xml
+@@ -78,7 +78,7 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
+  <InkName translate="text" name="CMYKk" text="Six Color Photo" InkID="OTHER">
+   <Channels>
+    <channel name="claria_photo_black" index="0">
+-    <subchannel color="0" subchannel="0" subchannel="0" name="Black" text="Black" translate="text">
++    <subchannel color="0" subchannel="0" name="Black" text="Black" translate="text">
+      <ChannelDensityParam name="BlackDensity"/>
+      <SubchannelTransitionParam name="LightBlackTrans"/>
+     </subchannel>
+diff --git a/src/xml/escp2/inputslots/standard_roll_feed.xml b/src/xml/escp2/inputslots/standard_roll_feed.xml
+index 1422d39..16316c8 100644
+--- a/src/xml/escp2/inputslots/standard_roll_feed.xml
++++ b/src/xml/escp2/inputslots/standard_roll_feed.xml
+@@ -1,4 +1,4 @@
+- <?xml version="1.0"?>
++<?xml version="1.0"?>
+ 
+ <gutenprint xmlns="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+diff --git a/src/xml/escp2/media/artisan.xml b/src/xml/escp2/media/artisan.xml
+index 6e567ee..362759e 100644
+--- a/src/xml/escp2/media/artisan.xml
++++ b/src/xml/escp2/media/artisan.xml
+@@ -1125,7 +1125,7 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
+  </ink>
+ </paper>
+ 
+-<paper translate="text" name="GlossyPaper" text="Photo Quality Glossy Paper"class="premium">
++<paper translate="text" name="GlossyPaper" text="Photo Quality Glossy Paper" class="premium">
+  <parameter type="integer" name="PaperMedia">19</parameter>
+  <parameter type="integer" name="PrintMethod">0x41</parameter>
+ 
+diff --git a/src/xml/escp2/media/claria.xml b/src/xml/escp2/media/claria.xml
+index ce894f5..5b6be23 100644
+--- a/src/xml/escp2/media/claria.xml
++++ b/src/xml/escp2/media/claria.xml
+@@ -1933,7 +1933,7 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
+  </ink>
+ </paper>
+ 
+-<paper translate="text" name="GlossyPaper" text="Photo Quality Glossy Paper"class="premium">
++<paper translate="text" name="GlossyPaper" text="Photo Quality Glossy Paper" class="premium">
+  <parameter type="integer" name="PaperMedia">19</parameter>
+  <parameter type="integer" name="PrintMethod">0x54</parameter>
+ 
+diff --git a/src/xml/escp2/media/claria1400.xml b/src/xml/escp2/media/claria1400.xml
+index a9b36e5..6a5deb7 100644
+--- a/src/xml/escp2/media/claria1400.xml
++++ b/src/xml/escp2/media/claria1400.xml
+@@ -1933,7 +1933,7 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
+  </ink>
+ </paper>
+ 
+-<paper translate="text" name="GlossyPaper" text="Photo Quality Glossy Paper"class="premium">
++<paper translate="text" name="GlossyPaper" text="Photo Quality Glossy Paper" class="premium">
+  <parameter type="integer" name="PaperMedia">19</parameter>
+  <parameter type="integer" name="PrintMethod">0x54</parameter>
+ 
+diff --git a/src/xml/escp2/media/claria_xp.xml b/src/xml/escp2/media/claria_xp.xml
+index 32759b5..79f43c3 100644
+--- a/src/xml/escp2/media/claria_xp.xml
++++ b/src/xml/escp2/media/claria_xp.xml
+@@ -2037,7 +2037,7 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
+  </ink>
+ </paper>
+ 
+-<paper translate="text" name="GlossyPaper" text="Photo Quality Glossy Paper"class="premium">
++<paper translate="text" name="GlossyPaper" text="Photo Quality Glossy Paper" class="premium">
+  <parameter type="integer" name="PaperMedia">19</parameter>
+  <parameter type="integer" name="PrintMethod">0x54</parameter>
+ 
+diff --git a/src/xml/escp2/weaves/standard.xml b/src/xml/escp2/weaves/standard.xml
+index d9176db..efc89de 100644
+--- a/src/xml/escp2/weaves/standard.xml
++++ b/src/xml/escp2/weaves/standard.xml
+@@ -1,4 +1,4 @@
+- <?xml version="1.0"?>
++<?xml version="1.0"?>
+ 
+ <gutenprint xmlns="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+diff --git a/src/xml/printers/dyesub.xml b/src/xml/printers/dyesub.xml
+index 1bd62e6..aa7985d 100644
+--- a/src/xml/printers/dyesub.xml
++++ b/src/xml/printers/dyesub.xml
+@@ -95,7 +95,7 @@
+       <printer translate="name" name="Citizen CW-02" driver="citizen-cw-02" manufacturer="Citizen" model="6000" />
+       <printer translate="name" name="Citizen CX" driver="citizen-cx" deviceid="MANUFACTURER:CITIZEN SYSTEMS ;MODEL:CX;" manufacturer="Citizen" model="6000" />
+       <printer translate="name" name="Citizen CX-02" deviceid="MANUFACTURER:CITIZEN SYSTEMS ;MODEL:CX-02;" driver="citizen-cx-02" manufacturer="Citizen" model="6003" />
+-      <printer translate="name" name="Citizen CX-02W" "MANUFACTURER:CITIZEN SYSTEMS ;MODEL:CX-02W;" driver="citizen-cx-02w" manufacturer="Citizen" model="6007" />
++      <printer translate="name" name="Citizen CX-02W" deviceid="MANUFACTURER:CITIZEN SYSTEMS ;MODEL:CX-02W;" driver="citizen-cx-02w" manufacturer="Citizen" model="6007" />
+       <printer translate="name" name="Citizen CX-W" driver="citizen-cx-w" manufacturer="Citizen" model="6001" />
+       <printer translate="name" name="Citizen CY" driver="citizen-cy" manufacturer="Citizen" model="6002" />
+       <printer translate="name" name="Citizen CY-02" driver="citizen-cy-02" manufacturer="Citizen" model="6002" />
+@@ -127,7 +127,7 @@
+       <printer translate="name" name="Kodak 1400" deviceid="MFG:Eastman Kodak Company;CMD:EK1;MDL: 1400 Printer;CLS:Printer;DES:Kodak 1400 Printer;`" driver="kodak-1400" manufacturer="Kodak" model="4004" />
+       <printer translate="name" name="Kodak 6800" deviceid="MFG:Eastman Kodak Company;CMD:ESC;MDL:Photo Printer 6800;CLS:PRINTER;DES:KODAK Photo Printer 6800;" driver="kodak-6800" manufacturer="Kodak" model="4001" />
+       <printer translate="name" name="Kodak 6850" deviceid="MFG:Eastman Kodak Company;CMD:ESC;MDL:Photo Printer 6850;CLS:PRINTER;DES:KODAK Photo Printer 6850;" driver="kodak-6850" manufacturer="Kodak" model="4002" />
+-      <printer translate="name" name="Kodak 6900" deviceid="MFG:Kodak Alaris Inc.;CMD:SUPCC;MDL:KODAK 6900 Photo Printer;CLS:PRINTER;DES Thermal Dye Photo Printer;"driver="kodak-6900" manufacturer="Kodak" model="4010">EXPERIMENTAL</printer>
++      <printer translate="name" name="Kodak 6900" deviceid="MFG:Kodak Alaris Inc.;CMD:SUPCC;MDL:KODAK 6900 Photo Printer;CLS:PRINTER;DES Thermal Dye Photo Printer;" driver="kodak-6900" manufacturer="Kodak" model="4010">EXPERIMENTAL</printer>
+       <printer translate="name" name="Kodak 7000" deviceid="MFG:Eastman Kodak Company;CMD:SUPCC;MDL:KODAK 7000 Photo Printer;CLS:PRINTER;DES:Thermal Dye Photo Printer;" driver="kodak-7000" manufacturer="Kodak" model="4008" />
+       <printer translate="name" name="Kodak 7010" deviceid="MFG:Eastman Kodak Company;CMD:SUPCC;MDL:KODAK 7010 Photo Printer;CLS:PRINTER;DES:Thermal Dye Photo Printer;" driver="kodak-7010" manufacturer="Kodak" model="4008">EXPERIMENTAL</printer>
+       <printer translate="name" name="Kodak 7015" driver="kodak-7015" manufacturer="Kodak" model="4009">EXPERIMENTAL</printer>
diff --git a/gutenprint.spec b/gutenprint.spec
index cf27d4b..91445dd 100644
--- a/gutenprint.spec
+++ b/gutenprint.spec
@@ -4,7 +4,7 @@
 Name:           gutenprint
 Summary:        Printer Drivers Package
 Version:        5.3.4
-Release:        3%{?dist}
+Release:        4%{?dist}
 URL:            http://gimp-print.sourceforge.net/
 Source0:        http://downloads.sourceforge.net/gimp-print/%{name}-%{version}.tar.xz
 # Post-install script to update CUPS native PPDs.
@@ -15,6 +15,7 @@ Patch3:         gutenprint-postscriptdriver.patch
 Patch4:         gutenprint-yyin.patch
 Patch5:         gutenprint-manpage.patch
 Patch6:         gutenprint-python36syntax.patch
+Patch7:         gutenprint-xmlfixes.patch
 License:        GPLv2+
 
 #### removed patches, because the seems useless
@@ -136,6 +137,8 @@ sed -i -e 's,^#!/usr/bin/python3,#!%{__python3},' src/cups/cups-genppdupdate.in
 
 # Python 3.6 invalid escape sequence deprecation fixes, COPYING as license (bug #1448303)
 %patch6 -p1 -b .python36syntax
+# fix xml error reported by rpminspect, sent upstream via email
+%patch7 -p1 -b .xmlfixes
 
 %build
 # Don't run the weave test as it takes a very long time.
@@ -255,6 +258,9 @@ exit 0
 %{_mandir}/man8/cups-genppd*8*.gz
 
 %changelog
+* Wed Aug 11 2021 Zdenek Dohnal <zdohnal@redhat.com> - 5.3.4-4
+- fix xml errors reported by rpminspect
+
 * Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 5.3.4-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild