use paperconf instead of paper binary (#1072371)

This commit is contained in:
Jiri Popelka 2014-03-04 16:30:11 +01:00
parent af8552b51b
commit 5b03ad0e98
2 changed files with 33 additions and 7 deletions

24
psutils-paperconf.patch Normal file
View File

@ -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);

View File

@ -1,7 +1,7 @@
Summary: PostScript Utilities Summary: PostScript Utilities
Name: psutils Name: psutils
Version: 1.23 Version: 1.23
Release: 1%{?dist} Release: 2%{?dist}
License: psutils License: psutils
# We can't follow https://fedoraproject.org/wiki/Packaging:SourceURL#Github # We can't follow https://fedoraproject.org/wiki/Packaging:SourceURL#Github
@ -11,11 +11,11 @@ License: psutils
Source: psutils-%{version}.tar.xz Source: psutils-%{version}.tar.xz
URL: https://github.com/rrthomas/psutils URL: https://github.com/rrthomas/psutils
#Patch0: psutils-p17-paper.patch # BZ#1072371
# do we still need this ?
# https://github.com/rrthomas/psutils/commit/cca570c806bf4bde07f400b2bab9266e02998145 # 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 # copylib - https://fedorahosted.org/fpc/ticket/174
Provides: bundled(gnulib) Provides: bundled(gnulib)
@ -36,8 +36,7 @@ Various scripts from the psutils distribution that require perl.
%prep %prep
%setup -q %setup -q
# Do we still need this one ? %patch0 -p1 -b .paperconf
#%%patch0 -p1 -b .paper
%build %build
%configure %configure
@ -73,6 +72,9 @@ Various scripts from the psutils distribution that require perl.
%changelog %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 * Wed Jan 22 2014 Jiri Popelka <jpopelka@redhat.com> - 1.23-1
- 1.23 - 1.23