From ba7e3999645e2e0887418b4456ce6010c6d0885e Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Jun 22 2015 11:08:34 +0000
Subject: import paps-0.6.8-28.el7.1


---

diff --git a/SOURCES/paps-a3.patch b/SOURCES/paps-a3.patch
new file mode 100644
index 0000000..3628b3a
--- /dev/null
+++ b/SOURCES/paps-a3.patch
@@ -0,0 +1,40 @@
+--- paps-0.6.8/src/paps.c.orig	2015-02-26 14:17:29.351338514 +0530
++++ paps-0.6.8/src/paps.c	2015-02-26 14:17:29.351338514 +0530
+@@ -45,7 +45,8 @@
+ typedef enum {
+     PAPER_TYPE_A4 = 0,
+     PAPER_TYPE_US_LETTER = 1,
+-    PAPER_TYPE_US_LEGAL = 2
++    PAPER_TYPE_US_LEGAL = 2,
++    PAPER_TYPE_A3 = 3
+ } paper_type_t ;
+ 
+ typedef struct  {
+@@ -56,7 +57,8 @@
+ const paper_size_t paper_sizes[] = {
+     { 595.28, 841.89}, /* A4 */
+     { 612, 792},       /* US letter */
+-    { 612, 1008}      /* US legal */
++    { 612, 1008},      /* US legal */
++    { 842, 1190} /* A3 */
+ };
+ 
+ typedef struct {
+@@ -190,6 +192,8 @@
+         paper_type = PAPER_TYPE_US_LETTER;
+       else if (g_ascii_strcasecmp(value, "a4") == 0)
+         paper_type = PAPER_TYPE_A4;
++      else if (g_ascii_strcasecmp(value, "a3") == 0)
++        paper_type = PAPER_TYPE_A3;
+       else {
+         retval = FALSE;
+         fprintf(stderr, "Unknown page size name: %s.\n", value);
+@@ -300,7 +304,7 @@
+     {"rtl", 0, 0, G_OPTION_ARG_NONE, &do_rtl, "Do rtl layout.", NULL},
+     {"paper", 0, 0, G_OPTION_ARG_CALLBACK, _paps_arg_paper_cb,
+      "Choose paper size. Known paper sizes are legal,\n"
+-     "                          letter, a4. (Default: a4)", "PAPER"},
++     "                          letter, a3, a4. (Default: a4)", "PAPER"},
+     {"bottom-margin", 0, 0, G_OPTION_ARG_INT, &bottom_margin, "Set bottom margin in postscript point units (1/72inch). (Default: 36)", "NUM"},
+     {"top-margin", 0, 0, G_OPTION_ARG_INT, &top_margin, "Set top margin. (Default: 36)", "NUM"},
+     {"right-margin", 0, 0, G_OPTION_ARG_INT, &right_margin, "Set right margin. (Default: 36)", "NUM"},
diff --git a/SOURCES/paps-fix-paper-size-truncate.patch b/SOURCES/paps-fix-paper-size-truncate.patch
new file mode 100644
index 0000000..90e9fcb
--- /dev/null
+++ b/SOURCES/paps-fix-paper-size-truncate.patch
@@ -0,0 +1,15 @@
+diff -pruN paps-0.6.8.orig/src/paps.c paps-0.6.8/src/paps.c
+--- paps-0.6.8.orig/src/paps.c	2015-04-24 11:49:53.220718394 +0900
++++ paps-0.6.8/src/paps.c	2015-04-24 11:51:30.847718394 +0900
+@@ -532,9 +532,9 @@ int main(int argc, char *argv[])
+ 
+   /* Page layout */
+   if (page_width < 0)
+-    page_width = paper_sizes[(int)paper_type].width;
++    page_width = (paper_sizes[(int)paper_type].width + 0.5);
+   if (page_height < 0)
+-    page_height = paper_sizes[(int)paper_type].height;
++    page_height = (paper_sizes[(int)paper_type].height + 0.5);
+   
+   if (num_columns == 1)
+     total_gutter_width = 0;
diff --git a/SPECS/paps.spec b/SPECS/paps.spec
index 78908a4..28b6e34 100644
--- a/SPECS/paps.spec
+++ b/SPECS/paps.spec
@@ -1,6 +1,6 @@
 Name:           paps
 Version:        0.6.8
-Release:        28%{?dist}
+Release:        28%{?dist}.1
 
 License:        LGPLv2+
 URL:            http://paps.sourceforge.net/
@@ -33,6 +33,10 @@ Patch55:        paps-fix-loop-in-split.patch
 Patch56:        paps-fix-tab-width.patch
 Patch57:        paps-fix-non-weak-symbol.patch
 Patch58:        paps-correct-fsf-address.patch
+## rhbz#1196997
+Patch59:	paps-a3.patch
+## rhbz#1222777
+Patch60:	paps-fix-paper-size-truncate.patch
 
 Summary:        Plain Text to PostScript converter
 Group:          Applications/Publishing
@@ -75,6 +79,8 @@ applications using paps API.
 %patch56 -p1 -b .tab
 %patch57 -p1 -b .weak-symbol
 %patch58 -p1 -b .fsf
+%patch59 -p1 -b .a3
+%patch60 -p1 -b .paper-size-truncate
 libtoolize -f -c
 autoreconf -f -i
 
@@ -119,6 +125,10 @@ install -p -m0644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/cups
 %{_libdir}/libpaps.so
 
 %changelog
+* Tue May 19 2015 Akira TAGOH <tagoh@redhat.com> - 0.6.8-28.1
+- Add A3 paper size option. (#1196997)
+- Fix wrong paper size due to the integer cast (#1222777)
+
 * Fri Jan 24 2014 Daniel Mach <dmach@redhat.com> - 0.6.8-28
 - Mass rebuild 2014-01-24