Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild

Update to 2.21 fixes rhbz#2310316

.gitignore

@@ -17,3 +17,9 @@
 /ansifilter-2.14.tar.bz2
 /ansifilter-2.15.tar.bz2
 /ansifilter-2.16.tar.bz2
+/ansifilter-2.17.tar.bz2
+/ansifilter-2.18.tar.bz2
+/ansifilter-2.19.tar.bz2
+/ansifilter-2.20.tar.bz2
+/ansifilter-2.21.tar.bz2
+/ansifilter-2.22.tar.bz2

ansifilter.spec

@@ -1,11 +1,21 @@
 %global debug_package %{nil}
 %bcond_without  gui
+# Fedora has Qt6
+# EPEL9+ has Qt6, but RHEL9 and CentOS Stream 9 do not, while their 10 versions do
+%if (0%{?rhel} && 0%{?rhel} < 10)
+%global qt_ver 5
+%global qmake %{_qt5_qmake}
+%else
+%global qt_ver 6
+%global qmake %{_qt6_qmake}
+%endif
 
 Name:           ansifilter
-Version:        2.16
-Release:        1%{?dist}
+Version:        2.22
+Release:        %autorelease
 Summary:        ANSI terminal escape code converter
-License:        GPLv3+
+# Automatically converted from old format: GPLv3+ - review is highly recommended.
+License:        GPL-3.0-or-later
 URL:            http://www.andre-simon.de/doku/ansifilter/ansifilter.php
 Source0:        http://www.andre-simon.de/zip/%{name}-%{version}.tar.bz2
 BuildRequires:  gcc-c++
@@ -23,14 +33,15 @@ output (HTML, RTF, TeX, LaTeX, BBCode).
 %package        gui
 Summary:        GUI for %{name} based on Qt5
 BuildRequires:  desktop-file-utils
-BuildRequires:  qt5-qtbase-devel
+BuildRequires:  qt%{qt_ver}-qtbase-devel
+BuildRequires: make
 
 %description    gui
 Ansifilter handles text files containing ANSI terminal escape codes. The
 command sequences may be stripped or be interpreted to generate formatted
 output (HTML, RTF, TeX, LaTeX, BBCode).
 
-This is a GUI of %{name} based on Qt5.
+This is a GUI of %{name} based on Qt%{qt_ver}.
 %endif
 
 %prep
@@ -54,8 +65,8 @@ find . -type f -exec sed -i 's/\r$//' {} + -print
 %make_build CFLAGS+="%{optflags} -c" LDFLAGS="%{?__global_ldflags}"
 
 %if %{with gui}
-# %%_qt5_qmake will respect the redhat-rpm-config
-%make_build all-gui QMAKE="%{_qt5_qmake}"
+# %%_qt5/6_qmake will respect the redhat-rpm-config
+%make_build all-gui QMAKE="%{qmake}"
 %endif
 
 %install
@@ -75,6 +86,9 @@ rm -frv %{buildroot}%{_docdir}
 %license COPYING
 %{_bindir}/ansifilter
 %{_mandir}/man1/ansifilter.1*
+%{_datadir}/bash-completion/completions/ansifilter
+%{_datadir}/fish/vendor_completions.d/ansifilter.fish
+%{_datadir}/zsh/site-functions/_ansifilter
 
 %if %{with gui}
 %files gui
@@ -86,108 +100,4 @@ rm -frv %{buildroot}%{_docdir}
 %endif
 
 %changelog
