Merge pull request #4225 from ayhanyalcinsoy/master
system-config-printer fixed and python3-cups was added
This commit is contained in:
GitHub
@@ -7,13 +7,17 @@
|
||||
from pisi.actionsapi import get
|
||||
from pisi.actionsapi import autotools
|
||||
from pisi.actionsapi import pisitools
|
||||
from pisi.actionsapi import shelltools
|
||||
|
||||
def setup():
|
||||
# we are using different paths
|
||||
pisitools.dosed("cupshelpers/cupshelpers.py", "\/lib64\/", "\/lib\/")
|
||||
pisitools.dosed("troubleshoot/CheckUSBPermissions.py", "\/usr\/bin\/getfacl", "\/bin\/getfacl")
|
||||
|
||||
pisitools.dosed("Makefile.in", "xmlto man", "xmlto --skip-validation man")
|
||||
pisitools.dosed("Makefile.am", "xmlto man", "xmlto --skip-validation man")
|
||||
for i in ["README", "ChangeLog"]:
|
||||
shelltools.touch(i)
|
||||
autotools.autoreconf("-fi")
|
||||
autotools.configure("--with-udev-rules \
|
||||
--with-systemdsystemunitdir=no \
|
||||
--sysconfdir=/etc")
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
Index: system-config-printer-1.1.11/system-config-printer.py
|
||||
===================================================================
|
||||
--- system-config-printer-1.1.11.orig/system-config-printer.py
|
||||
+++ system-config-printer-1.1.11/system-config-printer.py
|
||||
+++ system-config-printer.py
|
||||
@@ -1428,7 +1428,7 @@ class GUI(GtkGUI, monitor.Watcher):
|
||||
def_emblem = None
|
||||
emblem = None
|
||||
|
||||
@@ -0,0 +1,11 @@
|
||||
--- system-config-printer-1.5.9/jobviewer.py 2017-01-09 12:38:09.000000000 +0100
|
||||
+++ system-config-printer-1.5.9/jobviewer.py.new 2017-01-27 08:14:00.163315284 +0100
|
||||
@@ -59,6 +59,8 @@
|
||||
USE_KEYRING=True
|
||||
except ImportError:
|
||||
USE_KEYRING=False
|
||||
+except ValueError:
|
||||
+ USE_KEYRING=False
|
||||
|
||||
import gettext
|
||||
gettext.install(domain=config.PACKAGE, localedir=config.localedir)
|
||||
@@ -9,14 +9,15 @@
|
||||
<Email>admins@pisilinux.org</Email>
|
||||
</Packager>
|
||||
<License>GPLv2</License>
|
||||
<IsA>app:console</IsA>
|
||||
<IsA>app:gui</IsA>
|
||||
<Summary>A printer administration tool</Summary>
|
||||
<Description>system-config-printer is a graphical user interface that allows the user to configure a CUPS print server.</Description>
|
||||
<Archive sha1sum="bd79f87de9576a13c2d099181fea01a63b9f19cc" type="tarxz">http://cyberelk.net/tim/data/system-config-printer/1.5/system-config-printer-1.5.7.tar.xz</Archive>
|
||||
<Archive sha1sum="d6233bfb6bec095cff4caf9516ed9c3fd358bdbd" type="targz">https://github.com/zdohnal/system-config-printer/archive/v1.5.9.tar.gz</Archive>
|
||||
<AdditionalFiles>
|
||||
<AdditionalFile target="po/tr.po">tr.po</AdditionalFile>
|
||||
</AdditionalFiles>
|
||||
<BuildDependencies>
|
||||
<Dependency>gtk3-devel</Dependency>
|
||||
<Dependency>util-linux</Dependency>
|
||||
<Dependency>xmlto</Dependency>
|
||||
<Dependency>libxslt-devel</Dependency>
|
||||
@@ -26,19 +27,15 @@
|
||||
<Dependency>eudev-devel</Dependency>
|
||||
<Dependency>glib2-devel</Dependency>
|
||||
<Dependency>libusb-devel</Dependency>
|
||||
<Dependency>libgnome-keyring-devel</Dependency>
|
||||
<Dependency>gettext-devel</Dependency>
|
||||
<Dependency>desktop-file-utils</Dependency>
|
||||
<Dependency>dbus-glib-devel</Dependency>
|
||||
</BuildDependencies>
|
||||
<Patches>
|
||||
<!-- <Patch level="1">40_scp-dbus-service-fix-dbus-signature-typo.patch</Patch> -->
|
||||
<!-- Replace emblem-default by dialog-ok -->
|
||||
<Patch level="1">fix-icon.patch</Patch>
|
||||
<!-- <Patch level="1">system-config-printer-device-sorting.patch</Patch> -->
|
||||
<Patch level="1">system-config-printer-shbang.patch</Patch>
|
||||
<!-- Improvements for check-device-ids from upstream -->
|
||||
<!--Patch level="1">system-config-printer-check-device-ids.patch</Patch-->
|
||||
<!-- Fixed traceback in newprinter.py -->
|
||||
<!--Patch level="1">system-config-printer-self.printers.patch</Patch-->
|
||||
<!--make it actually work without libgnome-keyring -->
|
||||
<Patch>pass_libgnome_keyring_missing.diff</Patch>
|
||||
</Patches>
|
||||
</Source>
|
||||
|
||||
@@ -49,10 +46,10 @@
|
||||
<Dependency>glib2</Dependency>
|
||||
<Dependency>libusb</Dependency>
|
||||
<Dependency>libgnome-keyring</Dependency>
|
||||
<Dependency>python-cups</Dependency>
|
||||
<Dependency>python3-cups</Dependency>
|
||||
<Dependency>python-smbc</Dependency>
|
||||
<Dependency>dbus-python</Dependency>
|
||||
<Dependency>python-pygobject3</Dependency>
|
||||
<Dependency>dbus-python3</Dependency>
|
||||
<Dependency>python3-pygobject3</Dependency>
|
||||
<Dependency>cups</Dependency>
|
||||
</RuntimeDependencies>
|
||||
<Files>
|
||||
@@ -98,6 +95,13 @@
|
||||
</Package>
|
||||
|
||||
<History>
|
||||
<Update release="5">
|
||||
<Date>2017-12-15</Date>
|
||||
<Version>1.5.9</Version>
|
||||
<Comment>Version bump</Comment>
|
||||
<Name>Ayhan Yalçınsoy</Name>
|
||||
<Email>ayhanyalcinsoy@pisilinux.org</Email>
|
||||
</Update>
|
||||
<Update release="4">
|
||||
<Date>2017-03-01</Date>
|
||||
<Version>1.5.7</Version>
|
||||
|
||||
+137742
-137522
File diff suppressed because it is too large
Load Diff
@@ -1 +1 @@
|
||||
37753cb527a2733a379dfbdfc9243964d50af247
|
||||
c45e235b8d44d26fadaafce23645f88bc9af9dec
|
||||
Binary file not shown.
@@ -1 +1 @@
|
||||
1e93827d5d3ec9cf58d2b5cf0bee394d314b3216
|
||||
539421822523f397cafd4cc14359dfc1ff993d2f
|
||||
@@ -0,0 +1,19 @@
|
||||
#!/usr/bin/python
|
||||
# -*- coding: utf-8 -*-
|
||||
#
|
||||
#
|
||||
# Licensed under the GNU General Public License, version 3.
|
||||
# See the file http://www.gnu.org/licenses/gpl.txt
|
||||
|
||||
from pisi.actionsapi import pisitools
|
||||
from pisi.actionsapi import autotools
|
||||
from pisi.actionsapi import get
|
||||
|
||||
def build():
|
||||
pisitools.dosed("Makefile", "python", "python3")
|
||||
autotools.make()
|
||||
|
||||
def install():
|
||||
autotools.rawInstall("DESTDIR=%s" % get.installDIR())
|
||||
|
||||
pisitools.dodoc("COPYING", "NEWS", "README", "TODO", "examples/cupstree.py")
|
||||
@@ -0,0 +1,42 @@
|
||||
<?xml version="1.0" ?>
|
||||
<!DOCTYPE PISI SYSTEM "http://www.pisilinux.org/projeler/pisi/pisi-spec.dtd">
|
||||
<PISI>
|
||||
<Source>
|
||||
<Name>python3-cups</Name>
|
||||
<Homepage>http://cyberelk.net/tim/software/pycups</Homepage>
|
||||
<Packager>
|
||||
<Name>PisiLinux Community</Name>
|
||||
<Email>admins@pisilinux.org</Email>
|
||||
</Packager>
|
||||
<License>GPLv2</License>
|
||||
<IsA>library</IsA>
|
||||
<Summary>Python3 interface to the CUPS API</Summary>
|
||||
<Description>python3-cups contains python3 bindings to wrap the CUPS API.</Description>
|
||||
<Archive sha1sum="561dc41a0025ad3467e7d151ee2ce84e5e564f9d" type="tarbz2">http://cyberelk.net/tim/data/pycups/pycups-1.9.73.tar.bz2</Archive>
|
||||
<BuildDependencies>
|
||||
<Dependency>cups-devel</Dependency>
|
||||
<Dependency>python3-devel</Dependency>
|
||||
</BuildDependencies>
|
||||
</Source>
|
||||
|
||||
<Package>
|
||||
<Name>python3-cups</Name>
|
||||
<RuntimeDependencies>
|
||||
<Dependency>cups</Dependency>
|
||||
</RuntimeDependencies>
|
||||
<Files>
|
||||
<Path fileType="library">/usr/lib</Path>
|
||||
<Path fileType="doc">/usr/share/doc</Path>
|
||||
</Files>
|
||||
</Package>
|
||||
|
||||
<History>
|
||||
<Update release="1">
|
||||
<Date>2017-01-25</Date>
|
||||
<Version>1.9.73</Version>
|
||||
<Comment>First Relase</Comment>
|
||||
<Name>Ayhan Yalçınsoy</Name>
|
||||
<Email>ayhanyalcinsoy@pisilinux.org</Email>
|
||||
</Update>
|
||||
</History>
|
||||
</PISI>
|
||||
@@ -0,0 +1,8 @@
|
||||
<?xml version="1.0" ?>
|
||||
<PISI>
|
||||
<Source>
|
||||
<Name>python3-cups</Name>
|
||||
<Summary xml:lang="tr">CUPS programlama arayüzü için Python3 desteği</Summary>
|
||||
<Description xml:lang="tr">python3-cups, CUPS programlama arayüzü için Python3 bağlayıcıları içeren bir pakettir.</Description>
|
||||
</Source>
|
||||
</PISI>
|
||||
Reference in New Issue
Block a user