Hello community, here is the log from the commit of package system-config-printer for openSUSE:Factory checked in at Thu Feb 26 01:09:08 CET 2009. -------- --- GNOME/system-config-printer/system-config-printer.changes 2009-02-12 23:19:08.000000000 +0100 +++ /mounts/work_src_done/STABLE/system-config-printer/system-config-printer.changes 2009-02-24 20:50:34.000000000 +0100 @@ -1,0 +2,74 @@ +Tue Feb 24 20:44:39 CET 2009 - vuntz@novell.com + +- Add system-config-printer-bnc456110-non-blocking-probe.patch: + make the probing code non-blocking for the UI. + Fix bnc#456110. + +------------------------------------------------------------------- +Mon Feb 23 05:06:41 CET 2009 - vuntz@novell.com + +- Add system-config-printer-firewall-menu.patch: fix string to + mention the correct path in menus to access the firewall tool. + Fix bnc#442106. +- Use gnome-patch-translation for the new string. + (Thanks to Stanislav Brabec for this) + +------------------------------------------------------------------- +Sun Feb 22 00:00:08 CET 2009 - vuntz@novell.com + +- Update to version 1.1.4 (this is not a complete list of changes + since upstream uses git, but some changes aren't listed in + ChangeLog): + + Don't display status icon for completed jobs + + Only add job to the active set if it is active; otherwise, + remove it from the set if it is there. + + If the emptiness of the active set has changed, update the + status icon. + + Handle D-Bus failures when connecting to the session bus + (Jockey) (rh#484402) + + Don't show wait window when adding a new printer, as that may + require an authentication dialog and we don't want them + competing for focus (rh#484960) + + Don't grab keyboard and pointer when displaying authentication + dialog. Instead let the window manager prevent keyboard input + accidentally going to the wrong window. + + Don't display a notification when authentication is required, + just go straight to the authentication dialog. Don't grab + keyboard and pointer for that dialog and instead let the window + manager prevent keyboard input accidentally going to the wrong + window. + + Otptions: Check constraints in reverse as well, so that + constraint checking is symmetrical. + + Don't allow PPD changes when there are conflicts + + Support for auto-detection of printers vis hal-cups-utils + without hal-cups-utils creating a queue, especially if there is + no driver specifically assigned to the detected printer. + + Skip selection of manufacturer, model, and driver in the + new-printer wizard if an exact driver match has been found. + + Added functionality to automatically recognize whether the + proprietary plug-in of HPLIP is useful or even required and to + ask the user whether he want to download and install it. + + Fixed "hp-info" calls: There should be no space between "-d" + and the "URI" to work around HPLIP option parsing bug. + + Return None if the "fax-type" is 0, this means that fax is not + available on the given printer. + + Fixed switch between the notification for the case that a queue + got created and the case that no queue got created. + + Perform lowercase operations in locale-independent manner. + + Merge cups-pk-helper branch. + + Updated translations. +- Split cups-pk-helper and pysmbc in their own packages. +- Remove BuildRequires because of the split: PolicyKit-devel, + cups-devel, dbus-1-glib-devel, epydoc, gtk2-devel, + libsmbclient-devel. +- Remove BuildRequires: gettext-devel. +- Add Requires on python-smbc. +- Add Recommends on cups-pk-helper. +- Drop system-config-printer-policykit.patch: accepted upstream! +- Drop system-config-printer-more-checks.patch: upstream improved + the PolicyKit support to not require this. +- Drop system-config-printer-python-prefix.patch: was needed only + for pysmbc. +- Do not call autoreconf anymore. + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- cups-pk-helper-0.0.3.tar.bz2 cups-pk-helper-bnc468389-dbus-send-dest.patch pysmbc-1.0.6.tar.bz2 system-config-printer-1.1.3.tar.bz2 system-config-printer-more-checks.patch system-config-printer-policykit.patch system-config-printer-python-prefix.patch New: ---- system-config-printer-1.1.4.tar.bz2 system-config-printer-bnc456110-non-blocking-probe.patch system-config-printer-firewall-menu.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ system-config-printer.spec ++++++ --- /var/tmp/diff_new_pack.j10987/_old 2009-02-26 01:08:59.000000000 +0100 +++ /var/tmp/diff_new_pack.j10987/_new 2009-02-26 01:08:59.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package system-config-printer (Version 1.1.3) +# spec file for package system-config-printer (Version 1.1.4) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -21,48 +21,32 @@ Name: system-config-printer License: GPL v2 or later Group: Hardware/Printing -Version: 1.1.3 +Version: 1.1.4 Release: 1 -%define pysmbc_version 1.0.6 -%define cups_pk_helper_version 0.0.3 Summary: A printer administration tool Url: http://cyberelk.net/tim/software/system-config-printer/ Source0: http://cyberelk.net/tim/data/system-config-printer/1.0.x/system-config-printer-%{version}.tar.bz2 -Source1: http://cyberelk.net/tim/data/pysmbc/pysmbc-%{pysmbc_version}.tar.bz2 -Source2: cups-pk-helper-%{cups_pk_helper_version}.tar.bz2 -Patch11: system-config-printer-python-prefix.patch # PATCH-FIX-OPENSUSE system-config-printer-icon-brp-friendly.patch vuntz@novell.com -- brp checks don't like the printer icon name, so we have to use something else Patch13: system-config-printer-icon-brp-friendly.patch -# PATCH-FIX-UPSTREAM system-config-printer-more-checks.patch vuntz@novell.com -- Add some more checks to not have exceptions here and there -Patch14: system-config-printer-more-checks.patch -# PATCH-FEATURE-OPENSUSE system-config-printer-policykit.patch vuntz@novell.com -- Make s-c-p PolicyKit-aware -Patch15: system-config-printer-policykit.patch # PATCH-FIX-OPENSUSE system-config-printer-cups-autoconfig-notifications.patch vuntz@novell.com -- Integration with cups-autoconfig. This will be removed after 11.1, since we'll move to hal-cups-utils. Patch16: system-config-printer-cups-autoconfig-notifications.patch # PATCH-FIX-OPENSUSE system-config-printer-hide-my-default-printer.patch vuntz@novell.com -- Hide my-default-printer in the menus Patch17: system-config-printer-hide-my-default-printer.patch -# PATCH-FIX-UPSTREAM cups-pk-helper-bnc468389-dbus-send-dest.patch bnc468389 vuntz@novell.com -- Fix the potential dbus security issue with send_interface -Patch20: cups-pk-helper-bnc468389-dbus-send-dest.patch +# PATCH-FIX-OPENSUSE system-config-printer-firewall-menu.patch vuntz@novell.com -- Fix string to mention correct path in menus to firewall tool +Patch18: system-config-printer-firewall-menu.patch +# PATCH-FIX-UPSTREAM system-config-printer-bnc456110-non-blocking-probe.patch bnc456110 vuntz@novell.com -- Make the probing code not block the UI +Patch19: system-config-printer-bnc456110-non-blocking-probe.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build Obsoletes: gnome-cups-manager <= 0.33 -# For cups-pk-helper: -BuildRequires: PolicyKit-devel -BuildRequires: cups-devel # For directory ownership BuildRequires: dbus-1 -# For cups-pk-helper: -BuildRequires: dbus-1-glib-devel BuildRequires: desktop-file-utils -BuildRequires: epydoc BuildRequires: fdupes -BuildRequires: gettext-devel BuildRequires: gnome-icon-theme -# For cups-pk-helper: -BuildRequires: gtk2-devel +BuildRequires: gnome-patch-translation # For directory ownership BuildRequires: hicolor-icon-theme BuildRequires: intltool -BuildRequires: libsmbclient-devel BuildRequires: python-devel BuildRequires: python-xml BuildRequires: update-desktop-files @@ -76,8 +60,10 @@ Requires: python-gobject2 Requires: python-gtk Requires: python-notify +Requires: python-smbc Requires: %{name}-lang = %{version} %py_requires +Recommends: cups-pk-helper %description system-config-printer is a graphical user interface that allows the @@ -92,25 +78,17 @@ %lang_package %prep -%setup -q -a 1 -a 2 -%patch11 -p1 +%setup -q +gnome-patch-translation-prepare %patch13 -p1 -%patch14 -p0 -%patch15 -p1 %patch16 -p1 %patch17 -p1 -%patch20 -p0 +%patch18 -p1 +%patch19 -p1 +gnome-patch-translation-update %build -autoreconf -f -i %configure -pushd pysmbc-%{pysmbc_version} -make -make doc -popd -pushd cups-pk-helper-%{cups_pk_helper_version} -%configure --libexecdir=%{_libdir}/cups-pk-helper -popd %install %makeinstall @@ -120,12 +98,6 @@ cp -a %{_datadir}/icons/gnome/$size/devices/printer.png $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/$size/apps/%{name}.png fi done -pushd pysmbc-%{pysmbc_version} -make DESTDIR=$RPM_BUILD_ROOT PREFIX=%{_prefix} install -popd -pushd cups-pk-helper-%{cups_pk_helper_version} -%makeinstall -popd %suse_update_desktop_file my-default-printer X-SuSE-PrintingUtility X-SuSE-ControlCenter-Hardware %suse_update_desktop_file print-applet %suse_update_desktop_file system-config-printer X-SuSE-PrintingUtility X-SuSE-ControlCenter-Hardware @@ -142,8 +114,7 @@ %config(noreplace) %{_sysconfdir}/dbus-1/system.d/newprinternotification.conf %exclude %{py_sitedir}/cupshelpers/*.pyc %{py_sitedir}/cupshelpers -%{py_sitedir}/*.so -%{py_sitedir}/*.egg-info +%{py_sitedir}/cupshelpers*.egg-info %{_bindir}/%{name} %{_bindir}/%{name}-applet %{_bindir}/my-default-printer @@ -152,15 +123,75 @@ %{_datadir}/icons/hicolor/*/apps/* %{_sysconfdir}/xdg/autostart/*.desktop %{_mandir}/man1/* -# From cups-pk-helper: -%{_sysconfdir}/dbus-1/system.d/org.opensuse.CupsPkHelper.Mechanism.conf -%{_libdir}/cups-pk-helper -%{_datadir}/dbus-1/system-services/org.opensuse.CupsPkHelper.Mechanism.service -%{_datadir}/PolicyKit/policy/org.opensuse.cupspkhelper.mechanism.policy %files lang -f %{name}.lang %changelog +* Tue Feb 24 2009 vuntz@novell.com +- Add system-config-printer-bnc456110-non-blocking-probe.patch: + make the probing code non-blocking for the UI. + Fix bnc#456110. +* Mon Feb 23 2009 vuntz@novell.com +- Add system-config-printer-firewall-menu.patch: fix string to + mention the correct path in menus to access the firewall tool. + Fix bnc#442106. +- Use gnome-patch-translation for the new string. + (Thanks to Stanislav Brabec for this) +* Sun Feb 22 2009 vuntz@novell.com +- Update to version 1.1.4 (this is not a complete list of changes + since upstream uses git, but some changes aren't listed in + ChangeLog): + + Don't display status icon for completed jobs + + Only add job to the active set if it is active; otherwise, + remove it from the set if it is there. + + If the emptiness of the active set has changed, update the + status icon. + + Handle D-Bus failures when connecting to the session bus + (Jockey) (rh#484402) + + Don't show wait window when adding a new printer, as that may + require an authentication dialog and we don't want them + competing for focus (rh#484960) + + Don't grab keyboard and pointer when displaying authentication + dialog. Instead let the window manager prevent keyboard input + accidentally going to the wrong window. + + Don't display a notification when authentication is required, + just go straight to the authentication dialog. Don't grab + keyboard and pointer for that dialog and instead let the window + manager prevent keyboard input accidentally going to the wrong + window. + + Otptions: Check constraints in reverse as well, so that + constraint checking is symmetrical. + + Don't allow PPD changes when there are conflicts + + Support for auto-detection of printers vis hal-cups-utils + without hal-cups-utils creating a queue, especially if there is + no driver specifically assigned to the detected printer. + + Skip selection of manufacturer, model, and driver in the + new-printer wizard if an exact driver match has been found. + + Added functionality to automatically recognize whether the + proprietary plug-in of HPLIP is useful or even required and to + ask the user whether he want to download and install it. + + Fixed "hp-info" calls: There should be no space between "-d" + and the "URI" to work around HPLIP option parsing bug. + + Return None if the "fax-type" is 0, this means that fax is not + available on the given printer. + + Fixed switch between the notification for the case that a queue + got created and the case that no queue got created. + + Perform lowercase operations in locale-independent manner. + + Merge cups-pk-helper branch. + + Updated translations. +- Split cups-pk-helper and pysmbc in their own packages. +- Remove BuildRequires because of the split: PolicyKit-devel, + cups-devel, dbus-1-glib-devel, epydoc, gtk2-devel, + libsmbclient-devel. +- Remove BuildRequires: gettext-devel. +- Add Requires on python-smbc. +- Add Recommends on cups-pk-helper. +- Drop system-config-printer-policykit.patch: accepted upstream! +- Drop system-config-printer-more-checks.patch: upstream improved + the PolicyKit support to not require this. +- Drop system-config-printer-python-prefix.patch: was needed only + for pysmbc. +- Do not call autoreconf anymore. * Thu Feb 05 2009 vuntz@novell.com - Drop system-config-printer-install-python.patch after discussion on opensuse-packaging. Update the file list accordingly. ++++++ system-config-printer-1.1.3.tar.bz2 -> system-config-printer-1.1.4.tar.bz2 ++++++ ++++ 114881 lines of diff (skipped) ++++++ system-config-printer-bnc456110-non-blocking-probe.patch ++++++ diff --git a/probe_printer.py b/probe_printer.py index fd9f5f7..3dfcb51 100644 --- a/probe_printer.py +++ b/probe_printer.py @@ -19,6 +19,7 @@ ## Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. import socket, time +import gtk class LpdServer: def __init__(self, hostname): @@ -43,6 +44,7 @@ class LpdServer: af, socktype, proto, canonname, sa = res try: s = socket.socket(af, socktype, proto) + s.settimeout(0.5) except socket.error, msg: s = None continue @@ -56,6 +58,9 @@ class LpdServer: return s def _probe_queue(self,name, result): + while gtk.events_pending (): + gtk.main_iteration () + s = self._open_socket() if not s: return False print name diff --git a/system-config-printer.py b/system-config-printer.py index 887f9d9..210078c 100755 --- a/system-config-printer.py +++ b/system-config-printer.py @@ -5734,7 +5734,12 @@ class NewPrinterGUI(GtkGUI): # read hostname, probe, fill printer names hostname = self.cmbentNPTLpdHost.get_active_text() server = probe_printer.LpdServer(hostname) + + self.WaitWindow.set_transient_for (self.NewPrinterWindow) + self.WaitWindow.show () printers = server.probe() + self.WaitWindow.hide () + model = self.cmbentNPTLpdQueue.get_model() model.clear() for printer in printers: ++++++ system-config-printer-firewall-menu.patch ++++++ Index: system-config-printer-1.1.4/system-config-printer.py =================================================================== --- system-config-printer-1.1.4.orig/system-config-printer.py +++ system-config-printer-1.1.4/system-config-printer.py @@ -123,7 +123,7 @@ busy_cursor = gtk.gdk.Cursor(gtk.gdk.WAT ready_cursor = gtk.gdk.Cursor(gtk.gdk.LEFT_PTR) TEXT_start_firewall_tool = _("To do this, select " - "System->Administration->Firewall " + "YaST->Firewall " "from the main menu.") try: ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org