Merge branch 'f14'

This commit is contained in:
Jiri Popelka 2010-10-22 11:33:01 +02:00
commit 42871f4584
2 changed files with 33 additions and 1 deletions

View File

@ -0,0 +1,25 @@
diff -up system-config-printer-1.2.5/system-config-printer.py.NPTLpdQueue system-config-printer-1.2.5/system-config-printer.py
--- system-config-printer-1.2.5/system-config-printer.py.NPTLpdQueue 2010-10-22 11:18:13.000000000 +0200
+++ system-config-printer-1.2.5/system-config-printer.py 2010-10-22 11:18:13.000000000 +0200
@@ -6083,6 +6083,9 @@ class NewPrinterGUI(GtkGUI):
self.btnNPTLpdProbe.set_sensitive (len (hostname) > 0)
self.setNPButtons()
+ def on_cmbentNPTLpdQueue_changed(self, cmbent):
+ self.setNPButtons()
+
def on_btnNPTLpdProbe_clicked(self, button):
# read hostname, probe, fill printer names
hostname = self.cmbentNPTLpdHost.get_active_text()
diff -up system-config-printer-1.2.5/ui/NewPrinterWindow.glade.NPTLpdQueue system-config-printer-1.2.5/ui/NewPrinterWindow.glade
--- system-config-printer-1.2.5/ui/NewPrinterWindow.glade.NPTLpdQueue 2010-10-12 18:03:22.000000000 +0200
+++ system-config-printer-1.2.5/ui/NewPrinterWindow.glade 2010-10-22 11:19:51.000000000 +0200
@@ -752,7 +752,7 @@ ipp://printer.mydomain/ipp</property>
<accessibility>
<relation type="labelled-by" target="label201"/>
</accessibility>
- <signal name="changed" handler="on_entNPTDevice_changed"/>
+ <signal name="changed" handler=on_cmbentNPTLpdQueue_changed""/>
</object>
<packing>
<property name="left_attach">1</property>

View File

@ -7,7 +7,7 @@
Summary: A printer administration tool Summary: A printer administration tool
Name: system-config-printer Name: system-config-printer
Version: 1.2.5 Version: 1.2.5
Release: 3%{?dist} Release: 4%{?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,6 +18,7 @@ Source1: http://cyberelk.net/tim/data/pycups/pycups-%{pycups_version}.tar.bz2
Source2: http://pypi.python.org/packages/source/p/pysmbc/pysmbc-%{pysmbc_version}.tar.bz2 Source2: http://pypi.python.org/packages/source/p/pysmbc/pysmbc-%{pysmbc_version}.tar.bz2
Patch1: system-config-printer-InstallPrinterDrivers-debug.patch Patch1: system-config-printer-InstallPrinterDrivers-debug.patch
Patch2: system-config-printer-mfg-mdl.patch Patch2: system-config-printer-mfg-mdl.patch
Patch3: system-config-printer-NPTLpdQueue.patch
Patch101: pysmbc-doczip.patch Patch101: pysmbc-doczip.patch
BuildRequires: cups-devel >= 1.2 BuildRequires: cups-devel >= 1.2
BuildRequires: python-devel >= 2.4 BuildRequires: python-devel >= 2.4
@ -84,6 +85,9 @@ printers.
# (bug #643073). # (bug #643073).
%patch2 -p1 -b .mfg-mdl %patch2 -p1 -b .mfg-mdl
# Don't check ComboBoxEntry for allowed characters (bug #644131).
%patch3 -p1 -b .NPTLpdQueue
pushd pysmbc-%{pysmbc_version} pushd pysmbc-%{pysmbc_version}
%patch101 -p1 -b .doczip %patch101 -p1 -b .doczip
popd popd
@ -207,6 +211,9 @@ rm -rf %buildroot
exit 0 exit 0
%changelog %changelog
* Fri Oct 22 2010 Jiri Popelka <jpopelka@redhat.com> 1.2.5-4
- Don't check ComboBoxEntry for allowed characters (bug #644131).
* Thu Oct 14 2010 Tim Waugh <twaugh@redhat.com> - 1.2.5-3 * Thu Oct 14 2010 Tim Waugh <twaugh@redhat.com> - 1.2.5-3
- Always use MFG and MDL fields for InstallPrinterDrivers interface - Always use MFG and MDL fields for InstallPrinterDrivers interface
(bug #643073). (bug #643073).