From ef1c988296545bca6693062b15e0b4961fbd45fc Mon Sep 17 00:00:00 2001
From: Akira TAGOH <tagoh@fedoraproject.org>
Date: Mon, 17 Jul 2006 09:24:12 +0000
Subject: [PATCH] revert 'document-charset' change

---
 paps-cups.patch | 17 +++++++----------
 paps.spec       |  1 -
 2 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/paps-cups.patch b/paps-cups.patch
index db29680..ca6347e 100644
--- a/paps-cups.patch
+++ b/paps-cups.patch
@@ -65,7 +65,7 @@ diff -ruN paps-0.6.6.orig/src/paps.c paps-0.6.6/src/paps.c
    int do_tumble = -1;   /* -1 means not initialized */
    int do_duplex = -1;
    gchar *paps_header = NULL;
-@@ -323,12 +325,118 @@
+@@ -323,12 +325,115 @@
    int header_sep = 20;
    int max_width = 0, w;
    GIConv cvh = NULL;
@@ -173,9 +173,6 @@ diff -ruN paps-0.6.6.orig/src/paps.c paps-0.6.6/src/paps.c
 +		}
 +		if (getenv("CHARSET") != NULL)
 +			encoding = g_strdup(getenv("CHARSET"));
-+		if ((val = cupsGetOption("document-charset", num_options, options)) != NULL) {
-+			encoding = g_strdup(val);
-+		}
 +	}
 +  } G_STMT_END;
 +
@@ -184,7 +181,7 @@ diff -ruN paps-0.6.6.orig/src/paps.c paps-0.6.6/src/paps.c
    /* Parse command line */
    if (!g_option_context_parse(ctxt, &argc, &argv, &error))
      {
-@@ -355,6 +463,8 @@
+@@ -355,6 +460,8 @@
        IN = stdin;
      }
    title = filename_in;
@@ -193,7 +190,7 @@ diff -ruN paps-0.6.6.orig/src/paps.c paps-0.6.6/src/paps.c
    
    paps = paps_new();
    pango_context = paps_get_pango_context (paps);
-@@ -373,8 +483,10 @@
+@@ -373,8 +480,10 @@
    pango_context_set_font_description (pango_context, font_description);
  
    /* Page layout */
@@ -206,7 +203,7 @@ diff -ruN paps-0.6.6.orig/src/paps.c paps-0.6.6/src/paps.c
    
    if (num_columns == 1)
      total_gutter_width = 0;
-@@ -435,6 +547,7 @@
+@@ -435,6 +544,7 @@
    page_layout.pango_dir = pango_dir;
    page_layout.filename = filename_in;
    page_layout.header_font_desc = header_font_desc;
@@ -214,7 +211,7 @@ diff -ruN paps-0.6.6.orig/src/paps.c paps-0.6.6/src/paps.c
  
    /* calculate x-coordinate scale */
    if (cpi > 0.0L)
-@@ -781,6 +894,7 @@
+@@ -781,6 +891,7 @@
    int orientation = page_layout->page_width > page_layout->page_height;
    int bb_page_width = page_layout->page_width;
    int bb_page_height = page_layout->page_height;
@@ -222,7 +219,7 @@ diff -ruN paps-0.6.6.orig/src/paps.c paps-0.6.6/src/paps.c
    
    /* Keep bounding box non-rotated to make ggv happy */
    if (orientation)
-@@ -790,12 +904,20 @@
+@@ -790,12 +901,20 @@
        bb_page_height = tmp;
      }
    
@@ -244,7 +241,7 @@ diff -ruN paps-0.6.6.orig/src/paps.c paps-0.6.6/src/paps.c
            "%%%%BeginProlog\n"
            "%%%%Orientation: %s\n"
            "/papsdict 1 dict def\n"
-@@ -845,8 +967,10 @@
+@@ -845,8 +964,10 @@
            title,
            bb_page_width,
            bb_page_height,
diff --git a/paps.spec b/paps.spec
index 8a962e1..e274e8f 100644
--- a/paps.spec
+++ b/paps.spec
@@ -78,7 +78,6 @@ rm -rf $RPM_BUILD_ROOT
 %changelog
 * Mon Jul 17 2006 Akira TAGOH <tagoh@redhat.com> - 0.6.6-11
 - add an owner info to PS.
-- support "document-charset" attribute.
 
 * Wed Jul 12 2006 Jesse Keating <jkeating@redhat.com> - 0.6.6-10.2
 - rebuild