[rpms/inn] epel10: replace downstream patch with upstream one

[rpms/inn] epel10: replace downstream patch with upstream one

[Dominik 'Rathann' Mierzejewski]

A new commit has been pushed.

Repo   : rpms/inn
Branch : epel10
Commit : 47a07c34431278312f147f638c917ae61d8e14ce
Author : Dominik 'Rathann' Mierzejewski <dominik@greysector.net>
Date   : 2021-02-16T15:59:51+01:00
Stats  : +19/-17 in 3 file(s)
URL    : https://src.fedoraproject.org/rpms/inn/c/47a07c34431278312f147f638c917ae61d8e14ce?branch=epel10

Log:
replace downstream patch with upstream one

---
diff --git a/inn-2.6.4-changeset-10541.patch b/inn-2.6.4-changeset-10541.patch
new file mode 100644
index 0000000..f2c90f7
--- /dev/null
+++ b/inn-2.6.4-changeset-10541.patch
@@ -0,0 +1,13 @@
+Index: /branches/2.6/tests/util/inndf.t
+===================================================================
+--- /branches/2.6/tests/util/inndf.t	(revision 10540)
++++ /branches/2.6/tests/util/inndf.t	(revision 10541)
+@@ -129,6 +129,6 @@
+     printcount "not ok"
+ fi
+-out=`$inndf -o`
+-if [ "$out" = "3.17% overview space used" ] ; then
++out=`$inndf -o | sed 's/\...%/\.00%/'`
++if [ "$out" = "3.00% overview space used" ] ; then
+     printcount "ok"
+ else

diff --git a/inn-2.6.4-ppc64le-inndf-test.patch b/inn-2.6.4-ppc64le-inndf-test.patch
deleted file mode 100644
index ad0be23..0000000
--- a/inn-2.6.4-ppc64le-inndf-test.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up inn-2.6.4/tests/util/inndf.t.orig inn-2.6.4/tests/util/inndf.t
---- inn-2.6.4/tests/util/inndf.t.orig	2021-01-21 22:53:07.000000000 +0100
-+++ inn-2.6.4/tests/util/inndf.t	2021-02-16 13:58:58.435897815 +0100
-@@ -129,7 +129,7 @@ else
-     printcount "not ok"
- fi
- out=`$inndf -o`
--if [ "$out" = "3.17% overview space used" ] ; then
-+if [ "$out" = "3.33% overview space used" ] ; then
-     printcount "ok"
- else
-     echo "$out"

diff --git a/inn.spec b/inn.spec
index 6352ff4..0121988 100644
--- a/inn.spec
+++ b/inn.spec
@@ -3,7 +3,7 @@
 Summary: The InterNetNews system, an Usenet news server
 Name: inn
 Version: 2.6.4
-Release: 1%{?dist}
+Release: 2%{?dist}
 #see LICENSE file for details
 License: GPLv2+ and BSD and MIT and Public Domain
 URL: https://www.eyrie.org/~eagle/software/inn/
@@ -22,7 +22,7 @@ Source24: innd-nntpsend.timer
 Source25: innd-rnews.service
 Source26: innd-rnews.timer
 Patch1: inn-2.6.4-rh.patch
-Patch2: inn-2.6.4-ppc64le-inndf-test.patch
+Patch2: https://inn.eyrie.org/trac/changeset/10541?format=diff&new=10541#/inn-2.6.4-changeset-10541.patch
 Patch4: inn-2.6.4-pie.patch
 BuildRequires: autoconf
 BuildRequires: byacc
@@ -115,9 +115,7 @@ This package contains dynamic libraries provided by INN project
 gpgv2 --keyring %{S:3} %{S:1} %{S:0}
 %setup -q -n inn-%{version}
 %patch1 -p1 -b .rh
-%ifarch ppc64le
-%patch2 -p1 -b .inndf
-%endif
+%patch2 -p3
 %patch4 -p1 -b .pie
 
 %build
@@ -619,6 +617,9 @@ fi
 %{_mandir}/man1/inews*
 
 %changelog
+* Tue Feb 16 2021 Dominik Mierzejewski <rpm@greysector.net> - 2.6.4-2
+- backport upstream patch to fix util/inndf test on ppc64le
+
 * Sun Feb 14 2021 Dominik Mierzejewski <rpm@greysector.net> - 2.6.4-1
 - update to 2.6.4
 - drop obsolete patch