From 311e5227c7af9f22fadd5329aa613f8bd98fe336 Mon Sep 17 00:00:00 2001
From: Tim Waugh <twaugh@fedoraproject.org>
Date: Sep 23 2008 09:00:49 +0000
Subject: - Really fixed filename handling in foomatic-rip (bug #457679).


---

diff --git a/foomatic-ppd-filenames.patch b/foomatic-ppd-filenames.patch
index 7fce8b1..12c0fb2 100644
--- a/foomatic-ppd-filenames.patch
+++ b/foomatic-ppd-filenames.patch
@@ -1,7 +1,12 @@
 diff -U0 foomatic-filters-3.0-20080904/ChangeLog.ppd-filenames foomatic-filters-3.0-20080904/ChangeLog
 --- foomatic-filters-3.0-20080904/ChangeLog.ppd-filenames	2008-09-04 08:20:14.000000000 +0100
-+++ foomatic-filters-3.0-20080904/ChangeLog	2008-09-05 15:51:23.000000000 +0100
-@@ -0,0 +1,6 @@
++++ foomatic-filters-3.0-20080904/ChangeLog	2008-09-23 09:58:01.000000000 +0100
+@@ -0,0 +1,11 @@
++2008-09-23  Tim Waugh <twaugh@redhat.com>
++
++	* foomatic-rip.in: Remove final incorrect instance of
++	removespecialchars (bug #169).
++
 +2008-09-05  Till Kamppeter <till.kamppeter@gmail.com>
 +
 +	* foomatic-rip.in: Make foomatic-rip also working with PPD file
@@ -9,8 +14,17 @@ diff -U0 foomatic-filters-3.0-20080904/ChangeLog.ppd-filenames foomatic-filters-
 +	  #169).
 +
 diff -up foomatic-filters-3.0-20080904/foomatic-rip.in.ppd-filenames foomatic-filters-3.0-20080904/foomatic-rip.in
---- foomatic-filters-3.0-20080904/foomatic-rip.in.ppd-filenames	2008-09-05 15:49:54.000000000 +0100
-+++ foomatic-filters-3.0-20080904/foomatic-rip.in	2008-09-05 15:51:23.000000000 +0100
+--- foomatic-filters-3.0-20080904/foomatic-rip.in.ppd-filenames	2008-09-23 09:57:43.000000000 +0100
++++ foomatic-filters-3.0-20080904/foomatic-rip.in	2008-09-23 09:58:01.000000000 +0100
+@@ -349,7 +349,7 @@ foreach my $shell ('/bin/sh', '/bin/bash
+ if (defined($ENV{'PPD'})) {
+     # Clean the file name from weird characters which could cause
+     # unexpected behaviour
+-    $ppdfile = removespecialchars($ENV{'PPD'});
++    $ppdfile = $ENV{'PPD'};
+     # CUPS, Solaris LP, and PPR (RIP filter) use the "PPD" environment variable
+     # to make the PPD file name available (we set CUPS here preliminarily,
+     # in the next step we check for Solaris LP and the PPR)
 @@ -517,10 +517,10 @@ if (defined($ENV{'PRINTCAP_ENTRY'})){
  # PPD file name given via the command line
  # allow duplicates, and use the last specified one
diff --git a/foomatic.spec b/foomatic.spec
index d28c6d1..81f7ffa 100644
--- a/foomatic.spec
+++ b/foomatic.spec
@@ -6,7 +6,7 @@
 Summary: Foomatic printer database.
 Name:		foomatic
 Version:	3.0.2
-Release:    66%{?dist}
+Release:    67%{?dist}
 License:	GPLv2+
 Group: System Environment/Libraries
 
@@ -235,6 +235,9 @@ rm -fr %buildroot $RPM_BUILD_DIR/%{name}
 %{_var}/cache/foomatic
 
 %changelog
+* Tue Sep 23 2008 Tim Waugh <twaugh@redhat.com> 3.0.2-67
+- Really fixed filename handling in foomatic-rip (bug #457679).
+
 * Fri Sep  5 2008 Tim Waugh <twaugh@redhat.com> 3.0.2-66
 - Fixed filename handling in foomatic-rip (bug #457679).