[ffgtk/f17] Fixed BZ844149: Faxing via logical ffgtk-fax printer broken in ffgtk-0.8.3 package RE-added patch fo

[Louis Lagendijk]

commit 1bc74618d17e4d75453fbc3cc7afa81a9c3f3669
Author: Louis Lagendijk <louis at travel.pheasant>
Date:   Mon Jul 30 22:36:08 2012 +0200

    Fixed BZ844149: Faxing via logical ffgtk-fax printer broken in ffgtk-0.8.3 package
    RE-added patch for use-old-spooler
    Cleanup of old patches

 ...oler.patch => ffgtk-0.8.3-use-old-spooler.patch |   16 ++--
 ffgtk-config.patch                                 |   25 -----
 ffgtk-fax.ppd                                      |   96 --------------------
 ffgtk-use-old-spooler.patch                        |   24 -----
 ffgtk.spec                                         |    8 ++-
 5 files changed, 14 insertions(+), 155 deletions(-)
---
diff --git a/ffgtk-0.8-use-old-spooler.patch b/ffgtk-0.8.3-use-old-spooler.patch
similarity index 55%
rename from ffgtk-0.8-use-old-spooler.patch
rename to ffgtk-0.8.3-use-old-spooler.patch
index 5fe8047..749a0b2 100644
--- a/ffgtk-0.8-use-old-spooler.patch
+++ b/ffgtk-0.8.3-use-old-spooler.patch
@@ -1,22 +1,22 @@
-*** ffgtk-0.8/ffgtk/main.c.org	2012-01-02 22:04:34.227602667 +0100
---- ffgtk-0.8/ffgtk/main.c	2012-01-02 22:05:10.080621655 +0100
+*** ffgtk/main.c	2012-07-30 21:24:19.089053378 +0200
+--- ffgtk/main.c.org	2012-07-30 21:23:52.286064135 +0200
 ***************
-*** 262,270 ****
-  	InitMonitor();
+*** 250,258 ****
+  	InitNotification();
   
   #ifdef HAVE_FAXOPHONE
   
-! #ifdef __MACOSX__
+! #if defined(__MACOSX__) || defined(G_OS_WIN32)
   	/* Start old cups printer waitqueue */
   	PrintServerInit();
   #else
   	/* Initialize new fax spool watcher */
---- 262,270 ----
-  	InitMonitor();
+--- 250,258 ----
+  	InitNotification();
   
   #ifdef HAVE_FAXOPHONE
   
-! #ifdef  TRUE
+! #if 1
   	/* Start old cups printer waitqueue */
   	PrintServerInit();
   #else
diff --git a/ffgtk.spec b/ffgtk.spec
index ca3ce82..b52ab92 100644
--- a/ffgtk.spec
+++ b/ffgtk.spec
@@ -1,12 +1,13 @@
 Name:           ffgtk
 Version:        0.8.3
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A solution for controlling Fritz!Box or compatible routers
 Group:          Applications/Communications
 License:        GPLv2
 URL:            http://www.tabos.org/ffgtk/
 Source0:        http://www.tabos.org/ffgtk/download/%{name}-%{version}.tar.bz2
 Source1:        ffgtk-README.Fedora
+Patch1:         ffgtk-0.8.3-use-old-spooler.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -49,7 +50,7 @@ This plugin has beta quality
 
 %prep
 %setup -q
-
+%patch1 -p0 -b .use-old-spooler
 install -m644 %{SOURCE1} ./README.Fedora
 
 %build
@@ -153,6 +154,9 @@ fi
 %{_libdir}/ffgtk/plugins/lib_ab_google.so
 
 %changelog
+* Mon Jul 30 2012  Louis Lagendijk <louis.lagendijk at gmail.com> 0.8.3-2
+- Fix BZ 844149:  Faxing via logical ffgtk-fax printer broken in ffgtk-0.8.3 package
+
 * Tue Jul 10 2012  Louis Lagendijk <louis.lagendijk at gmail.com> 0.8.3-1
 - New upstream release 0.8.3
 - Add FRITZ!Box 6360 Cable support