diff options
Diffstat (limited to 'print/system-config-printer/files')
7 files changed, 9 insertions, 98 deletions
diff --git a/print/system-config-printer/files/patch-applet.py b/print/system-config-printer/files/patch-applet.py index d21bb2a2ec76..68a4af8a9690 100644 --- a/print/system-config-printer/files/patch-applet.py +++ b/print/system-config-printer/files/patch-applet.py @@ -1,20 +1,11 @@ ---- applet.py.orig 2009-12-22 09:44:19.000000000 -0500 -+++ applet.py 2009-12-29 00:06:27.000000000 -0500 +--- applet.py.orig 2013-07-22 15:58:32.000000000 +0200 ++++ applet.py 2013-08-29 11:06:43.000000000 +0200 @@ -43,7 +43,7 @@ - os.environ['LC_ALL'] = 'C' - locale.setlocale (locale.LC_ALL, "") + + from gi.repository import Notify -APPDIR="/usr/share/system-config-printer" +APPDIR="%%PREFIX%%/share/system-config-printer" - DOMAIN="system-config-printer" ICON="printer" - SEARCHING_ICON="document-print-preview" -@@ -234,7 +234,7 @@ - pid = os.fork () - if pid == 0: - # Child. -- cmd = "/usr/bin/system-config-printer" -+ cmd = "%%PREFIX%%/bin/system-config-printer" - argv.insert (0, cmd) - os.execvp (cmd, argv) - sys.exit (1) + + # We need to call Notify.init before we can check the server for caps diff --git a/print/system-config-printer/files/patch-cupshelpers_cupshelpers.py b/print/system-config-printer/files/patch-cupshelpers_cupshelpers.py index 079c395adf40..8bc0cc75f23f 100644 --- a/print/system-config-printer/files/patch-cupshelpers_cupshelpers.py +++ b/print/system-config-printer/files/patch-cupshelpers_cupshelpers.py @@ -1,6 +1,6 @@ ---- cupshelpers/cupshelpers.py.orig 2009-12-22 09:44:19.000000000 -0500 -+++ cupshelpers/cupshelpers.py 2009-12-29 00:08:26.000000000 -0500 -@@ -663,7 +663,7 @@ +--- cupshelpers/cupshelpers.py.orig 2013-07-22 15:58:32.000000000 +0200 ++++ cupshelpers/cupshelpers.py 2013-08-29 11:18:44.000000000 +0200 +@@ -739,7 +739,7 @@ # First, a local function. How to check that something exists # in a path: @@ -9,12 +9,3 @@ if name == "-": # A filter of "-" means that no filter is required, # i.e. the device accepts the given format as-is. -@@ -765,7 +765,7 @@ - continue - - exepath = pathcheck (exe, -- "/usr/lib/cups/filter:" -+ "%%LOCALBASE%%/libexec/cups/filter:" - "/usr/lib64/cups/filter") - - if exe and not exepath: diff --git a/print/system-config-printer/files/patch-my-default-printer b/print/system-config-printer/files/patch-my-default-printer deleted file mode 100644 index d5678c0a9420..000000000000 --- a/print/system-config-printer/files/patch-my-default-printer +++ /dev/null @@ -1,6 +0,0 @@ ---- my-default-printer.orig 2008-03-20 11:53:08.000000000 -0400 -+++ my-default-printer 2008-03-20 11:53:17.000000000 -0400 -@@ -1,2 +1,2 @@ - #!/bin/sh --exec /usr/share/system-config-printer/my-default-printer.py "$@" -+exec %%PREFIX%%/share/system-config-printer/my-default-printer.py "$@" diff --git a/print/system-config-printer/files/patch-newprinternotification.conf b/print/system-config-printer/files/patch-newprinternotification.conf deleted file mode 100644 index d447338e3b84..000000000000 --- a/print/system-config-printer/files/patch-newprinternotification.conf +++ /dev/null @@ -1,10 +0,0 @@ ---- newprinternotification.conf.orig 2012-01-27 15:12:33.000000000 +0400 -+++ newprinternotification.conf 2012-01-27 15:12:53.000000000 +0400 -@@ -2,7 +2,7 @@ - "-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN" - "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd"> - <busconfig> -- <policy at_console="true"> -+ <policy group="operator"> - <allow own="com.redhat.NewPrinterNotification"/> - </policy> diff --git a/print/system-config-printer/files/patch-system-config-printer b/print/system-config-printer/files/patch-system-config-printer deleted file mode 100644 index 17f1bf5fbb6d..000000000000 --- a/print/system-config-printer/files/patch-system-config-printer +++ /dev/null @@ -1,6 +0,0 @@ ---- system-config-printer.orig 2008-03-20 11:56:46.000000000 -0400 -+++ system-config-printer 2008-03-20 11:56:58.000000000 -0400 -@@ -1,2 +1,2 @@ - #!/bin/sh --exec /usr/share/system-config-printer/system-config-printer.py "$@" -+exec %%PREFIX%%/share/system-config-printer/system-config-printer.py "$@" diff --git a/print/system-config-printer/files/patch-system-config-printer-applet b/print/system-config-printer/files/patch-system-config-printer-applet deleted file mode 100644 index b9d8e3125f87..000000000000 --- a/print/system-config-printer/files/patch-system-config-printer-applet +++ /dev/null @@ -1,6 +0,0 @@ ---- system-config-printer-applet.orig 2008-03-20 11:57:22.000000000 -0400 -+++ system-config-printer-applet 2008-03-20 11:57:32.000000000 -0400 -@@ -1,2 +1,2 @@ - #!/bin/sh --exec /usr/share/system-config-printer/applet.py "$@" -+exec %%PREFIX%%/share/system-config-printer/applet.py "$@" diff --git a/print/system-config-printer/files/patch-system-config-printer.py b/print/system-config-printer/files/patch-system-config-printer.py deleted file mode 100644 index c0129a32c5ae..000000000000 --- a/print/system-config-printer/files/patch-system-config-printer.py +++ /dev/null @@ -1,43 +0,0 @@ ---- system-config-printer.py.orig 2009-12-22 09:44:19.000000000 -0500 -+++ system-config-printer.py 2009-12-29 00:35:54.000000000 -0500 -@@ -4344,7 +4344,7 @@ - if may_be_ps: - debugprint ("Printer might support PostScript") - try: -- os.stat ("/usr/share/cups/model/foomatic-db-ppds") -+ os.stat ("%%LOCALBASE%%/share/cups/model/foomatic-db-ppds") - debugprint ("foomatic-db-ppds already installed") - except OSError: - debugprint ("foomatic-db-ppds not yet installed") -@@ -4892,11 +4892,11 @@ - # Problem executing command. - return True # assume plugin not required - else: -- if glob.glob("/usr/share/hplip/data/plugin/*%s*plugin*" % -+ if glob.glob("%%LOCALBASE%%share/hplip/data/plugin/*%s*plugin*" % - hplip_version): - if hplip_version.startswith("2"): - try: -- f = open('/etc/hp/hplip.conf', 'r') -+ f = open('%%LOCALBASE%%/etc/hp/hplip.conf', 'r') - for line in f: - if line.strip ().startswith("plugin") and \ - line.strip ().endswith("1"): -@@ -5082,7 +5082,7 @@ - # Try to get make and model via SNMP - if host: - os.environ["HOST"] = host -- cmd = '/usr/lib/cups/backend/snmp "${HOST}"' -+ cmd = '%%LOCALBASE%%/libexec/cups/backend/snmp "${HOST}"' - debugprint (host + ": " + cmd) - stdout = None - try: -@@ -6621,7 +6621,7 @@ - try: - # We want this to be in the current natural language, - # so we intentionally don't set LC_ALL=C here. -- p = subprocess.Popen (['/usr/bin/cupstestppd', -+ p = subprocess.Popen (['%%LOCALBASE%%/bin/cupstestppd', - '-rvv', filename], - stdin=file("/dev/null"), - stdout=subprocess.PIPE, |