11 changed files with 454 additions and 85 deletions
--- a/.fmf/version
+++ b/.fmf/version
@ -0,0 +1 @@
+1
--- a/.gitignore
+++ b/.gitignore
@ -1 +1,10 @@
-SOURCES/psutils-1.23.tar.xz
+psutils-p17-clean.tar.gz
+/psutils-1.21.tar.xz
+/psutils-1.23.tar.xz
+/psutils-2.03.tar.gz
+/psutils-2.04.tar.gz
+/psutils-2.05.tar.gz
+/psutils-2.06.tar.gz
+/psutils-2.07.tar.gz
+/psutils-2.09.tar.gz
+/psutils-2.10.tar.gz
--- a/.psutils.metadata
+++ b/.psutils.metadata
@ -1 +0,0 @@
-262d61ccfed221f9b2c5347855851c51a3df744d SOURCES/psutils-1.23.tar.xz
--- a/SOURCES/psutils-paperconf.patch
+++ b/SOURCES/psutils-paperconf.patch
@ -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)
- {
--- a/gating.yaml
+++ b/gating.yaml
@ -0,0 +1,6 @@
+--- !Policy
+product_versions:
+  - rhel-10
+decision_context: osci_compose_gate
+rules:
+  - !PassingTestCaseRule {test_case_name: osci.brew-build.tier0.functional}
--- a/plans/sanity.fmf
+++ b/plans/sanity.fmf
@ -0,0 +1,5 @@
+summary: Sanity tests
+discover:
+    how: fmf
+execute:
+    how: tmt
--- a/psutils-p17-paper.patch
+++ b/psutils-p17-paper.patch
@ -0,0 +1,202 @@
+--- 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
--- a/psutils.rpmlintrc
+++ b/psutils.rpmlintrc
@ -0,0 +1,2 @@
+from Config import *
+addFilter("-tests\.noarch: W: no-documentation")
--- a/SPECS/psutils.spec
+++ b/SPECS/psutils.spec
@ -1,85 +1,265 @@
-Summary: PostScript Utilities
-Name:    psutils
-Version: 1.23
-Release: 13%{?dist}
-License: psutils
-
-# We can't follow https://fedoraproject.org/wiki/Packaging:SourceURL#Github
-# and use upstream tarball for building because ./bootstrap downloads gnulib.
-# wget https://github.com/rrthomas/psutils/archive/master.zip && unzip master.zip && cd psutils-master/
-# ./bootstrap && autoreconf -vfi && ./configure && make dist-xz
-Source: psutils-%{version}.tar.xz
-URL:    https://github.com/rrthomas/psutils
-
-# BZ#1072371
-# https://github.com/rrthomas/psutils/commit/cca570c806bf4bde07f400b2bab9266e02998145
-Patch0: psutils-paperconf.patch
+# Unbundle gnulib
+%bcond psutils_enables_unbundling_gnulib %{undefined rhel}

+Name:       psutils
+Version:    2.10
+Release:    9%{?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+
+## 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
+## Not in any binary package
+# INSTALL:                  FSFAP
+# old-scripts/fixwfwps:     See LICENSE
+# pre-inst-env.in:          GPLv2+
+License:    GPL-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
+# 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}
+Requires:       paper

-Requires: /usr/bin/paperconf
-
-# copylib - https://fedorahosted.org/fpc/ticket/174
-Provides: bundled(gnulib)
+# 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.

-%package perl
-Summary: psutils scripts requiring perl
-BuildArch: noarch
+%package tests
+Summary:        Tests for %{name}
+License:        GPL-3.0-or-later and FSFULLR and MIT and FSFAP
+Requires:       %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:       coreutils
+Requires:       diffutils
+Requires:       make

-%description perl
-Various scripts from the psutils distribution that require perl.
+%description tests
+Tests from %{name}. Execute them
+with "%{_libexecdir}/%{name}/test".

 %prep
 %setup -q
-
-%patch0 -p1 -b .paperconf
-# Use /usr/bin/perl instead of /usr/bin/env perl
-sed -i -e 's,/usr/bin/env perl,%{__perl},' \
-  extractres psjoin
+%if %{with psutils_enables_unbundling_gnulib}
+gnulib-tool --import --no-changelog relocatable-perl
+%endif
+autoreconf -fi

 %build
-%configure
-%{__make} %{?_smp_mflags}
+%configure --disable-relocatable
+%{make_build}
 
 %install
-%{__make} install DESTDIR=%{buildroot}
+%{make_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
+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"
+EOF
+chmod +x %{buildroot}%{_libexecdir}/%{name}/test
+
+%check
+unset PSUTILS_UNINSTALLED
+make check %{?_smp_mflags}

 %files
-%doc README LICENSE
+%license COPYING
+# ChangeLog is not helpful
+# old-scripts excluded intentionally
+%doc README
 %{_bindir}/epsffit
+%{_bindir}/extractres
+%{_bindir}/includeres
 %{_bindir}/psbook
+%{_bindir}/psjoin
 %{_bindir}/psnup
 %{_bindir}/psresize
 %{_bindir}/psselect
 %{_bindir}/pstops
+%{_datadir}/%{name}
 %{_mandir}/man1/epsffit.1*
+%{_mandir}/man1/extractres.1*
+%{_mandir}/man1/includeres.1*
 %{_mandir}/man1/psbook.1*
+%{_mandir}/man1/psjoin.1*
 %{_mandir}/man1/psnup.1*
 %{_mandir}/man1/psresize.1*
 %{_mandir}/man1/psselect.1*
 %{_mandir}/man1/pstops.1*
 %{_mandir}/man1/psutils.1*

-%files perl
-%doc LICENSE
-%{_bindir}/extractres
-%{_bindir}/includeres
-%{_bindir}/psjoin
-%{_mandir}/man1/extractres.1*
-%{_mandir}/man1/includeres.1*
-%{_mandir}/man1/psjoin.1*
-
+%files tests
+%{_libexecdir}/%{name}

 %changelog
+* Tue Oct 29 2024 Troy Dawson <tdawson@redhat.com> - 2.10-9
+- Bump release for October 2024 mass rebuild:
+  Resolves: RHEL-64018
+
+* Thu Oct 24 2024 Ondřej Pohořelský <opohorel@redhat.com> - 2.10-8
+- SPDX conversion of test subpackage
+- Resolves: RHEL-64357
+
+* Wed Jul 03 2024 Ondřej Pohořelský <opohorel@redhat.com> - 2.10-7
+- Don't copy configure~ into psutils-tests package
+- Related: RHEL-45222
+
+* Wed Jul 03 2024 Ondřej Pohořelský <opohorel@redhat.com> - 2.10-6
+- Use bundled gnulib on RHEL
+- Resolves: RHEL-45222
+
+* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 2.10-5
+- Bump release for June 2024 mass rebuild
+
+* Fri Jan 26 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.10-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Sun Jan 21 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.10-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Fri Jul 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.10-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
+* Tue Feb 28 2023 Ondřej Pohořelský <opohorel@redhat.com> - 2.10-1
+- 2.10 bump
+- resolves: rhbz#2173614
+
+* Fri Jan 20 2023 Ondřej Pohořelský <opohorel@redhat.com> - 2.09-1
+- 2.09 bump
+- resolves: rhbz#2035916
+
+* Fri Jan 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.07-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
+* Fri Jul 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.07-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
+* Fri Jan 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.07-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
+* Tue Oct 26 2021 Ondřej Pohořelský <opohorel@redhat.com> - 2.07-1
+- 2.07 bump
+- Resolves: rhbz#2012555
+
+* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.06-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
+* Tue Jun 01 2021 Ondřej Pohořelský <opohorel@redhat.com> - 2.06-1
+- 2.06 bump
+
+* Tue Apr 06 2021 Petr Pisar <ppisar@redhat.com> - 2.05-1
+- 2.05 bump
+- Package tests
+
+* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.04-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Wed Nov 18 2020 Petr Pisar <ppisar@redhat.com> - 2.04-1
+- 2.04 bump
+
+* Fri Oct 02 2020 Petr Pisar <ppisar@redhat.com> - 2.03-1
+- 2.03 bump
+
+* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.23-18
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Thu Jan 30 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.23-17
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.23-16
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Sat Feb 02 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.23-15
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.23-14
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
 * Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.23-13
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild

--- a/1
+++ b/1
@ -0,0 +1 @@
+SHA512 (psutils-2.10.tar.gz) = 565ff9ce2fd56e7d3bbf62796e4b04261ec6a0f9bb9be741409f7d0d9dcd3c23fcf843ee8364e7e1c8ad6843e66eef34a1a63b06d01301d450cf1fda7d9f6da3
--- a/tests/upstream-tests.fmf
+++ b/tests/upstream-tests.fmf
@ -0,0 +1,4 @@
+summary: Upstream tests
+component: psutils
+require: psutils-tests
+test: /usr/libexec/psutils/test
				`@ -1 +0,0 @@`
				`262d61ccfed221f9b2c5347855851c51a3df744d SOURCES/psutils-1.23.tar.xz`
				`@ -0,0 +1 @@`
				`SHA512 (psutils-2.10.tar.gz) = 565ff9ce2fd56e7d3bbf62796e4b04261ec6a0f9bb9be741409f7d0d9dcd3c23fcf843ee8364e7e1c8ad6843e66eef34a1a63b06d01301d450cf1fda7d9f6da3`