.fmf/version

@@ -1 +0,0 @@
-1

paps-0.6.8-ftbfs.patch

@@ -1,13 +0,0 @@
-バイナリーファイル paps-0.6.8.orig/src/paps-paps.o とpaps-0.6.8/src/paps-paps.o は異なります
-diff -pruN paps-0.6.8.orig/src/paps.c paps-0.6.8/src/paps.c
---- paps-0.6.8.orig/src/paps.c	2025-01-27 18:18:12.130570673 +0900
-+++ paps-0.6.8/src/paps.c	2025-01-27 18:47:05.214883811 +0900
-@@ -515,7 +515,7 @@ int main(int argc, char *argv[])
-   } /* if (!cups_mode) */
-   
-   paps = paps_new();
--  pango_context = paps_get_pango_context (paps);
-+  pango_context = paps_get_pango_context ();
-   
-   /* Setup pango */
-   pango_context_set_language (pango_context, get_language ());

paps-0.6.8-glib282.patch

@@ -1,12 +0,0 @@
-diff -pruN paps-0.6.8.orig/src/paps.c paps-0.6.8/src/paps.c
---- paps-0.6.8.orig/src/paps.c	2024-09-13 21:07:13.225683344 +0900
-+++ paps-0.6.8/src/paps.c	2024-09-13 21:10:24.177041518 +0900
-@@ -784,7 +784,7 @@ split_text_into_paragraphs (PangoContext
-       while (p != NULL && *p)
-         {
-           wc = g_utf8_get_char (p);
--          next = g_utf8_next_char (p);
-+          next = (char *) g_utf8_next_char (p);
-           if (wc == (gunichar)-1)
-             {
-               fprintf (stderr, "%s: Invalid character in input\n", g_get_prgname ());

paps-fix-cpi.patch

@@ -310,7 +310,7 @@ index 334d547..72dbaad 100644
 +
 +			      para->length = i;
 +			      next = g_utf8_offset_to_pointer(para->text, para->length);
-+			      wc = g_utf8_get_char(g_utf8_prev_char(next));
++			      wc = g_utf8_prev_char(next);
 +		      } else {
 +			      pango_layout_set_text(para->layout, para->text, para->length);
 +		      }

paps-glib282.patch

@@ -1,34 +0,0 @@
-g_utf8_next_char no longer includes a cast to char* as of 2.81.0:
-
-https://gitlab.gnome.org/GNOME/glib/-/merge_requests/4016
-
-diff -up a/src/paps.cc b/src/paps.cc
---- a/src/paps.cc	2024-09-12 19:21:02.858439427 -0400
-+++ b/src/paps.cc	2024-09-12 21:15:46.905955152 -0400
-@@ -1115,7 +1115,7 @@ split_text_into_paragraphs (PangoContext
-       while (p != nullptr && *p)
-         {
-           wc = g_utf8_get_char (p);
--          next = g_utf8_next_char (p);
-+          next = (char *) g_utf8_next_char (p);
-           if (wc == (gunichar)-1)
-             {
-               fprintf (stderr, _("%s: Invalid character in input\n"), g_get_prgname ());
-@@ -1130,7 +1130,7 @@ split_text_into_paragraphs (PangoContext
-               para->length = p - last_para;
-               /* handle dos line breaks */
-               if (wc == '\r' && *next == '\n')
--                  next = g_utf8_next_char(next);
-+                  next = (char *) g_utf8_next_char(next);
-               para->layout = pango_layout_new (pango_context);
- 
-               if (page_layout->cpi > 0.0L)
-@@ -1201,7 +1201,7 @@ split_text_into_paragraphs (PangoContext
-                       g_free (newtext);
- 
-                       para->length = i;
--                      next = g_utf8_offset_to_pointer (para->text, para->length);
-+                      next = (char *) g_utf8_offset_to_pointer (para->text, para->length);
-                       wc = g_utf8_get_char (g_utf8_prev_char (next));
-                     }
-                   else

paps.spec

@@ -1,6 +1,6 @@
 Name:           paps
 Version:        0.8.0
-Release:        14%{?dist}
+Release:        2%{?dist}
 
 License:        LGPL-2.0-or-later
 URL:            https://github.com/dov/paps
@@ -44,12 +44,9 @@ Patch60:        %{name}-a3.patch
 ## rhbz#1214939
 Patch61:	%{name}-fix-paper-size-truncate.patch
 Patch62:	paps-c99.patch
-Patch63:	paps-0.6.8-glib282.patch
-Patch64:	paps-0.6.8-ftbfs.patch
 ### For paps
 Patch100:	%{name}-fix-src-to-paps.patch
 Patch101:	%{name}-fix-build.patch
-Patch102:	%{name}-glib282.patch
 
 Summary:        Plain Text to PostScript converter
 %description
@@ -69,31 +66,28 @@ This package contains a CUPS filter based on paps.
 
 %prep
 %setup -q -a 3
-%patch 100 -p1 -b .src-to-paps
-%patch 101 -p1 -b .build
-%patch 102 -p1 -b .glib282
+%patch100 -p1 -b .src-to-paps
+%patch101 -p1 -b .build
 pushd %{name}-0.6.8
-%patch 0 -p1 -b .shared
-%patch 1 -p1 -b .wordwrap
-%patch 2 -p1 -b .langinfo
-%patch 3 -p1 -b .lcnumeric
-%patch 4 -p1 -b .exitcode
-%patch 5 -p1 -b .manpage
-%patch 50 -p1 -b .cups
-%patch 51 -p1 -b .cpilpi
-%patch 52 -p1 -b .dsc
-%patch 53 -p1 -b .autoconf262
-%patch 54 -p1 -b .fixcpi
-%patch 55 -p1 -b .loop
-%patch 56 -p1 -b .tab
-%patch 57 -p1 -b .weak-symbol
-%patch 58 -p1 -b .fsf
-%patch 59 -p1 -b .ft-header
-%patch 60 -p1 -b .a3
-%patch 61 -p1 -b .paper-size
-%patch 62 -p2 -b .configure-c99
-%patch 63 -p1 -b .glib282
-%patch 64 -p1 -b .ftbfs
+%patch0 -p1 -b .shared
+%patch1 -p1 -b .wordwrap
+%patch2 -p1 -b .langinfo
+%patch3 -p1 -b .lcnumeric
+%patch4 -p1 -b .exitcode
+%patch5 -p1 -b .manpage
+%patch50 -p1 -b .cups
+%patch51 -p1 -b .cpilpi
+%patch52 -p1 -b .dsc
+%patch53 -p1 -b .autoconf262
+%patch54 -p1 -b .fixcpi
+%patch55 -p1 -b .loop
+%patch56 -p1 -b .tab
+%patch57 -p1 -b .weak-symbol
+%patch58 -p1 -b .fsf
+%patch59 -p1 -b .ft-header
+%patch60 -p1 -b .a3
+%patch61 -p1 -b .paper-size
+%patch62 -p2 -b .configure-c99
 libtoolize -f -c
 autoreconf -f -i
 popd
@@ -101,10 +95,6 @@ popd
 
 %build
 ./autogen.sh
-%set_build_flags
-%if 0%{?rhel}
-CXXFLAGS="$CXXFLAGS -DFMT_HEADER_ONLY"
-%endif
 %configure --disable-static
 make %{?_smp_mflags}
 
@@ -141,7 +131,6 @@ make install DESTDIR=$RPM_BUILD_ROOT INSTALL="/usr/bin/install -p"
 
 %files
 %doc AUTHORS COPYING.LIB README
-%dir %{_datadir}/paps
 %{_bindir}/paps
 %{_bindir}/src-to-paps
 %{_datadir}/paps/pango_markup.outlang
@@ -157,46 +146,6 @@ make install DESTDIR=$RPM_BUILD_ROOT INSTALL="/usr/bin/install -p"
 
 
 %changelog
-* Thu Jul 24 2025 Fedora Release Engineering <releng@fedoraproject.org> - 0.8.0-14
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
-
-* Mon Jan 27 2025 Akira TAGOH <tagoh@redhat.com> - 0.8.0-13
-- Fix FTBFS
-  Resolves: rhbz#2341001
-
-* Fri Jan 17 2025 Fedora Release Engineering <releng@fedoraproject.org> - 0.8.0-12
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
-
-* Fri Sep 13 2024 Akira TAGOH <tagoh@redhat.com> - 0.8.0-11
-- Fix build with glib 2.82
-  Patch from Yaakov Selkowitz
-
-* Thu Jul 18 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.8.0-10
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
-
-* Fri Jun  7 2024 Akira TAGOH <tagoh@redhat.com> - 0.8.0-9
-- Own /usr/share/paps
-  Resolves: rhbz#2283284
-
-* Thu Jan 25 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.8.0-8
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Sun Jan 21 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.8.0-7
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Wed Jan 17 2024 Akira TAGOH <tagoh@redhat.com> - 0.8.0-6
-- Fix C type error in paps 0.6.8.
-  Resolves: rhbz#2256906
-
-* Mon Aug 14 2023 Yaakov Selkowitz <yselkowi@redhat.com> - 0.8.0-5
-- Use fmt in header-only mode in RHEL builds
-
-* Thu Jul 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 0.8.0-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
-
-* Wed Jun 28 2023 Vitaly Zaitsev <vitaly@easycoding.org> - 0.8.0-3
-- Rebuilt due to fmt 10 update.
-
 * Thu Apr 13 2023 Florian Weimer <fweimer@redhat.com> - 0.8.0-2
 - C99 compatibility fixes for paps 0.6.8
 

plans/basic.fmf

@@ -1,5 +0,0 @@
-summary: Basic smoke test
-discover:
-    how: fmf
-execute:
-    how: tmt

tests/basic/main.fmf

@@ -1,5 +0,0 @@
-summary: Basic test
-require:
-    - paps
-test: ./test.sh
-framework: beakerlib

tests/basic/test.sh

@@ -1,21 +0,0 @@
-#!/bin/bash
-# vim: dict+=/usr/share/beakerlib/dictionary.vim cpt=.,w,b,u,t,i,k
-. /usr/share/beakerlib/beakerlib.sh || exit 1
-
-rlJournalStart
-    rlPhaseStartSetup
-        rlRun "tmp=\$(mktemp -d)" 0 "Create tmp directory"
-        rlRun "pushd $tmp"
-        rlRun "set -o pipefail"
-    rlPhaseEnd
-
-    rlPhaseStartTest
-        rlRun "paps --help | tee output" 0 "Check help message"
-        rlAssertGrep "paps" "output"
-    rlPhaseEnd
-
-    rlPhaseStartCleanup
-        rlRun "popd"
-        rlRun "rm -r $tmp" 0 "Remove tmp directory"
-    rlPhaseEnd
-rlJournalEnd