From 5b03ad0e98e8caab2f9d826ea10ff6cdfeeb5fbc Mon Sep 17 00:00:00 2001
From: Jiri Popelka <jpopelka@redhat.com>
Date: Mar 04 2014 15:30:11 +0000
Subject: use paperconf instead of paper binary (#1072371)


---

diff --git a/psutils-paperconf.patch b/psutils-paperconf.patch
new file mode 100644
index 0000000..dd80f4d
--- /dev/null
+++ b/psutils-paperconf.patch
@@ -0,0 +1,24 @@
+diff -up psutils-1.23/configure.paperconf psutils-1.23/configure
+--- psutils-1.23/configure.paperconf	2014-01-22 10:31:58.000000000 +0100
++++ psutils-1.23/configure	2014-03-04 16:19:48.053365284 +0100
+@@ -15700,7 +15700,7 @@ fi
+ 
+ 
+ if test -z "$PAPER"; then
+-  PAPER=paper
++  PAPER=paperconf
+ fi
+ 
+ 
+diff -up psutils-1.23/psutil.c.paperconf psutils-1.23/psutil.c
+--- psutils-1.23/psutil.c.paperconf	2014-01-16 11:20:54.000000000 +0100
++++ psutils-1.23/psutil.c	2014-03-04 16:18:58.361057495 +0100
+@@ -88,7 +88,7 @@ int paper_size(const char *paper_name, d
+   int res = 0;
+   if (paper_name == NULL) /* Use default paper name */
+     paper_name = pgetline(PAPER);
+-  if (paper_name && (cmd = xasprintf(PAPER " --unit=pt --size %s", paper_name)) && (l = pgetline(cmd)))
++  if (paper_name && (cmd = xasprintf(PAPER " -s %s", paper_name)) && (l = pgetline(cmd)))
+     res = sscanf(l, "%lg %lg", width, height);
+   free(l);
+   free(cmd);
diff --git a/psutils.spec b/psutils.spec
index 4f4999d..2c76635 100644
--- a/psutils.spec
+++ b/psutils.spec
@@ -1,7 +1,7 @@
 Summary: PostScript Utilities
 Name:    psutils
 Version: 1.23
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: psutils
 
 # We can't follow https://fedoraproject.org/wiki/Packaging:SourceURL#Github
@@ -11,11 +11,11 @@ License: psutils
 Source: psutils-%{version}.tar.xz
 URL:    https://github.com/rrthomas/psutils
 
-#Patch0: psutils-p17-paper.patch
-
-# do we still need this ?
+# BZ#1072371
 # https://github.com/rrthomas/psutils/commit/cca570c806bf4bde07f400b2bab9266e02998145
-BuildRequires: libpaper-devel
+Patch0: psutils-paperconf.patch
+
+Requires: /usr/bin/paperconf
 
 # copylib - https://fedorahosted.org/fpc/ticket/174
 Provides: bundled(gnulib)
@@ -36,8 +36,7 @@ Various scripts from the psutils distribution that require perl.
 %prep
 %setup -q
 
-# Do we still need this one ?
-#%%patch0 -p1 -b .paper
+%patch0 -p1 -b .paperconf
 
 %build
 %configure
@@ -73,6 +72,9 @@ Various scripts from the psutils distribution that require perl.
 
 
 %changelog
+* Tue Mar 04 2014 Jiri Popelka <jpopelka@redhat.com> - 1.23-2
+- use paperconf instead of paper binary (#1072371)
+
 * Wed Jan 22 2014 Jiri Popelka <jpopelka@redhat.com> - 1.23-1
 - 1.23