-* Mon Feb 03 2020 Filipe Rosset <rosset.filipe@gmail.com> - 2.15-3
-- Update to 2.16 fixes rhbz#1796175
-
-* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.15-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
-* Mon Jan 20 2020 Filipe Rosset <rosset.filipe@gmail.com> - 2.15-1
-- Update to 2.15 fixes rhbz#1771191
-
-* Wed Jul 24 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.14-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Wed Apr 24 2019 Filipe Rosset <rosset.filipe@gmail.com> - 2.14-1
-- Updated to new 2.14 upstream version, fixes rhbz #1702469
-
-* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.13-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Tue Jan 01 2019 Filipe Rosset <rosset.filipe@gmail.com> - 2.13-1
-- Updated to new 2.13 upstream version
-
-* Thu Nov 15 2018 Filipe Rosset <rosset.filipe@gmail.com> - 2.12-1
-- Updated to new 2.12 upstream version
-
-* Sat Oct 27 2018 Filipe Rosset <rosset.filipe@gmail.com> - 2.11-1
-- Updated to new 2.11 upstream version
-- upstream changelog http://www.andre-simon.de/doku/ansifilter/en/changelog.php
-
-* Thu Jul 12 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.10-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
-
-* Sun Apr 08 2018 Filipe Rosset <rosset.filipe@gmail.com> - 2.10-2
-- added gcc-c++ as BR
-
-* Fri Mar 30 2018 Filipe Rosset <rosset.filipe@gmail.com> - 2.10-1
-- Updated to new 2.10 upstream version, fixes rhbz #1552957
-
-* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.8-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
-
-* Mon Aug 07 2017 Filipe Rosset <rosset.filipe@gmail.com> - 2.8-1
-- Updated to new 2.8 upstream version, fixes rhbz #1463860
-- Remove upstreamed patch
-
-* Wed Aug 02 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.6-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
-
-* Thu Jul 27 2017 Filipe Rosset <rosset.filipe@gmail.com> - 2.6-1
-- Updated to new 2.6 upstream version, fixes rhbz #1463860
-- Added patch to fix build issues with fpic and disable debug info packages
-
-* Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.4-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
-
-* Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.4-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
-
-* Thu Jan 05 2017 Filipe Rosset <rosset.filipe@gmail.com> - 2.4-1
-- Updated to new 2.4 upstream version, fixes rhbz #1409270
-
-* Thu Nov 03 2016 Filipe Rosset <rosset.filipe@gmail.com> - 2.3-1
-- Updated to new 2.3 upstream version, fixes rhbz #1380049
-
-* Fri Sep 16 2016 Filipe Rosset <rosset.filipe@gmail.com> - 2.2-1
-- Updated to new 2.2 upstream version, fixes rhbz #1376619
-
-* Tue Sep 13 2016 Filipe Rosset <rosset.filipe@gmail.com> - 2.1-1
-- Updated to new 2.1 upstream version, fixes rhbz #1352252 #1359434
-
-* Mon Jul 04 2016 Filipe Rosset <rosset.filipe@gmail.com> - 1.18-1
-- Updated to new 1.18 upstream version, fixes rhbz #1352252
-
-* Tue May 24 2016 Filipe Rosset <rosset.filipe@gmail.com> - 1.17-1
-- Updated to new 1.17 upstream version, fixes rhbz #1339022
-
-* Wed May 18 2016 Filipe Rosset <rosset.filipe@gmail.com> - 1.16-1
-- Updated to new 1.16 upstream version, build against qt5 instead of qt4
-
-* Wed Feb 03 2016 Fedora Release Engineering <releng@fedoraproject.org> - 1.12-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
-
-* Tue Jun 16 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.12-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
-
-* Sat May 02 2015 Kalev Lember <kalevlember@gmail.com> - 1.12-2
-- Rebuilt for GCC 5 C++11 ABI change
-
-* Tue Mar 31 2015 Christopher Meng <rpm@cicku.me> - 1.12-1
-- Update to 1.12
-
-* Mon Feb 16 2015 Christopher Meng <rpm@cicku.me> - 1.11-1
-- Update to 1.11
-
-* Fri Aug 15 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.8-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
-
-* Thu Jun 26 2014 Christopher Meng <rpm@cicku.me> - 1.8-2
-- Correct the license.
-- desktop file added for gui program.
-
-* Mon Apr 21 2014 Christopher Meng <rpm@cicku.me> - 1.8-1
-- Update to 1.8
-
-* Tue Dec 31 2013 Christopher Meng <rpm@cicku.me> - 1.7-1
-- Initial Package.
+%autochangelog

changelog

