diff --git a/psutils-1.23.tar.gz b/psutils-1.23.tar.gz deleted file mode 100644 index 2116252..0000000 Binary files a/psutils-1.23.tar.gz and /dev/null differ diff --git a/psutils-2.08.tar.gz b/psutils-2.08.tar.gz new file mode 100644 index 0000000..5477eff Binary files /dev/null and b/psutils-2.08.tar.gz differ diff --git a/psutils-paperconf.patch b/psutils-paperconf.patch deleted file mode 100644 index 5ec5f82..0000000 --- a/psutils-paperconf.patch +++ /dev/null @@ -1,40 +0,0 @@ -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 2015-05-20 14:25:40.636115433 +0200 -@@ -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 2015-05-29 13:24:12.834350330 +0200 -@@ -88,13 +87,21 @@ 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))) -- res = sscanf(l, "%lg %lg", width, height); -+ if (paper_name && (cmd = xasprintf(PAPER " -s %s", paper_name)) && (l = pgetline(cmd))) -+ { -+ for (int i = 0; i < strlen(l); i++) -+ { -+ if (l[i] == ',') -+ { -+ l[i] = '.'; -+ } -+ } -+ res = sscanf(l, "%lg %lg", width, height); -+ } - free(l); - free(cmd); - return res == 2; - } -- - /* Make a file seekable, using temporary files if necessary */ - FILE *seekable(FILE *fp) - { diff --git a/psutils.spec b/psutils.spec index 7fa2221..e7ea24f 100644 --- a/psutils.spec +++ b/psutils.spec @@ -1,19 +1,27 @@ +# Don't generate debuginfo for new versions. +%define debug_package %{nil} + Name: psutils -Version: 1.23 -Release: 16 -Summary: utilities for manipulating PostScript documents +Version: 2.08 +Release: 1 +Summary: Utilities for manipulating PostScript documents License: psutils URL: https://github.com/rrthomas/psutils # wget https://github.com/rrthomas/psutils/archive/v1.23.tar.gz && tar xf v1.23.tar.gz && cd psutils-1.23 # then run: # ./bootstrap && autoreconf -vfi && cd .. && tar -cvf psutils-1.23.tar.gz psutils-1.23 Source0: %{name}-%{version}.tar.gz -Patch0: psutils-paperconf.patch -BuildRequires: gcc perl-generators +BuildRequires: gcc +BuildRequires: perl-generators +BuildRequires: perl(File::Basename) +BuildRequires: perl(Getopt::Long) +BuildRequires: perl(strict) +BuildRequires: perl(warnings) Requires: /usr/bin/paperconf -Provides: bundled(gnulib) psutils-perl -Obsoletes: psutils-perl +Provides: bundled(gnulib) +Provides: psutils-perl = %{version}-%{release} +Obsoletes: psutils-perl < %{version}-%{release} %package_help @@ -39,6 +47,7 @@ make %{?_smp_mflags} %defattr(-,root,root) %doc LICENSE %{_bindir}/* +%{_datadir}/%{name} %files help %defattr(-,root,root) @@ -46,5 +55,8 @@ make %{?_smp_mflags} %{_mandir}/man1/*1* %changelog +* Fri May 06 2022 misaka00251 - 2.08-1 +- Upgrade package version + * Tue Dec 10 2019 openEuler Buildteam - 1.23-15 - Package init