[rpms/psutils] rawhide: 3.3.15 bump

A new commit has been pushed.

Repo   : rpms/psutils
Branch : rawhide
Commit : f170202cf5faf694a3801057874a02025cdd3307
Author : Petr Písař <ppisar@redhat.com>
Date   : 2026-07-20T15:58:40+02:00
Stats  : +82/-318 in 5 file(s)
URL    : https://src.fedoraproject.org/rpms/psutils/c/f170202cf5faf694a3801057874a02025cdd3307?branch=rawhide

Log:
3.3.15 bump

---
diff --git a/.gitignore b/.gitignore
index 2858fa1..b934844 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,4 @@ psutils-p17-clean.tar.gz
 /psutils-2.07.tar.gz
 /psutils-2.09.tar.gz
 /psutils-2.10.tar.gz
+/psutils-3.3.15.tar.gz

diff --git a/psutils-p17-paper.patch b/psutils-p17-paper.patch
deleted file mode 100644
index c5fc02a..0000000
--- a/psutils-p17-paper.patch
+++ /dev/null
@@ -1,202 +0,0 @@
---- psutils/pstops.1.paper	Tue Mar 11 23:53:04 1997
-+++ psutils/pstops.1	Thu Jul 19 15:21:51 2001
-@@ -108,10 +108,11 @@
- The 
- .I \-p
- option can be used as an alternative, to set the paper size to
--.B a3, a4, a5, b5, letter, legal, tabloid, statement, executive, folio, quarto
-+.B a3, a4, a5, b5, letter, legal, tabloid, statement, executive, folio, quarto, 10x14
- or
--.B 10x14.
--The default paper size is
-+.B _glibc,
-+where latter one means the format of the current locale. The default
-+paper size is
- .B @PAPER@.
- .PP
- The
-@@ -154,6 +155,12 @@
- 4:1L@.7(21cm,0)+-2L@.7(21cm,14.85cm)
- .sp
- for the reverse sides (or join them with a comma for duplex printing).
-+.SH "ENVIRONMENT VARIABLES"
-+.TP
-+.B LC_ALL, LC_PAPER
-+These variables are specifying the papertype when used paper is
-+.B _glibc.
-+For details see the locale(7) manpage.
- .SH AUTHOR
- Copyright (C) Angus J. C. Duggan 1991-1995
- .SH "SEE ALSO"
---- psutils/psutil.c.paper	Tue Mar 11 23:53:04 1997
-+++ psutils/psutil.c	Thu Jul 19 15:21:51 2001
-@@ -21,6 +21,11 @@
- #include <sys/types.h>
- #include <sys/stat.h>
- 
-+#ifdef HAVE_LANGINFO_H
-+#  include <langinfo.h>
-+#  include <locale.h>
-+#endif
-+
- #define iscomment(x,y) (strncmp(x,y,strlen(y)) == 0)
- 
- extern char *program ;
-@@ -31,6 +36,16 @@
- extern char pagelabel[BUFSIZ];
- extern int pageno;
- 
-+#ifdef HAVE_LANGINFO_H
-+/* When using papertype _glibc we are comparing floating point values. Therefore
-+ * and because values in the papersize table are not exactly we are needing an
-+ * epsilon value. */
-+static float PT_EPSILON = 2.0;
-+
-+/* The factor needed to convert lengths given in mm to length in pt.*/
-+static float MM_TO_PT_FACTOR = 72/25.4;
-+#endif /* HAVE_LANGINFO_H */
-+
- static char buffer[BUFSIZ];
- static long bytes = 0;
- static long pagescmt = 0;
-@@ -64,16 +79,52 @@
-    { NULL, 0, 0 }
- };
- 
-+#ifdef HAVE_LANGINFO_H
-+/* Called if papertype is '_glibc'. It uses the current locale to determine the
-+ * height and width of the current LC_PAPER and compares it with the items of
-+ * the 'papersizes' list. */
-+Paper* findpaperglibc()
-+{
-+   float	height, width;
-+   char		*old_locale = setlocale (LC_PAPER, "");
-+   Paper	*result = 0, *pp;
-+  
-+   height = MM_TO_PT_FACTOR * (unsigned int)(nl_langinfo(_NL_PAPER_HEIGHT));
-+   width  = MM_TO_PT_FACTOR * (unsigned int)(nl_langinfo(_NL_PAPER_WIDTH));
-+
-+   for (pp = papersizes; PaperName(pp) && result==0; pp++) {
-+      if ( abs(PaperWidth(pp)-width)<PT_EPSILON &&
-+	   abs(PaperHeight(pp)-height)<PT_EPSILON )
-+	 result = pp;
-+   }
-+
-+   setlocale(LC_PAPER, old_locale);
-+
-+   return result;
-+}
-+#endif /* HAVE_LANGINFO_H */
-+
- /* return pointer to paper size struct or NULL */
- Paper* findpaper(char *name)
- {
--   Paper *pp;
--   for (pp = papersizes; PaperName(pp); pp++) {
--      if (strcmp(PaperName(pp), name) == 0) {
-+   Paper *pp = 0;
-+
-+#ifdef HAVE_LANGINFO_H   
-+   if (strcmp(name, "_glibc") == 0) {
-+      pp = findpaperglibc();
-+      if (pp==0) name = "a4";	/* Paper in C locale */
-+   }
-+#endif /* HAVE_LANGINFO_H */
-+   
-+   if (pp==0) {
-+     for (pp = papersizes; PaperName(pp); pp++) {
-+       if (strcmp(PaperName(pp), name) == 0) {
- 	 return pp;
--      }
-+       }
-+     }
-    }
--   return (Paper *)NULL;
-+
-+   return pp;
- }
- 
- /* Make a file seekable, using temporary files if necessary */
---- psutils/psresize.1.paper	Tue Mar 11 23:53:03 1997
-+++ psutils/psresize.1	Thu Jul 19 15:21:51 2001
-@@ -42,10 +42,11 @@
- The 
- .I \-p
- option can be used as an alternative, to set the output paper size to
--.B a3, a4, a5, b5, letter, legal, tabloid, statement, executive, folio, quarto
-+.B a3, a4, a5, b5, letter, legal, tabloid, statement, executive, folio, quarto, 10x24
- or
--.B 10x14.
--The default output paper size is
-+.B _glibc,
-+where latter one means the format of the current locale. The default
-+output paper size is
- .B @PAPER@.
- .PP
- The
-@@ -69,6 +70,12 @@
- .sp
- psresize -PA4 -pletter in.ps out.ps
- .sp
-+.SH "ENVIRONMENT VARIABLES"
-+.TP
-+.B LC_ALL, LC_PAPER
-+These variables are specifying the papertype when used paper is
-+.B _glibc.
-+For details see the locale(7) manpage.
- .SH AUTHOR
- Copyright (C) Angus J. C. Duggan 1991-1995
- .SH "SEE ALSO"
---- psutils/psnup.1.paper	Tue Mar 11 23:53:02 1997
-+++ psutils/psnup.1	Thu Jul 19 15:21:51 2001
-@@ -61,9 +61,11 @@
- The 
- .I \-p
- option can be used as an alternative, to set the paper size to
--.B a3, a4, a5, b5, letter, legal, tabloid, statement, executive, folio, quarto
-+.B a3, a4, a5, b5, letter, legal, tabloid, statement, executive, folio, quarto,
-+.B 10x14
- or
--.B 10x14.
-+.B _glibc,
-+where latter one means the format of the current locale.
- The default paper size is
- .B @PAPER@.
- The
-@@ -148,6 +150,12 @@
- on the first output page and
- pages 2 then 3 of the input document 
- on the second output page.
-+.SH "ENVIRONMENT VARIABLES"
-+.TP
-+.B LC_ALL, LC_PAPER
-+These variables are specifying the papertype when used paper is
-+.B _glibc.
-+For details see the locale(7) manpage.
- .SH AUTHOR
- Copyright (C) Angus J. C. Duggan 1991-1995
- .SH "SEE ALSO"
---- psutils/Makefile.unix.paper	Thu Jul 19 15:21:51 2001
-+++ psutils/Makefile.unix	Thu Jul 19 15:24:07 2001
-@@ -19,7 +19,11 @@
- # psnup puts multiple logical pages on one physical page
- # psresize scales and moves pages to fit on different paper sizes
- 
--PAPER=a4
-+PAPER="_glibc"
-+
-+# Comment it out if your machine does not have the <langutil.h> header
-+# or does not know nl_langinfo()
-+LANGINFO_FLAG = -DHAVE_LANGINFO_H
- 
- # Makefile for PSUtils under Unix
- 
-@@ -39,7 +43,7 @@
- MANDIR = $(DESTDIR)/usr/man/man$(MANEXT)
- 
- CC = gcc
--CFLAGS = -DPAPER=\"$(PAPER)\" -DUNIX $(RPM_OPT_FLAGS) -Wall
-+CFLAGS = -DPAPER=\"$(PAPER)\" -DUNIX $(RPM_OPT_FLAGS) $(LANGINFO_FLAG) -Wall
- 
- BIN = psbook psselect pstops epsffit psnup \
- 	psresize

diff --git a/psutils.rpmlintrc b/psutils.rpmlintrc
index 59d4531..85c0686 100644
--- a/psutils.rpmlintrc
+++ b/psutils.rpmlintrc
@@ -1,2 +1,4 @@
-from Config import *
-addFilter("-tests\.noarch: W: no-documentation")
+addFilter('-tests\.noarch: W: no-documentation')
+addFilter('psutils-tests\.noarch: E: zero-length .*/expected*')
+# Workaround for bug #2502718
+addFilter('psutils-tests\.noarch: E: explicit-lib-dependency ImageMagick-libs')

diff --git a/psutils.spec b/psutils.spec
index 5b947c2..9e2848c 100644
--- a/psutils.spec
+++ b/psutils.spec
@@ -2,110 +2,77 @@
 %bcond psutils_enables_unbundling_gnulib %{undefined rhel}
 
 Name:       psutils
-Version:    2.10
-Release:    11%{?dist}
-Summary:    PostScript utilities
-# COPYING:          GPLv3 text
-# epsffit.1:        GPLv3+
-# epsffit.in.in:    GPLv3+
-# extractres.in.in: psutils
-# includeres.in.in: psutils
-# psbook.1:         GPLv3+
-# psbook.in.in:     GPLv3+
-# psjoin.1:         GPLv3+
-# psjoin.in.in:     GPLv3+
-# psnup.in.in:      GPLv3+
-# psresize.1:       GPLv3+
-# psresize.in.in:   GPLv3+
-# psselect.1:       GPLv3+
-# psselect.in.in:   GPLv3+
-# pstops.1:         GPLv3+
-# pstops.in.in:     GPLv3+
-# PSUtils.pm:       GPLv3+
-# README:           GPLv3+
+Version:    3.3.15
+Release:    1%{?dist}
+Summary:    PDF and PostScript utilities
+# COPYING:          GPL-3.0 text
+# psutils/argparse.py:      GPL-3.0-or-later
+# psutils/command/epsffit.py:   GPL-3.0-or-later
+# psutils/command/extractres.py:    GPL-3.0-or-later
+# psutils/command/includeres.py:    GPL-3.0-or-later
+# psutils/command/psbook.py:    GPL-3.0-or-later
+# psutils/command/psjoin.py:    GPL-3.0-or-later
+# psutils/command/psnup.py:     GPL-3.0-or-later
+# psutils/command/psresize.py:  GPL-3.0-or-later
+# psutils/command/psselect.py:  GPL-3.0-or-later
+# psutils/command/pstops.py:    GPL-3.0-or-later
+# psutils/__init__.py:      GPL-3.0-or-later
+# psutils/io.py:            GPL-3.0-or-later
+# psutils/libpaper.py:      GPL-3.0-or-later
+# psutils/psresources.py:   GPL-3.0-or-later
+# psutils/readers.py:       GPL-3.0-or-later
+# psutils/transformers.py:  GPL-3.0-or-later
+# psutils/types.py:         GPL-3.0-or-later
+# psutils/warnings.py:      GPL-3.0-or-later
+# README.md:        GPL-3.0-or-later
 ## In tests subpackage
-# aclocal.m4:       FSFULLR
-# build-aux/compile:        GPLv2+ with Autoconf exception
-# build-aux/config.guess:   GPLv3+ with Autoconf exception
-# build-aux/config.sub:     GPLv3+ with Autoconf exception
-# build-aux/depcomp:        GPLv2+ with Autoconf exception
-# build-aux/install-sh:     MIT
-# build-aux/missing:        GPLv2+ with Autoconf exception
-# build-aux/mdate-sh:       GPLv2+ with Autoconf exception
-# build-aux/test-driver:    GPLv2+ with Autoconf exception
-# build-aux/texinfo.tex:    GPLv3+ with TeX exception
-# configure:                FSFULLR
-# m4/00gnulib.m4:           FSFULLR
-# m4/ax_check_gnu_make.m4:  FSFAP
-# m4/gnulib-common.m4:      FSFULLR
-# m4/gnulib-comp.m4:        GPLv3+ with Autoconf exception
-# m4/relocatable-lib.m4:    FSFULLR
-# Makefile.in:              FSFULLR
+# tests/conftest.py:        GPL-3.0-or-later
+# tests/COPYRIGHT:          "tiger.eps from Ghostscript"
+# tests/test_epsffit.py:    GPL-3.0-or-later
+# tests/test_extractres.py: GPL-3.0-or-later
+# tests/test-files/tiger.eps:   AGPL-3.0-or-later
+# tests/test_includeres.py: GPL-3.0-or-later
+# tests/test_pdfnup.py:     GPL-3.0-or-later
+# tests/test_psbook.py:     GPL-3.0-or-later
+# tests/test_psjoin.py:     GPL-3.0-or-later
+# tests/test_psnup.py:      GPL-3.0-or-later
+# tests/test_psresize:      GPL-3.0-or-later
+# tests/test_psselect.py:   GPL-3.0-or-later
+# tests/test_pstops.py:     GPL-3.0-or-later
+# tests/testutils.py:       GPL-3.0-or-later
 ## Not in any binary package
-# INSTALL:                  FSFAP
-# old-scripts/fixwfwps:     See LICENSE
-# pre-inst-env.in:          GPLv2+
+# PKG-INFO:                 GPL-3.0-or-later
+# psutils.egg-info/PKG-INFO:    GPL-3.0-or-later
+# pyproject.toml:           GPL-3.0-or-later
 License:    GPL-3.0-or-later
+SourceLicense:  GPL-3.0-or-later AND AGPL-3.0-or-later
 URL:        https://github.com/rrthomas/%{name}
 Source:     %{url}/releases/download/v%{version}/%{name}-%{version}.tar.gz
 BuildArch:      noarch
-BuildRequires:  autoconf
-BuildRequires:  automake >= 1.11
-BuildRequires:  bash
-# coreutils for chmod in Makefile.am
 BuildRequires:  coreutils
-# gcc is a default autoconf dependency and populates EXEEXT variable used in
-# Makefile.am.
-BuildRequires:  gcc
-%if %{with psutils_enables_unbundling_gnulib}
-BuildRequires:  gnulib-devel
-%endif
-BuildRequires:  grep
-BuildRequires:  make
-BuildRequires:  perl-generators
-BuildRequires:  sed
+BuildRequires:  python3-devel >= 3.12
 # Run-time:
 BuildRequires:  paper
-BuildRequires:  perl-interpreter
-BuildRequires:  perl(:VERSION) >= 5.14
-BuildRequires:  perl(base)
-BuildRequires:  perl(Exporter)
-BuildRequires:  perl(Fcntl)
-BuildRequires:  perl(File::Basename)
-BuildRequires:  perl(File::Copy)
-BuildRequires:  perl(File::Spec::Functions)
-BuildRequires:  perl(File::Temp)
-BuildRequires:  perl(Getopt::Long)
-BuildRequires:  perl(IPC::Run3)
-BuildRequires:  perl(List::Util)
-BuildRequires:  perl(POSIX)
-BuildRequires:  perl(strict)
-BuildRequires:  perl(warnings)
 # Tests:
-BuildRequires:  diffutils
-# Only for building
-Provides:       bundled(gnulib)%(perl -ne 'if($. == 1 and /\A(\d+)-(\d+)-(\d+)/) {print qq{ = $1$2$3}}' %{_defaultdocdir}/gnulib/ChangeLog 2>/dev/null)
-# psutils-perl was merged into psutils-2.03-1.fc34
-Provides:       %{name}-perl = %{version}-%{release}
-Obsoletes:      %{name}-perl < %{version}-%{release}
+# Undeclared transitive dependency of python3-wand, bug #2502718
+BuildRequires:  ImageMagick-libs
 Requires:       paper
 
-# Filter private modules
-%global __requires_exclude %{?__requires_exclude:%{__requires_exclude}|}^perl\\(PSUtils\\)
-%global __provides_exclude %{?__provides_exclude:%{__provides_exclude}|}^perl\\(PSUtils\\)
-
 %description
-Utilities for manipulating PostScript documents.
-Page selection and rearrangement are supported, including arrangement into
-signatures for booklet printing, and page merging for n-up printing.
+PSUtils is a suite of utilities for manipulating PDF and PostScript documents.
+You can select and rearrange pages, including arrangement into signatures for
+booklet printing, combine multiple pages into a single page for n-up printing,
+and resize, flip and rotate pages.
 
 %package tests
 Summary:        Tests for %{name}
-License:        GPL-3.0-or-later and FSFULLR and MIT and FSFAP
+License:        GPL-3.0-or-later AND AGPL-3.0-or-later
 Requires:       %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:       coreutils
-Requires:       diffutils
-Requires:       make
+# Undeclared transitive dependency of python3-wand, bug #2502718
+Requires:       ImageMagick-libs
+Requires:       python3-pytest
+Requires:       python3dist(pytest-datafiles)
+Requires:       python3dist(wand)
 
 %description tests
 Tests from %{name}. Execute them
@@ -113,45 +80,39 @@ with "%{_libexecdir}/%{name}/test".
 
 %prep
 %setup -q
-%if %{with psutils_enables_unbundling_gnulib}
-gnulib-tool --import --no-changelog relocatable-perl
-%endif
-autoreconf -fi
+
+%generate_buildrequires
+%pyproject_buildrequires -x test
 
 %build
-%configure --disable-relocatable
-%{make_build}
+%pyproject_wheel
  
 %install
-%{make_install}
+%pyproject_install
 # Install tests
 mkdir -p %{buildroot}%{_libexecdir}/%{name}
-cp -a aclocal.m4 build-aux config.status configure configure.ac m4 Makefile* tests %{buildroot}%{_libexecdir}/%{name}
-printf '#!/bin/sh\nexec "$@"\n' > %{buildroot}%{_libexecdir}/%{name}/pre-inst-env
-chmod +x %{buildroot}%{_libexecdir}/%{name}/pre-inst-env
+cp -a tests %{buildroot}%{_libexecdir}/%{name}
 cat > %{buildroot}%{_libexecdir}/%{name}/test << 'EOF'
-#!/bin/bash
-set -e
-# Makefile writes into CWD
-DIR=$(mktemp -d)
-cp -a %{_libexecdir}/%{name}/* "$DIR"
-pushd "$DIR"
-unset PSUTILS_UNINSTALLED
-make -j "$(getconf _NPROCESSORS_ONLN)" check-TESTS
-popd
-rm -r "$DIR"
+#!/bin/sh
+# Override locale because upstream's PAPERSIZE override does not work.
+# <https://github.com/rrthomas/psutils/issues/91>.
+export LC_ALL=C.UTF-8
+export PYTHONDONTWRITEBYTECODE=1
+cd %{_libexecdir}/%{name} && exec /usr/bin/pytest
 EOF
 chmod +x %{buildroot}%{_libexecdir}/%{name}/test
 
 %check
-unset PSUTILS_UNINSTALLED
-make check %{?_smp_mflags}
+# Override locale because upsteam's PAPERSIZE override does not work.
+# <https://github.com/rrthomas/psutils/issues/91>.
+LC_ALL=C.UTF-8
+%pytest
 
 %files
 %license COPYING
-# ChangeLog is not helpful
-# old-scripts excluded intentionally
-%doc README
+%doc README.md
+%{python3_sitelib}/psutils/
+%{python3_sitelib}/psutils-%{version}.dist-info/
 %{_bindir}/epsffit
 %{_bindir}/extractres
 %{_bindir}/includeres
@@ -161,7 +122,6 @@ make check %{?_smp_mflags}
 %{_bindir}/psresize
 %{_bindir}/psselect
 %{_bindir}/pstops
-%{_datadir}/%{name}
 %{_mandir}/man1/epsffit.1*
 %{_mandir}/man1/extractres.1*
 %{_mandir}/man1/includeres.1*
@@ -177,6 +137,9 @@ make check %{?_smp_mflags}
 %{_libexecdir}/%{name}
 
 %changelog
+* Mon Jul 20 2026 Petr Pisar <ppisar@redhat.com> - 3.3.15-1
+- 3.3.15 bump
+
 * Thu Jul 16 2026 Fedora Release Engineering <releng@fedoraproject.org> - 2.10-11
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild
 

diff --git a/sources b/sources
index 199ddf8..e3b9023 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (psutils-2.10.tar.gz) = 565ff9ce2fd56e7d3bbf62796e4b04261ec6a0f9bb9be741409f7d0d9dcd3c23fcf843ee8364e7e1c8ad6843e66eef34a1a63b06d01301d450cf1fda7d9f6da3
+SHA512 (psutils-3.3.15.tar.gz) = 8ec873b33a21cfbf2386e50341c6a30a216895ceb6e8cc79c2e79e114aa54d9f1146cd04de6d85370b4066d1f57d811892539f9974f1582ab461d6392b648d68