@@ -0,0 +1,160 @@
+* Thu Oct 03 2024 Moritz Barsnick <moritz+rpm@barsnick.net> 2.21-2
+- build with Qt6, except on RedHat < 10
+
+* Mon Sep 16 2024 Filipe Rosset <rosset.filipe@gmail.com> - 2.21-1
+- Update to 2.21 fixes rhbz#2310316
+
+* Thu Jul 25 2024 Miroslav Suchý <msuchy@redhat.com> - 2.20-6
+- convert license to SPDX
+
+* Wed Jul 17 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.20-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
+
+* Mon Jan 22 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.20-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Fri Jan 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.20-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Wed Jul 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.20-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
+* Sat Jun 17 2023 Filipe Rosset <rosset.filipe@gmail.com> - 2.20-1
+- Update to 2.20 fixes rhbz#2215705
+
+* Fri Mar 31 2023 Filipe Rosset <rosset.filipe@gmail.com> - 2.19-1
+- Update to 2.19 fixes rhbz#2178834
+
+* Wed Jan 18 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.18-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
+* Wed Jul 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.18-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
+* Wed Jan 19 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.18-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
+* Wed Jul 21 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.18-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
+* Fri Feb 05 2021 Filipe Rosset <rosset.filipe@gmail.com> - 2.18-1
+- Update to 2.18 fixes rhbz#1925318
+
+* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.17-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Wed Dec 30 2020 Filipe Rosset <rosset.filipe@gmail.com> - 2.17-1
+- Update to 2.17 fixes rhbz#1884414
+
+* Fri Jul 31 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.16-3
+- Second attempt - Rebuilt for
+  https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.16-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Mon Feb 03 2020 Filipe Rosset <rosset.filipe@gmail.com> - 2.15-3
+- Update to 2.16 fixes rhbz#1796175
+
+* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.15-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Mon Jan 20 2020 Filipe Rosset <rosset.filipe@gmail.com> - 2.15-1
+- Update to 2.15 fixes rhbz#1771191
+
+* Wed Jul 24 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.14-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Wed Apr 24 2019 Filipe Rosset <rosset.filipe@gmail.com> - 2.14-1
+- Updated to new 2.14 upstream version, fixes rhbz #1702469
+
+* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.13-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Tue Jan 01 2019 Filipe Rosset <rosset.filipe@gmail.com> - 2.13-1
+- Updated to new 2.13 upstream version
+
+* Thu Nov 15 2018 Filipe Rosset <rosset.filipe@gmail.com> - 2.12-1
+- Updated to new 2.12 upstream version
+
+* Sat Oct 27 2018 Filipe Rosset <rosset.filipe@gmail.com> - 2.11-1
+- Updated to new 2.11 upstream version
+- upstream changelog http://www.andre-simon.de/doku/ansifilter/en/changelog.php
+
+* Thu Jul 12 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.10-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
+* Sun Apr 08 2018 Filipe Rosset <rosset.filipe@gmail.com> - 2.10-2
+- added gcc-c++ as BR
+
+* Fri Mar 30 2018 Filipe Rosset <rosset.filipe@gmail.com> - 2.10-1
+- Updated to new 2.10 upstream version, fixes rhbz #1552957
+
+* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.8-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
+
+* Mon Aug 07 2017 Filipe Rosset <rosset.filipe@gmail.com> - 2.8-1
+- Updated to new 2.8 upstream version, fixes rhbz #1463860
+- Remove upstreamed patch
+
+* Wed Aug 02 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.6-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
+
+* Thu Jul 27 2017 Filipe Rosset <rosset.filipe@gmail.com> - 2.6-1
+- Updated to new 2.6 upstream version, fixes rhbz #1463860
+- Added patch to fix build issues with fpic and disable debug info packages
+
+* Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.4-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
+
+* Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.4-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
+
+* Thu Jan 05 2017 Filipe Rosset <rosset.filipe@gmail.com> - 2.4-1
+- Updated to new 2.4 upstream version, fixes rhbz #1409270
+
+* Thu Nov 03 2016 Filipe Rosset <rosset.filipe@gmail.com> - 2.3-1
+- Updated to new 2.3 upstream version, fixes rhbz #1380049
+
+* Fri Sep 16 2016 Filipe Rosset <rosset.filipe@gmail.com> - 2.2-1
+- Updated to new 2.2 upstream version, fixes rhbz #1376619
+
+* Tue Sep 13 2016 Filipe Rosset <rosset.filipe@gmail.com> - 2.1-1
+- Updated to new 2.1 upstream version, fixes rhbz #1352252 #1359434
+
+* Mon Jul 04 2016 Filipe Rosset <rosset.filipe@gmail.com> - 1.18-1
+- Updated to new 1.18 upstream version, fixes rhbz #1352252
+
+* Tue May 24 2016 Filipe Rosset <rosset.filipe@gmail.com> - 1.17-1
+- Updated to new 1.17 upstream version, fixes rhbz #1339022
+
+* Wed May 18 2016 Filipe Rosset <rosset.filipe@gmail.com> - 1.16-1
+- Updated to new 1.16 upstream version, build against qt5 instead of qt4
+
+* Wed Feb 03 2016 Fedora Release Engineering <releng@fedoraproject.org> - 1.12-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
+
+* Tue Jun 16 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.12-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
+
+* Sat May 02 2015 Kalev Lember <kalevlember@gmail.com> - 1.12-2
+- Rebuilt for GCC 5 C++11 ABI change
+
+* Tue Mar 31 2015 Christopher Meng <rpm@cicku.me> - 1.12-1
+- Update to 1.12
+
+* Mon Feb 16 2015 Christopher Meng <rpm@cicku.me> - 1.11-1
+- Update to 1.11
+
+* Fri Aug 15 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.8-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
+
+* Thu Jun 26 2014 Christopher Meng <rpm@cicku.me> - 1.8-2
+- Correct the license.
+- desktop file added for gui program.
+
+* Mon Apr 21 2014 Christopher Meng <rpm@cicku.me> - 1.8-1
+- Update to 1.8
+
+* Tue Dec 31 2013 Christopher Meng <rpm@cicku.me> - 1.7-1
+- Initial Package.

sources

@@ -1 +1 @@
-SHA512 (ansifilter-2.16.tar.bz2) = ef621087e6d522e08423802d223f826f2fd6fe3b2efd8ed26e09f64e666202cdcdf68d19ebe5ac4b858a4339a8aa4d5f2ba309efa310837808381e09e39d4f90
+SHA512 (ansifilter-2.22.tar.bz2) = 6f76532cef0f4083dfbf95a9e945d490388c8308401d03b715dc67eb0d0b76c1533d7abb329b986dfac44cbdf141b9783994041d54a44c5b47f3bd34d3489c97