- Updated to 1.2.3:
- Use toolbar instead of menubar in JobsViewer (trac #205). - Fixed HTTPError status code handling when changing server settings. - Fixed traceback with driver auto-selection (bug #590193). - Only local filenames can be selected for troubleshoot.txt (bug #590529). - Fixed cups-pk-helper FileGet usage (bug #587744). - Escape printer names in error dialog markup (Ubuntu #567324). - Avoid traceback changing PPD for queue with bad PPD. - Attempt to translate backend device-info strings (Ubuntu #557199). - Don't buffer debugging output. - Avoid leaking Connection objects when cancelling jobs. - Threading fixes (trac #206). - Canon naming fixes from vendor. - Make deep copy of list of job ids to cancel (bug #598249). - Bluetooth auto-config support. - Restored keybindings/tooltips lost in switch to action groups (trac #208). - Spinner icon has to have more than one frame (bug #603034). - Add job to active_jobs only if we're interested in it (bug #604492). - Make sure automatically-created queues will work; delete queue if missing executables. - Don't add queues for Graphtec devices (bug #547171). - Avoid KeyError in AdvancedServerSettings.py (bug #606798). - Handle empty notify-subscribed-event subscription attributes (bug #606909).
This commit is contained in:
parent
5988f6f53c
commit
b1e623bd44
@ -220,3 +220,4 @@ system-config-printer-1.2.1.tar.xz
|
|||||||
system-config-printer-1.2.2.tar.xz
|
system-config-printer-1.2.2.tar.xz
|
||||||
pysmbc-1.0.7.tar.bz2
|
pysmbc-1.0.7.tar.bz2
|
||||||
pycups-1.9.50.tar.bz2
|
pycups-1.9.50.tar.bz2
|
||||||
|
system-config-printer-1.2.3.tar.xz
|
||||||
|
2
sources
2
sources
@ -1,3 +1,3 @@
|
|||||||
b14021236af2d935641c27d214d4923a system-config-printer-1.2.2.tar.xz
|
|
||||||
89e6fd9129f1700eec16156bdbf60dda pysmbc-1.0.7.tar.bz2
|
89e6fd9129f1700eec16156bdbf60dda pysmbc-1.0.7.tar.bz2
|
||||||
cae67ab1207f5ffa93edc9b5867738bb pycups-1.9.50.tar.bz2
|
cae67ab1207f5ffa93edc9b5867738bb pycups-1.9.50.tar.bz2
|
||||||
|
e9ab97e4b0fdff5a75e1a5874808c2c1 system-config-printer-1.2.3.tar.xz
|
||||||
|
Binary file not shown.
BIN
system-config-printer-1.2.3.tar.xz.sig
Normal file
BIN
system-config-printer-1.2.3.tar.xz.sig
Normal file
Binary file not shown.
@ -1,23 +0,0 @@
|
|||||||
diff -up system-config-printer-1.2.2/system-config-printer.py.auto_make system-config-printer-1.2.2/system-config-printer.py
|
|
||||||
--- system-config-printer-1.2.2/system-config-printer.py.auto_make 2010-05-07 16:19:03.000000000 +0200
|
|
||||||
+++ system-config-printer-1.2.2/system-config-printer.py 2010-06-02 18:15:16.000000000 +0200
|
|
||||||
@@ -4111,8 +4111,8 @@ class NewPrinterGUI(GtkGUI):
|
|
||||||
self.on_rbtnNPFoomatic_toggled(self.rbtnNPFoomatic)
|
|
||||||
self.rbtnChangePPDKeepSettings.set_active(True)
|
|
||||||
|
|
||||||
- self.auto_make = None
|
|
||||||
- self.auto_model = None
|
|
||||||
+ self.auto_make = ""
|
|
||||||
+ self.auto_model = ""
|
|
||||||
self.auto_driver = None
|
|
||||||
ppd = self.mainapp.ppd
|
|
||||||
#self.mainapp.devid = "MFG:Samsung;MDL:ML-3560;DES:;CMD:GDI;"
|
|
||||||
@@ -4319,7 +4319,7 @@ class NewPrinterGUI(GtkGUI):
|
|
||||||
self.dialog_mode == "printer_with_uri":
|
|
||||||
self.busy (self.NewPrinterWindow)
|
|
||||||
if page_nr == 1: # Device (first page)
|
|
||||||
- self.auto_make, self.auto_model = None, None
|
|
||||||
+ self.auto_make, self.auto_model = "", ""
|
|
||||||
self.auto_driver = None
|
|
||||||
self.device.uri = self.getDeviceURI()
|
|
||||||
|
|
@ -1,29 +0,0 @@
|
|||||||
diff -up system-config-printer-1.2.2/asyncpk1.py.cupspk-fileget-tmp system-config-printer-1.2.2/asyncpk1.py
|
|
||||||
--- system-config-printer-1.2.2/asyncpk1.py.cupspk-fileget-tmp 2010-05-07 15:19:03.000000000 +0100
|
|
||||||
+++ system-config-printer-1.2.2/asyncpk1.py 2010-05-13 13:00:57.759093485 +0100
|
|
||||||
@@ -153,7 +153,10 @@ class _WriteToTmpFile:
|
|
||||||
def __init__ (self, kwds, reply_handler, error_handler):
|
|
||||||
self._reply_handler = reply_handler
|
|
||||||
self._error_handler = error_handler
|
|
||||||
- (tmpfd, tmpfname) = tempfile.mkstemp ()
|
|
||||||
+
|
|
||||||
+ # Create the temporary file in /tmp to ensure that
|
|
||||||
+ # cups-pk-helper-mechanism is able to write to it.
|
|
||||||
+ (tmpfd, tmpfname) = tempfile.mkstemp (dir="/tmp")
|
|
||||||
os.close (tmpfd)
|
|
||||||
self._filename = tmpfname
|
|
||||||
debugprint ("Created tempfile %s" % tmpfname)
|
|
||||||
diff -up system-config-printer-1.2.2/cupspk.py.cupspk-fileget-tmp system-config-printer-1.2.2/cupspk.py
|
|
||||||
--- system-config-printer-1.2.2/cupspk.py.cupspk-fileget-tmp 2010-04-15 00:11:33.000000000 +0100
|
|
||||||
+++ system-config-printer-1.2.2/cupspk.py 2010-05-13 13:00:57.760093336 +0100
|
|
||||||
@@ -385,7 +385,9 @@ class Connection:
|
|
||||||
filename = None
|
|
||||||
|
|
||||||
if (not use_pycups) and (fd != None or file_object != None):
|
|
||||||
- (tmpfd, tmpfname) = tempfile.mkstemp()
|
|
||||||
+ # Create the temporary file in /tmp to ensure that
|
|
||||||
+ # cups-pk-helper-mechanism is able to write to it.
|
|
||||||
+ (tmpfd, tmpfname) = tempfile.mkstemp(dir="/tmp")
|
|
||||||
os.close (tmpfd)
|
|
||||||
|
|
||||||
pk_args = (resource, tmpfname)
|
|
@ -6,8 +6,8 @@
|
|||||||
|
|
||||||
Summary: A printer administration tool
|
Summary: A printer administration tool
|
||||||
Name: system-config-printer
|
Name: system-config-printer
|
||||||
Version: 1.2.2
|
Version: 1.2.3
|
||||||
Release: 4%{?dist}
|
Release: 1%{?dist}
|
||||||
License: GPLv2+
|
License: GPLv2+
|
||||||
URL: http://cyberelk.net/tim/software/system-config-printer/
|
URL: http://cyberelk.net/tim/software/system-config-printer/
|
||||||
Group: System Environment/Base
|
Group: System Environment/Base
|
||||||
@ -18,8 +18,6 @@ Source1: http://cyberelk.net/tim/data/pycups/pycups-%{pycups_version}.tar.bz2
|
|||||||
Source2: http://cyberelk.net/tim/data/pysmbc/pysmbc-%{pysmbc_version}.tar.bz2
|
Source2: http://cyberelk.net/tim/data/pysmbc/pysmbc-%{pysmbc_version}.tar.bz2
|
||||||
|
|
||||||
Patch1: system-config-printer-no-epydoc.patch
|
Patch1: system-config-printer-no-epydoc.patch
|
||||||
Patch2: system-config-printer-cupspk-fileget-tmp.patch
|
|
||||||
Patch3: system-config-printer-auto_make.patch
|
|
||||||
|
|
||||||
BuildRequires: cups-devel >= 1.2
|
BuildRequires: cups-devel >= 1.2
|
||||||
BuildRequires: python-devel >= 2.4
|
BuildRequires: python-devel >= 2.4
|
||||||
@ -27,7 +25,7 @@ BuildRequires: libsmbclient-devel >= 3.2
|
|||||||
BuildRequires: desktop-file-utils >= 0.2.92
|
BuildRequires: desktop-file-utils >= 0.2.92
|
||||||
BuildRequires: gettext-devel
|
BuildRequires: gettext-devel
|
||||||
BuildRequires: intltool
|
BuildRequires: intltool
|
||||||
BuildRequires: libusb-devel, libudev-devel
|
BuildRequires: libusb-devel, libudev-devel, glib2-devel
|
||||||
BuildRequires: xmlto
|
BuildRequires: xmlto
|
||||||
|
|
||||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||||
@ -81,13 +79,6 @@ printers.
|
|||||||
# Don't require epydoc.
|
# Don't require epydoc.
|
||||||
%patch1 -p1 -b .no-epydoc
|
%patch1 -p1 -b .no-epydoc
|
||||||
|
|
||||||
# cups-pk-helper FileGet method requires directory it can write to
|
|
||||||
# (bug #587744).
|
|
||||||
%patch2 -p1 -b .cupspk-fileget-tmp
|
|
||||||
|
|
||||||
#Initialise auto_make to the empty string (bug #590193).
|
|
||||||
%patch3 -p1 -b .auto_make
|
|
||||||
|
|
||||||
%build
|
%build
|
||||||
%configure --with-udev-rules
|
%configure --with-udev-rules
|
||||||
|
|
||||||
@ -103,7 +94,9 @@ popd
|
|||||||
|
|
||||||
%install
|
%install
|
||||||
rm -rf %buildroot
|
rm -rf %buildroot
|
||||||
make DESTDIR=%buildroot install
|
make DESTDIR=%buildroot install \
|
||||||
|
udevrulesdir=/lib/udev/rules.d \
|
||||||
|
udevhelperdir=/lib/udev
|
||||||
|
|
||||||
pushd pycups-%{pycups_version}
|
pushd pycups-%{pycups_version}
|
||||||
make DESTDIR=%buildroot install
|
make DESTDIR=%buildroot install
|
||||||
@ -204,6 +197,36 @@ rm -rf %buildroot
|
|||||||
exit 0
|
exit 0
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Thu Jun 24 2010 Tim Waugh <twaugh@redhat.com> - 1.2.3-1
|
||||||
|
- Updated to 1.2.3:
|
||||||
|
- Use toolbar instead of menubar in JobsViewer (trac #205).
|
||||||
|
- Fixed HTTPError status code handling when changing server
|
||||||
|
settings.
|
||||||
|
- Fixed traceback with driver auto-selection (bug #590193).
|
||||||
|
- Only local filenames can be selected for troubleshoot.txt
|
||||||
|
(bug #590529).
|
||||||
|
- Fixed cups-pk-helper FileGet usage (bug #587744).
|
||||||
|
- Escape printer names in error dialog markup (Ubuntu #567324).
|
||||||
|
- Avoid traceback changing PPD for queue with bad PPD.
|
||||||
|
- Attempt to translate backend device-info strings (Ubuntu #557199).
|
||||||
|
- Don't buffer debugging output.
|
||||||
|
- Avoid leaking Connection objects when cancelling jobs.
|
||||||
|
- Threading fixes (trac #206).
|
||||||
|
- Canon naming fixes from vendor.
|
||||||
|
- Make deep copy of list of job ids to cancel (bug #598249).
|
||||||
|
- Bluetooth auto-config support.
|
||||||
|
- Restored keybindings/tooltips lost in switch to action groups
|
||||||
|
(trac #208).
|
||||||
|
- Spinner icon has to have more than one frame (bug #603034).
|
||||||
|
- Add job to active_jobs only if we're interested in it
|
||||||
|
(bug #604492).
|
||||||
|
- Make sure automatically-created queues will work; delete queue if
|
||||||
|
missing executables.
|
||||||
|
- Don't add queues for Graphtec devices (bug #547171).
|
||||||
|
- Avoid KeyError in AdvancedServerSettings.py (bug #606798).
|
||||||
|
- Handle empty notify-subscribed-event subscription attributes
|
||||||
|
(bug #606909).
|
||||||
|
|
||||||
* Wed Jun 02 2010 Jiri Popelka <jpopelka@redhat.com> 1.2.2-4
|
* Wed Jun 02 2010 Jiri Popelka <jpopelka@redhat.com> 1.2.2-4
|
||||||
- Initialise auto_make to the empty string (bug #590193).
|
- Initialise auto_make to the empty string (bug #590193).
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user