[xfprint/f15] Add patch to fix default printing system. Upgrade to 4.6.1 (translation updates).

[Kevin Fenzi]

commit f1e4533d8e225f642476ad036f89388b20ee28fd
Author: Kevin Fenzi <kevin at scrye.com>
Date:   Sat Aug 27 14:16:42 2011 -0600

    Add patch to fix default printing system.
    Upgrade to 4.6.1 (translation updates).

 .gitignore                      |    1 +
 sources                         |    2 +-
 xfprint-4.6.0-fix-backend.patch |   31 +++++++++++++++++++++++++++++++
 xfprint.spec                    |   11 +++++++++--
 4 files changed, 42 insertions(+), 3 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index eee2113..5842b6c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 xfprint-4.6.0.tar.bz2
+/xfprint-4.6.1.tar.bz2
diff --git a/sources b/sources
index 8eda935..dca00ee 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-cf2e0de43367da6a0ef7eeef04876281  xfprint-4.6.0.tar.bz2
+d92fca97a42816085080baf07a99a62e  xfprint-4.6.1.tar.bz2
diff --git a/xfprint-4.6.0-fix-backend.patch b/xfprint-4.6.0-fix-backend.patch
new file mode 100644
index 0000000..3dcfe8a
--- /dev/null
+++ b/xfprint-4.6.0-fix-backend.patch
@@ -0,0 +1,31 @@
+diff -Nur xfprint-4.6.0.orig/xfprint-manager/main.c xfprint-4.6.0/xfprint-manager/main.c
+--- xfprint-4.6.0.orig/xfprint-manager/main.c	2009-02-24 14:34:16.000000000 -0700
++++ xfprint-4.6.0/xfprint-manager/main.c	2011-08-20 13:58:58.314269070 -0600
+@@ -41,6 +41,7 @@
+ #include <libxfprint/printer-list-window.h>
+ 
+ #define CHANNEL         "xfprint"
++#define PROP_PRINTING_SYSTEM  "/printing-system"
+ 
+ extern void mainwin_setup (void);
+ 
+@@ -66,15 +67,15 @@
+   channel = xfconf_channel_new (CHANNEL);
+   if (channel) {
+ 
+-    if (xfconf_channel_has_property (channel, "/XfPrint/system")) {
+-      const gchar *system_name = xfconf_channel_get_string (channel, "/XfPrint/system", "none");
++    if (xfconf_channel_has_property (channel, PROP_PRINTING_SYSTEM)) {
++      const gchar *system_name = xfconf_channel_get_string (channel, PROP_PRINTING_SYSTEM, "none");
+       if (g_ascii_strcasecmp (system_name, "none") != 0) {
+         ps = printing_system_new (system_name);
+-        if (ps == NULL);
++        if (ps == NULL)
+           g_warning ("Unable to load printing system module %s", system_name);
+       }
+     } else {
+-      g_warning ("%s: XfPrint/system is not set", PACKAGE);
++      g_warning ("%s: %s is not set", PACKAGE, PROP_PRINTING_SYSTEM);
+     }
+   }
+ 
diff --git a/xfprint.spec b/xfprint.spec
index e9b462c..92f48e5 100644
--- a/xfprint.spec
+++ b/xfprint.spec
@@ -1,12 +1,14 @@
 Summary: Print dialog and printer manager for Xfce 4
 Name: xfprint
-Version: 4.6.0
-Release: 6%{?dist}
+Version: 4.6.1
+Release: 1%{?dist}
 License: GPLv2+
 URL: http://www.xfce.org
 Source0: http://www.xfce.org/archive/xfce-%{version}/src/xfprint-%{version}.tar.bz2
 # Upstream bug: http://bugzilla.xfce.org/show_bug.cgi?id=6237
 Patch1: xfprint-4.6.0-dsofix.patch
+# Upstream bug: https://bugzilla.xfce.org/show_bug.cgi?id=5160
+Patch2: xfprint-4.6.0-fix-backend.patch
 Group: User Interface/Desktops
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: libxfcegui4 >= %{version}
@@ -37,6 +39,7 @@ Static libraries and header files for the Xfce xfprint library.
 %prep
 %setup -q
 %patch1 -p1
+%patch2 -p1
 
 %build
 %configure  --disable-static
@@ -89,6 +92,10 @@ fi
 %doc %{_datadir}/gtk-doc
 
 %changelog
+* Sat Aug 20 2011 Kevin Fenzi <kevin at scrye.com> - 4.6.1-1
+- Add patch to fix default printing system. 
+- Upgrade to 4.6.1 (translation updates).
+
 * Mon Feb 07 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.6.0-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild