From 965a54a88961c6a8f03683776db6e7e3fcfb9c1f Mon Sep 17 00:00:00 2001
From: Rmys <muscnsl@hotmail.com>
Date: Wed, 23 Oct 2019 21:28:41 +0300
Subject: [PATCH] gutenprint:rebuild package.py dizin uyumu

---
 hardware/printer/gutenprint/actions.py        |  4 +-
 .../files/gutenprint-5.2.14-default-a4.patch  | 39 +++++++++++++++++++
 hardware/printer/gutenprint/pspec.xml         |  8 ++++
 3 files changed, 49 insertions(+), 2 deletions(-)
 create mode 100644 hardware/printer/gutenprint/files/gutenprint-5.2.14-default-a4.patch

diff --git a/hardware/printer/gutenprint/actions.py b/hardware/printer/gutenprint/actions.py
index 6e24169d85..087e8b91fa 100644
--- a/hardware/printer/gutenprint/actions.py
+++ b/hardware/printer/gutenprint/actions.py
@@ -10,8 +10,8 @@ from pisi.actionsapi import pisitools
 from pisi.actionsapi import get
 
 def setup():
-    shelltools.system("sed -i 's:cups_sbindir=\"\/usr\/sbin\":cups_sbindir=\"\/usr\/bin\":g' m4/stp_cups.m4")
-    shelltools.system("sed -i  's:cups_sbindir=\"\${cups_prefix}\/sbin\":cups_sbindir=\"\${cups_prefix}\/bin\":' m4/stp_cups.m4")  
+    #shelltools.system("sed -i 's:cups_sbindir=\"\/usr\/sbin\":cups_sbindir=\"\/usr\/bin\":g' m4/stp_cups.m4")
+    #shelltools.system("sed -i  's:cups_sbindir=\"\${cups_prefix}\/sbin\":cups_sbindir=\"\${cups_prefix}\/bin\":' m4/stp_cups.m4")  
     shelltools.system("sed -i 's:m4local:m4extra:' Makefile.am")
 
     autotools.autoreconf("-fi")
diff --git a/hardware/printer/gutenprint/files/gutenprint-5.2.14-default-a4.patch b/hardware/printer/gutenprint/files/gutenprint-5.2.14-default-a4.patch
new file mode 100644
index 0000000000..3ad82d753f
--- /dev/null
+++ b/hardware/printer/gutenprint/files/gutenprint-5.2.14-default-a4.patch
@@ -0,0 +1,39 @@
+diff -Nru a/src/xml/papers.xml b/src/xml/papers.xml
+--- a/src/xml/papers.xml	2018-03-29 02:39:34.000000000 +0200
++++ b/src/xml/papers.xml	2018-04-15 18:06:50.346632470 +0200
+@@ -43,6 +43,17 @@
+  *   along with this program.  If not, see https://www.gnu.org/licenses/.
+ </copyright>
+   <paperdef>
++    <paper name="A4">
++      <description translate="value" value="A4"/>
++      <comment value="210mm x 297mm"/>
++      <width value="595"/>
++      <height value="842"/>
++      <unit value="metric"/>
++<!-- DISTRIBUTORS: Please do NOT insert margins here to work around -->
++<!-- problems with page margins that were present in 5.0.0.  That -->
++<!-- workaround is no longer needed.  Please see the explanation at the -->
++<!-- top of this file. -->
++    </paper>
+ <!-- GROUP: Imperial -->
+     <paper name="Letter">
+       <description translate="value" value="Letter"/>
+@@ -499,17 +510,6 @@
+       <height value="1191"/>
+       <unit value="metric"/>
+     </paper>
+-    <paper name="A4">
+-      <description translate="value" value="A4"/>
+-      <comment value="210mm x 297mm"/>
+-      <width value="595"/>
+-      <height value="842"/>
+-      <unit value="metric"/>
+-<!-- DISTRIBUTORS: Please do NOT insert margins here to work around -->
+-<!-- problems with page margins that were present in 5.0.0.  That -->
+-<!-- workaround is no longer needed.  Please see the explanation at the -->
+-<!-- top of this file. -->
+-    </paper>
+     <paper name="A5">
+       <description translate="value" value="A5"/>
+       <comment value="148mm x 210mm"/>
diff --git a/hardware/printer/gutenprint/pspec.xml b/hardware/printer/gutenprint/pspec.xml
index 3843243ce6..94849420da 100644
--- a/hardware/printer/gutenprint/pspec.xml
+++ b/hardware/printer/gutenprint/pspec.xml
@@ -37,6 +37,7 @@
             <Patch level="1">fedora/gutenprint-menu.patch</Patch>
             <Patch level="1">fedora/gutenprint-O6.patch</Patch>
             <Patch level="1">fedora/gutenprint-postscriptdriver.patch</Patch>
+            <Patch level="1">gutenprint-5.2.14-default-a4.patch</Patch>
         </Patches>
     </Source>
 
@@ -90,6 +91,13 @@
     </Package>
 
     <History>
+        <Update release="6">
+            <Date>2019-10-23</Date>
+            <Version>5.2.14</Version>
+            <Comment>Rebuild.</Comment>
+            <Name>Mustafa Cinasal</Name>
+            <Email>muscnsl@gmail.com</Email>
+        </Update>
         <Update release="5">
             <Date>2019-01-11</Date>
             <Version>5.2.14</Version>