Also: applied patch to fix serversettings traceback, from upstream post-1.3.5 (bug #726682).

This commit is contained in:
Tim Waugh 2011-07-29 15:58:35 +01:00
parent a935439d45
commit c35d893882
2 changed files with 17 additions and 0 deletions

View File

@ -0,0 +1,11 @@
diff -up system-config-printer-1.3.5/serversettings.py.bug726682 system-config-printer-1.3.5/serversettings.py
--- system-config-printer-1.3.5/serversettings.py.bug726682 2011-07-28 17:04:13.000000000 +0100
+++ system-config-printer-1.3.5/serversettings.py 2011-07-29 15:57:01.515904062 +0100
@@ -23,6 +23,7 @@
import config
from gettext import gettext as _
import cups
+import dbus
import gobject
import gtk
import os

View File

@ -11,6 +11,7 @@ URL: http://cyberelk.net/tim/software/system-config-printer/
Group: System Environment/Base Group: System Environment/Base
Source0: http://cyberelk.net/tim/data/system-config-printer/1.3/%{name}-%{version}.tar.xz Source0: http://cyberelk.net/tim/data/system-config-printer/1.3/%{name}-%{version}.tar.xz
Patch1: system-config-printer-no-applet-in-gnome.patch Patch1: system-config-printer-no-applet-in-gnome.patch
Patch2: system-config-printer-bug726682.patch
BuildRequires: cups-devel >= 1.2 BuildRequires: cups-devel >= 1.2
BuildRequires: desktop-file-utils >= 0.2.92 BuildRequires: desktop-file-utils >= 0.2.92
BuildRequires: gettext-devel BuildRequires: gettext-devel
@ -75,6 +76,9 @@ printers.
# Don't start the applet in GNOME. # Don't start the applet in GNOME.
%patch1 -p1 -b .no-applet-in-gnome %patch1 -p1 -b .no-applet-in-gnome
# Import dbus in serversettings module (bug #726682).
%patch2 -p1 -b .bug726682
%build %build
%configure --with-udev-rules %configure --with-udev-rules
@ -215,6 +219,8 @@ fi
- Use "hostname" instead of "IP address" when asking for names of - Use "hostname" instead of "IP address" when asking for names of
browse servers (bug #726134). browse servers (bug #726134).
- Updated translations. - Updated translations.
- Also: applied patch to fix serversettings traceback, from upstream
post-1.3.5 (bug #726682).
* Thu Jul 21 2011 Tim Waugh <twaugh@redhat.com> 1.3.4-2 * Thu Jul 21 2011 Tim Waugh <twaugh@redhat.com> 1.3.4-2
- No longer requires glade (uses GtkBuilder instead). - No longer requires glade (uses GtkBuilder instead).