Some Python3 fixes (bug #1136470), udev-configure-printer fixes, and a
fix for a D-Bus service hang (bug #1116756).

Resolves: rhbz#1136470 rhbz#1116756
This commit is contained in:
Tim Waugh 2014-09-02 17:36:56 +01:00
parent 33600dd4dd
commit 810c9a2df7
6 changed files with 9 additions and 16 deletions

1
.gitignore vendored
View File

@ -249,3 +249,4 @@ pycups-1.9.51.tar.bz2
/system-config-printer-1.4.4.tar.xz
/system-config-printer-1.4.5.tar.xz
/system-config-printer-1.5.0.tar.xz
/system-config-printer-1.5.1.tar.xz

View File

@ -1 +1 @@
264dd8edde7460cae411fe54bc22c9a6 system-config-printer-1.5.0.tar.xz
64057f7064d2e7383ccce593aa7db8d3 system-config-printer-1.5.1.tar.xz

Binary file not shown.

View File

@ -1,9 +0,0 @@
diff -up system-config-printer-1.5.0/udev/udev-add-printer.python3 system-config-printer-1.5.0/udev/udev-add-printer
--- system-config-printer-1.5.0/udev/udev-add-printer.python3 2014-02-18 14:43:34.000000000 +0000
+++ system-config-printer-1.5.0/udev/udev-add-printer 2014-08-03 15:02:02.407041071 +0100
@@ -1,4 +1,4 @@
-#!/usr/bin/python -s
+#!/usr/bin/python3 -s
## udev-add-printer

View File

@ -6,14 +6,13 @@
Summary: A printer administration tool
Name: system-config-printer
Version: 1.5.0
Release: 8%{?dist}
Version: 1.5.1
Release: 1%{?dist}
License: GPLv2+
URL: http://cyberelk.net/tim/software/system-config-printer/
Group: System Environment/Base
Source0: http://cyberelk.net/tim/data/system-config-printer/1.4/%{name}-%{version}.tar.xz
Patch1: system-config-printer-no-applet-in-gnome.patch
Patch2: system-config-printer-python3.patch
BuildRequires: cups-devel >= 1.2
BuildRequires: desktop-file-utils >= 0.2.92
@ -85,9 +84,6 @@ printers.
# Don't start the applet in GNOME.
%patch1 -p1 -b .no-applet-in-gnome
# Explicitly use /usr/bin/python3 in udev-add-printer (bug #1126149).
%patch2 -p1 -b .python3
%build
%configure --with-udev-rules
make %{?_smp_mflags}
@ -187,6 +183,11 @@ touch %buildroot%{_localstatedir}/run/udev-configure-printer/usb-uris
exit 0
%changelog
* Tue Sep 2 2014 Tim Waugh <twaugh@redhat.com> - 1.5.1-1
- 1.5.1, with some Python3 fixes (bug #1136470),
udev-configure-printer fixes, and a fix for a D-Bus service
hang (bug #1116756).
* Mon Aug 18 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.5.0-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild