Merge branch 'f13' into f14
This commit is contained in:
commit
5400f18737
1
.gitignore
vendored
1
.gitignore
vendored
@ -224,3 +224,4 @@ system-config-printer-1.2.3.tar.xz
|
||||
pycups-1.9.51.tar.bz2
|
||||
/pysmbc-1.0.9.tar.bz2
|
||||
/system-config-printer-1.2.4.tar.xz
|
||||
/system-config-printer-1.2.5.tar.xz
|
||||
|
2
sources
2
sources
@ -1,3 +1,3 @@
|
||||
21d31d7f7517850d6dee5608b322c5b8 system-config-printer-1.2.4.tar.xz
|
||||
7e9de64bce9496ce2d36ab513dd69dd5 pycups-1.9.51.tar.bz2
|
||||
32b995dbf8419128f652279881b9023d pysmbc-1.0.9.tar.bz2
|
||||
600a231216fb7bde061ef753db9a7e54 system-config-printer-1.2.5.tar.xz
|
||||
|
Binary file not shown.
BIN
system-config-printer-1.2.5.tar.xz.sig
Normal file
BIN
system-config-printer-1.2.5.tar.xz.sig
Normal file
Binary file not shown.
@ -1,21 +0,0 @@
|
||||
diff -up system-config-printer-1.2.4/cupshelpers/ppds.py.device-id-msg system-config-printer-1.2.4/cupshelpers/ppds.py
|
||||
--- system-config-printer-1.2.4/cupshelpers/ppds.py.device-id-msg 2010-07-30 15:35:01.000000000 +0100
|
||||
+++ system-config-printer-1.2.4/cupshelpers/ppds.py 2010-10-01 11:37:06.683999393 +0100
|
||||
@@ -555,6 +555,8 @@ class PPDs:
|
||||
@returns: an integer,string pair of (status,ppd-name)
|
||||
"""
|
||||
_debugprint ("\n%s %s" % (mfg, mdl))
|
||||
+ orig_mfg = mfg
|
||||
+ orig_mdl = mdl
|
||||
self._init_ids ()
|
||||
|
||||
# Start with an empty result list and build it up using
|
||||
@@ -710,7 +712,7 @@ class PPDs:
|
||||
cmd = reduce (lambda x, y: x + ","+ y, commandsets)
|
||||
except TypeError:
|
||||
cmd = ""
|
||||
- id = "MFG:%s;MDL:%s;" % (mfg, mdl)
|
||||
+ id = "MFG:%s;MDL:%s;" % (orig_mfg, orig_mdl)
|
||||
if cmd:
|
||||
id += "CMD:%s;" % cmd
|
||||
if description:
|
File diff suppressed because it is too large
Load Diff
@ -6,8 +6,8 @@
|
||||
|
||||
Summary: A printer administration tool
|
||||
Name: system-config-printer
|
||||
Version: 1.2.4
|
||||
Release: 3%{?dist}
|
||||
Version: 1.2.5
|
||||
Release: 1%{?dist}
|
||||
License: GPLv2+
|
||||
URL: http://cyberelk.net/tim/software/system-config-printer/
|
||||
Group: System Environment/Base
|
||||
@ -16,8 +16,6 @@ Source0: http://cyberelk.net/tim/data/system-config-printer/1.2/%{name}-%{versio
|
||||
Source1: http://cyberelk.net/tim/data/pycups/pycups-%{pycups_version}.tar.bz2
|
||||
# Python bindings for libsmbclient
|
||||
Source2: http://pypi.python.org/packages/source/p/pysmbc/pysmbc-%{pysmbc_version}.tar.bz2
|
||||
Patch1: system-config-printer-translations.patch
|
||||
Patch2: system-config-printer-device-id-msg.patch
|
||||
Patch101: pysmbc-doczip.patch
|
||||
BuildRequires: cups-devel >= 1.2
|
||||
BuildRequires: python-devel >= 2.4
|
||||
@ -77,12 +75,6 @@ printers.
|
||||
%prep
|
||||
%setup -q -a 1 -a 2
|
||||
|
||||
# Updated translations.
|
||||
%patch1 -p1 -b .translations
|
||||
|
||||
# Use actual device ID in debug output (bug #630350).
|
||||
%patch2 -p1 -b .device-id-msg
|
||||
|
||||
pushd pysmbc-%{pysmbc_version}
|
||||
%patch101 -p1 -b .doczip
|
||||
popd
|
||||
@ -206,6 +198,30 @@ rm -rf %buildroot
|
||||
exit 0
|
||||
|
||||
%changelog
|
||||
* Wed Oct 13 2010 Tim Waugh <twaugh@redhat.com> - 1.2.5-1
|
||||
- 1.2.5:
|
||||
- CMD-field matching for PPDs (bug #630058).
|
||||
- Avoid crash in jobviewer (bug #640904).
|
||||
- Don't try to modify firewall for SNMP broadcast responses
|
||||
as it doesn't work (trac #214).
|
||||
- Correctly parse snmp backend output when fetching
|
||||
Device ID (bug #639394).
|
||||
- XmlHelper: Don't indent output when saving to file (bug #639586).
|
||||
- GroupsPaneModel: Avoid crash when removing queue (bug #639586).
|
||||
- Use "Do It Later" instead of "Cancel" for adjust firewall
|
||||
dialog (trac #213).
|
||||
- Delete Bluetooth printer's queue when unpaired.
|
||||
- Show examples of IPP URIs (bug #575795).
|
||||
- Use actual Device ID strings in 'no match' debug
|
||||
message (bug #630350).
|
||||
- Prevent disallowed characters in text entry fields when adding
|
||||
new printer (bug #621199).
|
||||
- Fixed race condition while renaming printer (bug #625502).
|
||||
- Request required job attributes rather than assuming they will
|
||||
be present in response (bug #635719).
|
||||
- Discard disallowed characters when renaming (bug #612315).
|
||||
- Mark more translatable strings (bug #634436).
|
||||
|
||||
* Fri Oct 1 2010 Tim Waugh <twaugh@redhat.com> - 1.2.4-3
|
||||
- Use actual device ID in debug output (bug #630350).
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user