Merge pull request #7166 from Rmys/master

gutenprint:rebuild package.py dizin uyumu
This commit is contained in:
Rmys
2019-10-23 21:30:36 +03:00
committed by GitHub
3 changed files with 49 additions and 2 deletions
+2 -2
View File
@@ -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")
@@ -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"/>
+8
View File
@@ -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>