From 2e5913d2318f6af4dc1beaa88a162ed9dc6bdac2 Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Wed, 4 Sep 2019 12:02:06 -0500 Subject: [PATCH 01/33] "Adding package.cfg file" --- package.cfg | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 package.cfg diff --git a/package.cfg b/package.cfg new file mode 100644 index 0000000..66ea79d --- /dev/null +++ b/package.cfg @@ -0,0 +1,2 @@ +[koji] +targets = epel8 epel8-playground \ No newline at end of file From 153f5ecaaee238c1581e234b694332274918bb9e Mon Sep 17 00:00:00 2001 From: Christoph Junghans Date: Fri, 20 Sep 2019 22:16:23 -0600 Subject: [PATCH 02/33] bump to 2.6, switch to python3 (bug #1751486) --- .gitignore | 3 ++ sources | 3 +- txt2tags.spec | 99 +++++++++++---------------------------------------- 3 files changed, 25 insertions(+), 80 deletions(-) diff --git a/.gitignore b/.gitignore index e78decb..b3c3d3f 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,4 @@ txt2tags-2.5.tgz +/2.6.tar.gz +/txt2tags.py +/txt2tags*.src.rpm diff --git a/sources b/sources index d7325e2..281e48e 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ -e4d4553651b5be0711263378ca133c43 txt2tags-2.5.tgz +SHA512 (2.6.tar.gz) = 7136f79ff99a03f46bc9633a6b401d0fbe24c8bd9203d34067838bbd0809a79411bcd1f8e2bdcb8b2e4a3936f34713369406db826c36a7c4d67bb7828cf4fa34 +SHA512 (txt2tags.py) = 0a01a271a337e20b7037a34eb74dfeea75a710e70bd4c3dd9a04f12185b098181099ab8834f035d4ae72d08994a40cbb4787ce3e5d95ecc0224f21fa1211d721 diff --git a/txt2tags.spec b/txt2tags.spec index 5b89784..d4bf641 100644 --- a/txt2tags.spec +++ b/txt2tags.spec @@ -1,18 +1,17 @@ -Name: txt2tags -Summary: Summary: Converts text files to HTML, XHTML, LaTeX, and other formats -Version: 2.5 -Release: 23%{?dist} -License: GPLv2 -URL: http://txt2tags.sourceforge.net/ +Name: txt2tags +Summary: Summary: Converts text files to HTML, XHTML, LaTeX, and other formats +Version: 2.6 +Release: 1%{?dist} +License: GPLv2 +URL: http://txt2tags.sourceforge.net/ -Source0: http://txt2tags.googlecode.com/files/txt2tags-%{version}.tgz +Source0: https://github.com/txt2tags/txt2tags/archive/%{version}.tar.gz +Source1: https://raw.githubusercontent.com/jendrikseipp/rednotebook/master/rednotebook/external/txt2tags.py BuildArch: noarch -BuildRequires: python2 -BuildRequires: gettext - -Requires: python2 +BuildRequires: python3-devel +Requires: python3 %description Txt2tags is a document generator. It reads a text file with minimal markup as @@ -33,86 +32,28 @@ Txt2tags is a document generator. It reads a text file with minimal markup as * Plain text %prep -#NONE - %setup -q -#Remove executable flag -chmod 0644 extras/* - -#Create locale files -for file in $(ls -1 po/*.po); do - msgfmt -o ${file//.po/.mo} $file -done +cp %{S:1} txt2tags %build #NONE %install -#For sanity protection, nuke buildroot -rm -rf %{buildroot} - #Install the executable install -Dp -m0755 txt2tags %{buildroot}%{_bindir}/txt2tags -sed -i '1s/python/&2/' %{buildroot}%{_bindir}/txt2tags +sed -i '1s/python/&3/' %{buildroot}%{_bindir}/txt2tags +install -Dp -m0644 doc/English/manpage.man %{buildroot}%{_mandir}/man1/txt2tags.1 -#Install manpages -install -Dp -m0644 doc/manpage.man %{buildroot}%{_mandir}/man1/txt2tags.1 -for file in $(ls -1 doc/manpage-*.man); do - lang="${file##doc/manpage-}" - lang="${lang%%.man}" - install -Dp -m0644 $file %{buildroot}%{_mandir}/$lang/man1/txt2tags.1 -done - -#Install locale(s) -for file in $(ls -1 po/*.mo); do - basename="${file##po/}" - lang="${basename%%.mo}" - install -Dp -m0644 $file %{buildroot}%{_datadir}/locale/$lang/LC_MESSAGES/txt2tags.mo -done - -# Install extras without Mac OS files - Thanks to Kairo Araujo -for extras in $(ls -1 extras/ | grep -v .__); do - install -Dp -m0644 extras/$extras $RPM_BUILD_ROOT%{_datadir}/doc/%{name}/extras/$extras - iconv -f iso8859-1 -t UTF-8 $RPM_BUILD_ROOT%{_datadir}/doc/%{name}/extras/$extras > $RPM_BUILD_ROOT%{_datadir}/doc/%{name}/extras/$extras.tmp - mv -f $RPM_BUILD_ROOT%{_datadir}/doc/%{name}/extras/$extras.tmp $RPM_BUILD_ROOT%{_datadir}/doc/%{name}/extras/$extras -done - -#get rid of the .mgp files as they are not applicable anymore -rm -f samples/*.mgp - -# Install samples without Mac OS files - Thanks to Kairo Araujo -for samples in $(ls -1 samples/sample*); do - install -Dp -m0644 $samples $RPM_BUILD_ROOT%{_datadir}/doc/%{name}/$samples - iconv -f iso8859-1 -t UTF-8 $RPM_BUILD_ROOT%{_datadir}/doc/%{name}/$samples > $RPM_BUILD_ROOT%{_datadir}/doc/%{name}/$samples.tmp - mv -f $RPM_BUILD_ROOT%{_datadir}/doc/%{name}/$samples.tmp $RPM_BUILD_ROOT%{_datadir}/doc/%{name}/$samples -done - -for samples_css in $(ls -1 samples/css/*); do - install -Dp -m0644 $samples_css $RPM_BUILD_ROOT%{_datadir}/doc/%{name}/$samples_css -done -for sample_img in $(ls -1 samples/img/*); do - install -Dp -m0644 $sample_img $RPM_BUILD_ROOT%{_datadir}/doc/%{name}/$sample_img -done -for sample_module in $(ls -1 samples/module/*); do - install -Dp -m0644 $sample_module $RPM_BUILD_ROOT%{_datadir}/doc/%{name}/$sample_module -done - - -%find_lang %{name} - -%files -f %{name}.lang -%doc ChangeLog COPYING README TODO doc/*.pdf extras/ samples/ -%doc %{_mandir}/man1/txt2tags.1* -%doc %{_mandir}/*/man1/txt2tags.1* +%files +%doc ChangeLog README +%license COPYING %{_bindir}/txt2tags -%dir %{_docdir}/%{name} -%dir %{_docdir}/%{name}/extras -%dir %{_docdir}/%{name}/samples -%{_docdir}/%{name}/extras/* -%{_docdir}/%{name}/samples/* - +%{_mandir}/man1/txt2tags.1.* %changelog +* Fri Sep 20 2019 Christoph Junghans - 2.6-1 +- bump to 2.6, switch to python3 (bug #1751486) + * Fri Aug 23 2019 Christoph Junghans - 2.5-23 - fix python dep From 1c6f6ac8ce6cda680521a50252cd0017215df05b Mon Sep 17 00:00:00 2001 From: Christoph Junghans Date: Mon, 23 Sep 2019 08:35:35 -0600 Subject: [PATCH 03/33] Add more python3.8 fixes by Jendrik Seipp --- sources | 2 +- txt2tags.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/sources b/sources index 281e48e..5a75a22 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ +SHA512 (txt2tags.py) = e0d03f650e83e5519cd92c5b1b686589a7c3591e14bfd7b685b61787e2cb98f648e909ef0159477523c91ea135b911a728ce1c7caec66f6770e33f13d90443e9 SHA512 (2.6.tar.gz) = 7136f79ff99a03f46bc9633a6b401d0fbe24c8bd9203d34067838bbd0809a79411bcd1f8e2bdcb8b2e4a3936f34713369406db826c36a7c4d67bb7828cf4fa34 -SHA512 (txt2tags.py) = 0a01a271a337e20b7037a34eb74dfeea75a710e70bd4c3dd9a04f12185b098181099ab8834f035d4ae72d08994a40cbb4787ce3e5d95ecc0224f21fa1211d721 diff --git a/txt2tags.spec b/txt2tags.spec index d4bf641..97c236c 100644 --- a/txt2tags.spec +++ b/txt2tags.spec @@ -1,7 +1,7 @@ Name: txt2tags Summary: Summary: Converts text files to HTML, XHTML, LaTeX, and other formats Version: 2.6 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2 URL: http://txt2tags.sourceforge.net/ @@ -51,6 +51,9 @@ install -Dp -m0644 doc/English/manpage.man %{buildroot}%{_mandir}/man1/txt2tags. %{_mandir}/man1/txt2tags.1.* %changelog +* Mon Sep 23 2019 Christoph Junghans - 2.6-2 +- Add more python3.8 fixes by Jendrik Seipp + * Fri Sep 20 2019 Christoph Junghans - 2.6-1 - bump to 2.6, switch to python3 (bug #1751486) From 3c1d15d98c8ef78b58f3177b13894b565850336a Mon Sep 17 00:00:00 2001 From: Christoph Junghans Date: Fri, 6 Dec 2019 14:41:02 -0700 Subject: [PATCH 04/33] Version bump to 3.3 --- txt2tags.spec | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/txt2tags.spec b/txt2tags.spec index 97c236c..88093d6 100644 --- a/txt2tags.spec +++ b/txt2tags.spec @@ -1,12 +1,12 @@ Name: txt2tags Summary: Summary: Converts text files to HTML, XHTML, LaTeX, and other formats -Version: 2.6 -Release: 2%{?dist} +Version: 3.3 +Release: 1%{?dist} License: GPLv2 URL: http://txt2tags.sourceforge.net/ -Source0: https://github.com/txt2tags/txt2tags/archive/%{version}.tar.gz -Source1: https://raw.githubusercontent.com/jendrikseipp/rednotebook/master/rednotebook/external/txt2tags.py +# https://github.com/txt2tags/txt2tags/issues/207#issuecomment-544905237 +Source0: https://github.com/jendrikseipp/txt2tags/archive/%{version}.tar.gz BuildArch: noarch @@ -33,24 +33,25 @@ Txt2tags is a document generator. It reads a text file with minimal markup as %prep %setup -q -cp %{S:1} txt2tags %build -#NONE +%{py3_build} %install -#Install the executable -install -Dp -m0755 txt2tags %{buildroot}%{_bindir}/txt2tags -sed -i '1s/python/&3/' %{buildroot}%{_bindir}/txt2tags -install -Dp -m0644 doc/English/manpage.man %{buildroot}%{_mandir}/man1/txt2tags.1 +%{py3_install} %files -%doc ChangeLog README +%doc CHANGELOG.md README.md %license COPYING %{_bindir}/txt2tags -%{_mandir}/man1/txt2tags.1.* +%{python3_sitelib}/%{name}-%{version}-py%{python3_version}.egg-info +%{python3_sitelib}/%{name}.py +%{python3_sitelib}/__pycache__/%{name}* %changelog +* Fri Dec 06 2019 Christoph Junghans - 3.3-1 +- Version bump to 3.3 + * Mon Sep 23 2019 Christoph Junghans - 2.6-2 - Add more python3.8 fixes by Jendrik Seipp From 0b298371935546444f8a1b2dedb2a15c8c8b1c7e Mon Sep 17 00:00:00 2001 From: Christoph Junghans Date: Fri, 6 Dec 2019 14:49:30 -0700 Subject: [PATCH 05/33] added missing tarball --- .gitignore | 1 + sources | 3 +-- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index b3c3d3f..cef1096 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ txt2tags-2.5.tgz /2.6.tar.gz /txt2tags.py /txt2tags*.src.rpm +/3.3.tar.gz diff --git a/sources b/sources index 5a75a22..4af9d88 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -SHA512 (txt2tags.py) = e0d03f650e83e5519cd92c5b1b686589a7c3591e14bfd7b685b61787e2cb98f648e909ef0159477523c91ea135b911a728ce1c7caec66f6770e33f13d90443e9 -SHA512 (2.6.tar.gz) = 7136f79ff99a03f46bc9633a6b401d0fbe24c8bd9203d34067838bbd0809a79411bcd1f8e2bdcb8b2e4a3936f34713369406db826c36a7c4d67bb7828cf4fa34 +SHA512 (3.3.tar.gz) = a52de3f5226d85af006304a9063b5dd01df2627a45670a91b954f758cb920648f86699acab5cd7822c0183e93eed110ddc7dd8d156b0eccbe1541e7fbc2bdb22 From 5c0658c61df5a8c919152c140dcf21b9a4d4f151 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 31 Jan 2020 02:21:18 +0000 Subject: [PATCH 06/33] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- txt2tags.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/txt2tags.spec b/txt2tags.spec index 88093d6..e5d5ff4 100644 --- a/txt2tags.spec +++ b/txt2tags.spec @@ -1,7 +1,7 @@ Name: txt2tags Summary: Summary: Converts text files to HTML, XHTML, LaTeX, and other formats Version: 3.3 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2 URL: http://txt2tags.sourceforge.net/ @@ -49,6 +49,9 @@ Txt2tags is a document generator. It reads a text file with minimal markup as %{python3_sitelib}/__pycache__/%{name}* %changelog +* Fri Jan 31 2020 Fedora Release Engineering - 3.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Fri Dec 06 2019 Christoph Junghans - 3.3-1 - Version bump to 3.3 From ba26c01c06e500e2914844a774546bf550440ece Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Tue, 26 May 2020 03:53:48 +0200 Subject: [PATCH 07/33] Rebuilt for Python 3.9 --- txt2tags.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/txt2tags.spec b/txt2tags.spec index e5d5ff4..bbb8473 100644 --- a/txt2tags.spec +++ b/txt2tags.spec @@ -1,7 +1,7 @@ Name: txt2tags Summary: Summary: Converts text files to HTML, XHTML, LaTeX, and other formats Version: 3.3 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2 URL: http://txt2tags.sourceforge.net/ @@ -49,6 +49,9 @@ Txt2tags is a document generator. It reads a text file with minimal markup as %{python3_sitelib}/__pycache__/%{name}* %changelog +* Tue May 26 2020 Miro Hrončok - 3.3-3 +- Rebuilt for Python 3.9 + * Fri Jan 31 2020 Fedora Release Engineering - 3.3-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild From ba7d023a2691d850bfb082eb5494c2453842f5d1 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 29 Jul 2020 13:06:26 +0000 Subject: [PATCH 08/33] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- txt2tags.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/txt2tags.spec b/txt2tags.spec index bbb8473..0ed8090 100644 --- a/txt2tags.spec +++ b/txt2tags.spec @@ -1,7 +1,7 @@ Name: txt2tags Summary: Summary: Converts text files to HTML, XHTML, LaTeX, and other formats Version: 3.3 -Release: 3%{?dist} +Release: 4%{?dist} License: GPLv2 URL: http://txt2tags.sourceforge.net/ @@ -49,6 +49,9 @@ Txt2tags is a document generator. It reads a text file with minimal markup as %{python3_sitelib}/__pycache__/%{name}* %changelog +* Wed Jul 29 2020 Fedora Release Engineering - 3.3-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Tue May 26 2020 Miro Hrončok - 3.3-3 - Rebuilt for Python 3.9 From 5a1ca9d40d60c97d34a2dca7debbec1c581ce576 Mon Sep 17 00:00:00 2001 From: Troy Dawson Date: Thu, 24 Sep 2020 18:32:32 +0000 Subject: [PATCH 09/33] remove package.cfg per new epel-playground policy --- package.cfg | 2 -- 1 file changed, 2 deletions(-) delete mode 100644 package.cfg diff --git a/package.cfg b/package.cfg deleted file mode 100644 index 66ea79d..0000000 --- a/package.cfg +++ /dev/null @@ -1,2 +0,0 @@ -[koji] -targets = epel8 epel8-playground \ No newline at end of file From 7d8b6f1b8ffd4fe6642c2dc02ae98398539b6f84 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 27 Jan 2021 22:30:05 +0000 Subject: [PATCH 10/33] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- txt2tags.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/txt2tags.spec b/txt2tags.spec index 0ed8090..88efee5 100644 --- a/txt2tags.spec +++ b/txt2tags.spec @@ -1,7 +1,7 @@ Name: txt2tags Summary: Summary: Converts text files to HTML, XHTML, LaTeX, and other formats Version: 3.3 -Release: 4%{?dist} +Release: 5%{?dist} License: GPLv2 URL: http://txt2tags.sourceforge.net/ @@ -49,6 +49,9 @@ Txt2tags is a document generator. It reads a text file with minimal markup as %{python3_sitelib}/__pycache__/%{name}* %changelog +* Wed Jan 27 2021 Fedora Release Engineering - 3.3-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Wed Jul 29 2020 Fedora Release Engineering - 3.3-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From 2c950371ea9dea2bebb86e37cf93e738adfab5dc Mon Sep 17 00:00:00 2001 From: Tomas Hrnciar Date: Thu, 6 May 2021 20:55:52 +0200 Subject: [PATCH 11/33] Add BuildRequire on setuptools --- txt2tags.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/txt2tags.spec b/txt2tags.spec index 88efee5..f1a4858 100644 --- a/txt2tags.spec +++ b/txt2tags.spec @@ -11,6 +11,7 @@ Source0: https://github.com/jendrikseipp/txt2tags/archive/%{version}.tar.gz BuildArch: noarch BuildRequires: python3-devel +BuildRequires: python3-setuptools Requires: python3 %description From c70e7a2ba33d74363083bfaf23ae1368eb84ac1d Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 4 Jun 2021 21:18:36 +0200 Subject: [PATCH 12/33] Rebuilt for Python 3.10 --- txt2tags.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/txt2tags.spec b/txt2tags.spec index f1a4858..8326822 100644 --- a/txt2tags.spec +++ b/txt2tags.spec @@ -1,7 +1,7 @@ Name: txt2tags Summary: Summary: Converts text files to HTML, XHTML, LaTeX, and other formats Version: 3.3 -Release: 5%{?dist} +Release: 6%{?dist} License: GPLv2 URL: http://txt2tags.sourceforge.net/ @@ -50,6 +50,9 @@ Txt2tags is a document generator. It reads a text file with minimal markup as %{python3_sitelib}/__pycache__/%{name}* %changelog +* Fri Jun 04 2021 Python Maint - 3.3-6 +- Rebuilt for Python 3.10 + * Wed Jan 27 2021 Fedora Release Engineering - 3.3-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From 54f05ea5f3cc16f1787cfc9436accbf0f3854074 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 23 Jul 2021 19:51:16 +0000 Subject: [PATCH 13/33] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- txt2tags.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/txt2tags.spec b/txt2tags.spec index 8326822..3dada7c 100644 --- a/txt2tags.spec +++ b/txt2tags.spec @@ -1,7 +1,7 @@ Name: txt2tags Summary: Summary: Converts text files to HTML, XHTML, LaTeX, and other formats Version: 3.3 -Release: 6%{?dist} +Release: 7%{?dist} License: GPLv2 URL: http://txt2tags.sourceforge.net/ @@ -50,6 +50,9 @@ Txt2tags is a document generator. It reads a text file with minimal markup as %{python3_sitelib}/__pycache__/%{name}* %changelog +* Fri Jul 23 2021 Fedora Release Engineering - 3.3-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Fri Jun 04 2021 Python Maint - 3.3-6 - Rebuilt for Python 3.10 From c6bf8ddbf6cdac719957665e7a04001ea8206507 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jan 2022 03:20:18 +0000 Subject: [PATCH 14/33] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- txt2tags.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/txt2tags.spec b/txt2tags.spec index 3dada7c..b154d3e 100644 --- a/txt2tags.spec +++ b/txt2tags.spec @@ -1,7 +1,7 @@ Name: txt2tags Summary: Summary: Converts text files to HTML, XHTML, LaTeX, and other formats Version: 3.3 -Release: 7%{?dist} +Release: 8%{?dist} License: GPLv2 URL: http://txt2tags.sourceforge.net/ @@ -50,6 +50,9 @@ Txt2tags is a document generator. It reads a text file with minimal markup as %{python3_sitelib}/__pycache__/%{name}* %changelog +* Sat Jan 22 2022 Fedora Release Engineering - 3.3-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Fri Jul 23 2021 Fedora Release Engineering - 3.3-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From 6e18a8e854853ac1b64c087cbbb30c4355baa4be Mon Sep 17 00:00:00 2001 From: Python Maint Date: Mon, 13 Jun 2022 15:42:36 +0200 Subject: [PATCH 15/33] Rebuilt for Python 3.11 --- txt2tags.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/txt2tags.spec b/txt2tags.spec index b154d3e..c923a48 100644 --- a/txt2tags.spec +++ b/txt2tags.spec @@ -1,7 +1,7 @@ Name: txt2tags Summary: Summary: Converts text files to HTML, XHTML, LaTeX, and other formats Version: 3.3 -Release: 8%{?dist} +Release: 9%{?dist} License: GPLv2 URL: http://txt2tags.sourceforge.net/ @@ -50,6 +50,9 @@ Txt2tags is a document generator. It reads a text file with minimal markup as %{python3_sitelib}/__pycache__/%{name}* %changelog +* Mon Jun 13 2022 Python Maint - 3.3-9 +- Rebuilt for Python 3.11 + * Sat Jan 22 2022 Fedora Release Engineering - 3.3-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From 95d991b2ea58e67c1d1693cc8fd4a9b0b226578c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 23 Jul 2022 11:11:20 +0000 Subject: [PATCH 16/33] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- txt2tags.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/txt2tags.spec b/txt2tags.spec index c923a48..eb0af23 100644 --- a/txt2tags.spec +++ b/txt2tags.spec @@ -1,7 +1,7 @@ Name: txt2tags Summary: Summary: Converts text files to HTML, XHTML, LaTeX, and other formats Version: 3.3 -Release: 9%{?dist} +Release: 10%{?dist} License: GPLv2 URL: http://txt2tags.sourceforge.net/ @@ -50,6 +50,9 @@ Txt2tags is a document generator. It reads a text file with minimal markup as %{python3_sitelib}/__pycache__/%{name}* %changelog +* Sat Jul 23 2022 Fedora Release Engineering - 3.3-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Mon Jun 13 2022 Python Maint - 3.3-9 - Rebuilt for Python 3.11 From bd6dcf8f000c185cb8b415f25d227108f91da3b3 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 21 Jan 2023 05:35:31 +0000 Subject: [PATCH 17/33] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- txt2tags.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/txt2tags.spec b/txt2tags.spec index eb0af23..62e769f 100644 --- a/txt2tags.spec +++ b/txt2tags.spec @@ -1,7 +1,7 @@ Name: txt2tags Summary: Summary: Converts text files to HTML, XHTML, LaTeX, and other formats Version: 3.3 -Release: 10%{?dist} +Release: 11%{?dist} License: GPLv2 URL: http://txt2tags.sourceforge.net/ @@ -50,6 +50,9 @@ Txt2tags is a document generator. It reads a text file with minimal markup as %{python3_sitelib}/__pycache__/%{name}* %changelog +* Sat Jan 21 2023 Fedora Release Engineering - 3.3-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Sat Jul 23 2022 Fedora Release Engineering - 3.3-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From b75cf7a2d5c817af002dfae9dfe88c68d12a3679 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Tue, 13 Jun 2023 20:59:57 +0200 Subject: [PATCH 18/33] Rebuilt for Python 3.12 --- txt2tags.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/txt2tags.spec b/txt2tags.spec index 62e769f..ef377a3 100644 --- a/txt2tags.spec +++ b/txt2tags.spec @@ -1,7 +1,7 @@ Name: txt2tags Summary: Summary: Converts text files to HTML, XHTML, LaTeX, and other formats Version: 3.3 -Release: 11%{?dist} +Release: 12%{?dist} License: GPLv2 URL: http://txt2tags.sourceforge.net/ @@ -50,6 +50,9 @@ Txt2tags is a document generator. It reads a text file with minimal markup as %{python3_sitelib}/__pycache__/%{name}* %changelog +* Tue Jun 13 2023 Python Maint - 3.3-12 +- Rebuilt for Python 3.12 + * Sat Jan 21 2023 Fedora Release Engineering - 3.3-11 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From fb00c7a5b87bed5aed70a0514d79b8e3d0673e5b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jul 2023 16:54:19 +0000 Subject: [PATCH 19/33] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- txt2tags.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/txt2tags.spec b/txt2tags.spec index ef377a3..6a15637 100644 --- a/txt2tags.spec +++ b/txt2tags.spec @@ -1,7 +1,7 @@ Name: txt2tags Summary: Summary: Converts text files to HTML, XHTML, LaTeX, and other formats Version: 3.3 -Release: 12%{?dist} +Release: 13%{?dist} License: GPLv2 URL: http://txt2tags.sourceforge.net/ @@ -50,6 +50,9 @@ Txt2tags is a document generator. It reads a text file with minimal markup as %{python3_sitelib}/__pycache__/%{name}* %changelog +* Sat Jul 22 2023 Fedora Release Engineering - 3.3-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Tue Jun 13 2023 Python Maint - 3.3-12 - Rebuilt for Python 3.12 From d8f47cb8e50ee590556ade245030a119ba4ae888 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jan 2024 06:53:05 +0000 Subject: [PATCH 20/33] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- txt2tags.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/txt2tags.spec b/txt2tags.spec index 6a15637..b9b54b3 100644 --- a/txt2tags.spec +++ b/txt2tags.spec @@ -1,7 +1,7 @@ Name: txt2tags Summary: Summary: Converts text files to HTML, XHTML, LaTeX, and other formats Version: 3.3 -Release: 13%{?dist} +Release: 14%{?dist} License: GPLv2 URL: http://txt2tags.sourceforge.net/ @@ -50,6 +50,9 @@ Txt2tags is a document generator. It reads a text file with minimal markup as %{python3_sitelib}/__pycache__/%{name}* %changelog +* Sat Jan 27 2024 Fedora Release Engineering - 3.3-14 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Sat Jul 22 2023 Fedora Release Engineering - 3.3-13 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From 7a8db37f672db0f2d1a5a25c35ebf1d13296f0fe Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 7 Jun 2024 09:12:08 +0200 Subject: [PATCH 21/33] Rebuilt for Python 3.13 --- txt2tags.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/txt2tags.spec b/txt2tags.spec index b9b54b3..0ee2cbe 100644 --- a/txt2tags.spec +++ b/txt2tags.spec @@ -1,7 +1,7 @@ Name: txt2tags Summary: Summary: Converts text files to HTML, XHTML, LaTeX, and other formats Version: 3.3 -Release: 14%{?dist} +Release: 15%{?dist} License: GPLv2 URL: http://txt2tags.sourceforge.net/ @@ -50,6 +50,9 @@ Txt2tags is a document generator. It reads a text file with minimal markup as %{python3_sitelib}/__pycache__/%{name}* %changelog +* Fri Jun 07 2024 Python Maint - 3.3-15 +- Rebuilt for Python 3.13 + * Sat Jan 27 2024 Fedora Release Engineering - 3.3-14 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From dedb4022b0b9df382020a1aa2c878bfe24fc61e1 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 20 Jul 2024 08:02:51 +0000 Subject: [PATCH 22/33] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- txt2tags.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/txt2tags.spec b/txt2tags.spec index 0ee2cbe..2cdff7e 100644 --- a/txt2tags.spec +++ b/txt2tags.spec @@ -1,7 +1,7 @@ Name: txt2tags Summary: Summary: Converts text files to HTML, XHTML, LaTeX, and other formats Version: 3.3 -Release: 15%{?dist} +Release: 16%{?dist} License: GPLv2 URL: http://txt2tags.sourceforge.net/ @@ -50,6 +50,9 @@ Txt2tags is a document generator. It reads a text file with minimal markup as %{python3_sitelib}/__pycache__/%{name}* %changelog +* Sat Jul 20 2024 Fedora Release Engineering - 3.3-16 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Fri Jun 07 2024 Python Maint - 3.3-15 - Rebuilt for Python 3.13 From bc5c35fc92d2398bd88fd3388681b7ca6a6b760a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20Such=C3=BD?= Date: Mon, 29 Jul 2024 12:24:04 +0200 Subject: [PATCH 23/33] convert GPLv2 license to SPDX This is part of https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_4 --- txt2tags.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/txt2tags.spec b/txt2tags.spec index 2cdff7e..9c971fa 100644 --- a/txt2tags.spec +++ b/txt2tags.spec @@ -1,8 +1,9 @@ Name: txt2tags Summary: Summary: Converts text files to HTML, XHTML, LaTeX, and other formats Version: 3.3 -Release: 16%{?dist} -License: GPLv2 +Release: 17%{?dist} +# Automatically converted from old format: GPLv2 - review is highly recommended. +License: GPL-2.0-only URL: http://txt2tags.sourceforge.net/ # https://github.com/txt2tags/txt2tags/issues/207#issuecomment-544905237 @@ -50,6 +51,9 @@ Txt2tags is a document generator. It reads a text file with minimal markup as %{python3_sitelib}/__pycache__/%{name}* %changelog +* Mon Jul 29 2024 Miroslav Suchý - 3.3-17 +- convert license to SPDX + * Sat Jul 20 2024 Fedora Release Engineering - 3.3-16 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From d8da843b58c5b8c5ebb69864871e35849eff8ec2 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 19 Jan 2025 13:30:37 +0000 Subject: [PATCH 24/33] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- txt2tags.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/txt2tags.spec b/txt2tags.spec index 9c971fa..05c4732 100644 --- a/txt2tags.spec +++ b/txt2tags.spec @@ -1,7 +1,7 @@ Name: txt2tags Summary: Summary: Converts text files to HTML, XHTML, LaTeX, and other formats Version: 3.3 -Release: 17%{?dist} +Release: 18%{?dist} # Automatically converted from old format: GPLv2 - review is highly recommended. License: GPL-2.0-only URL: http://txt2tags.sourceforge.net/ @@ -51,6 +51,9 @@ Txt2tags is a document generator. It reads a text file with minimal markup as %{python3_sitelib}/__pycache__/%{name}* %changelog +* Sun Jan 19 2025 Fedora Release Engineering - 3.3-18 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Mon Jul 29 2024 Miroslav Suchý - 3.3-17 - convert license to SPDX From 4a1027eb10ab4fee338964fdf6081a3032db67dc Mon Sep 17 00:00:00 2001 From: Python Maint Date: Mon, 2 Jun 2025 20:53:34 +0200 Subject: [PATCH 25/33] Rebuilt for Python 3.14 --- txt2tags.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/txt2tags.spec b/txt2tags.spec index 05c4732..e1fe5e2 100644 --- a/txt2tags.spec +++ b/txt2tags.spec @@ -1,7 +1,7 @@ Name: txt2tags Summary: Summary: Converts text files to HTML, XHTML, LaTeX, and other formats Version: 3.3 -Release: 18%{?dist} +Release: 19%{?dist} # Automatically converted from old format: GPLv2 - review is highly recommended. License: GPL-2.0-only URL: http://txt2tags.sourceforge.net/ @@ -51,6 +51,9 @@ Txt2tags is a document generator. It reads a text file with minimal markup as %{python3_sitelib}/__pycache__/%{name}* %changelog +* Mon Jun 02 2025 Python Maint - 3.3-19 +- Rebuilt for Python 3.14 + * Sun Jan 19 2025 Fedora Release Engineering - 3.3-18 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From 34acc967173f526006054f2baa25c49f96d4dbf4 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 19:39:53 +0000 Subject: [PATCH 26/33] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- txt2tags.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/txt2tags.spec b/txt2tags.spec index e1fe5e2..2cd71a5 100644 --- a/txt2tags.spec +++ b/txt2tags.spec @@ -1,7 +1,7 @@ Name: txt2tags Summary: Summary: Converts text files to HTML, XHTML, LaTeX, and other formats Version: 3.3 -Release: 19%{?dist} +Release: 20%{?dist} # Automatically converted from old format: GPLv2 - review is highly recommended. License: GPL-2.0-only URL: http://txt2tags.sourceforge.net/ @@ -51,6 +51,9 @@ Txt2tags is a document generator. It reads a text file with minimal markup as %{python3_sitelib}/__pycache__/%{name}* %changelog +* Fri Jul 25 2025 Fedora Release Engineering - 3.3-20 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Mon Jun 02 2025 Python Maint - 3.3-19 - Rebuilt for Python 3.14 From 458170968c9bb8fc039d289fac4ef68c215211f9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Mon, 11 Aug 2025 12:29:49 +0200 Subject: [PATCH 27/33] Convert to pyproject RPM macros - Fixes: rhbz#2378484 This was fully automated by https://pypi.org/project/pyprojectize/1a7/ Changes reviewed, bumped release and added changelog entry. --- txt2tags.spec | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/txt2tags.spec b/txt2tags.spec index 2cd71a5..230a569 100644 --- a/txt2tags.spec +++ b/txt2tags.spec @@ -1,7 +1,7 @@ Name: txt2tags Summary: Summary: Converts text files to HTML, XHTML, LaTeX, and other formats Version: 3.3 -Release: 20%{?dist} +Release: 21%{?dist} # Automatically converted from old format: GPLv2 - review is highly recommended. License: GPL-2.0-only URL: http://txt2tags.sourceforge.net/ @@ -12,7 +12,6 @@ Source0: https://github.com/jendrikseipp/txt2tags/archive/%{version}.tar.gz BuildArch: noarch BuildRequires: python3-devel -BuildRequires: python3-setuptools Requires: python3 %description @@ -36,21 +35,28 @@ Txt2tags is a document generator. It reads a text file with minimal markup as %prep %setup -q +%generate_buildrequires +%pyproject_buildrequires + %build -%{py3_build} +%{pyproject_wheel} %install -%{py3_install} +%{pyproject_install} +%pyproject_save_files -l %{name} -%files +%check +%pyproject_check_import + +%files -f %{pyproject_files} %doc CHANGELOG.md README.md -%license COPYING %{_bindir}/txt2tags -%{python3_sitelib}/%{name}-%{version}-py%{python3_version}.egg-info -%{python3_sitelib}/%{name}.py -%{python3_sitelib}/__pycache__/%{name}* %changelog +* Mon Aug 11 2025 Miro Hrončok - 3.3-21 +- Convert to pyproject RPM macros +- Fixes: rhbz#2378484 + * Fri Jul 25 2025 Fedora Release Engineering - 3.3-20 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From b04d1293ef0874068c90109a36d6bd9000414914 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 15 Aug 2025 15:21:05 +0200 Subject: [PATCH 28/33] Rebuilt for Python 3.14.0rc2 bytecode --- txt2tags.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/txt2tags.spec b/txt2tags.spec index 230a569..fca8183 100644 --- a/txt2tags.spec +++ b/txt2tags.spec @@ -1,7 +1,7 @@ Name: txt2tags Summary: Summary: Converts text files to HTML, XHTML, LaTeX, and other formats Version: 3.3 -Release: 21%{?dist} +Release: 22%{?dist} # Automatically converted from old format: GPLv2 - review is highly recommended. License: GPL-2.0-only URL: http://txt2tags.sourceforge.net/ @@ -53,6 +53,9 @@ Txt2tags is a document generator. It reads a text file with minimal markup as %{_bindir}/txt2tags %changelog +* Fri Aug 15 2025 Python Maint - 3.3-22 +- Rebuilt for Python 3.14.0rc2 bytecode + * Mon Aug 11 2025 Miro Hrončok - 3.3-21 - Convert to pyproject RPM macros - Fixes: rhbz#2378484 From 9c6d0bc014ef016ab0675037e00c919a013d20ee Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 19 Sep 2025 15:00:52 +0200 Subject: [PATCH 29/33] Rebuilt for Python 3.14.0rc3 bytecode --- txt2tags.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/txt2tags.spec b/txt2tags.spec index fca8183..a6049be 100644 --- a/txt2tags.spec +++ b/txt2tags.spec @@ -1,7 +1,7 @@ Name: txt2tags Summary: Summary: Converts text files to HTML, XHTML, LaTeX, and other formats Version: 3.3 -Release: 22%{?dist} +Release: 23%{?dist} # Automatically converted from old format: GPLv2 - review is highly recommended. License: GPL-2.0-only URL: http://txt2tags.sourceforge.net/ @@ -53,6 +53,9 @@ Txt2tags is a document generator. It reads a text file with minimal markup as %{_bindir}/txt2tags %changelog +* Fri Sep 19 2025 Python Maint - 3.3-23 +- Rebuilt for Python 3.14.0rc3 bytecode + * Fri Aug 15 2025 Python Maint - 3.3-22 - Rebuilt for Python 3.14.0rc2 bytecode From 0affc0991e4abaab943d26d58f5e816ef1b8531f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 17 Jan 2026 19:29:51 +0000 Subject: [PATCH 30/33] Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild --- txt2tags.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/txt2tags.spec b/txt2tags.spec index a6049be..d0e97a9 100644 --- a/txt2tags.spec +++ b/txt2tags.spec @@ -1,7 +1,7 @@ Name: txt2tags Summary: Summary: Converts text files to HTML, XHTML, LaTeX, and other formats Version: 3.3 -Release: 23%{?dist} +Release: 24%{?dist} # Automatically converted from old format: GPLv2 - review is highly recommended. License: GPL-2.0-only URL: http://txt2tags.sourceforge.net/ @@ -53,6 +53,9 @@ Txt2tags is a document generator. It reads a text file with minimal markup as %{_bindir}/txt2tags %changelog +* Sat Jan 17 2026 Fedora Release Engineering - 3.3-24 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild + * Fri Sep 19 2025 Python Maint - 3.3-23 - Rebuilt for Python 3.14.0rc3 bytecode From 79dd6182fa50dd0791fc3cce30e67b648ee0c272 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Wed, 3 Jun 2026 17:50:03 +0200 Subject: [PATCH 31/33] Rebuilt for Python 3.15 --- txt2tags.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/txt2tags.spec b/txt2tags.spec index d0e97a9..5844948 100644 --- a/txt2tags.spec +++ b/txt2tags.spec @@ -1,7 +1,7 @@ Name: txt2tags Summary: Summary: Converts text files to HTML, XHTML, LaTeX, and other formats Version: 3.3 -Release: 24%{?dist} +Release: 25%{?dist} # Automatically converted from old format: GPLv2 - review is highly recommended. License: GPL-2.0-only URL: http://txt2tags.sourceforge.net/ @@ -53,6 +53,9 @@ Txt2tags is a document generator. It reads a text file with minimal markup as %{_bindir}/txt2tags %changelog +* Wed Jun 03 2026 Python Maint - 3.3-25 +- Rebuilt for Python 3.15 + * Sat Jan 17 2026 Fedora Release Engineering - 3.3-24 - Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild From c64110f1bbf2d49bc9dc0e64b0033e6d369492eb Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 17 Jul 2026 08:03:17 +0000 Subject: [PATCH 32/33] Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild --- txt2tags.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/txt2tags.spec b/txt2tags.spec index 5844948..704f386 100644 --- a/txt2tags.spec +++ b/txt2tags.spec @@ -1,7 +1,7 @@ Name: txt2tags Summary: Summary: Converts text files to HTML, XHTML, LaTeX, and other formats Version: 3.3 -Release: 25%{?dist} +Release: 26%{?dist} # Automatically converted from old format: GPLv2 - review is highly recommended. License: GPL-2.0-only URL: http://txt2tags.sourceforge.net/ @@ -53,6 +53,9 @@ Txt2tags is a document generator. It reads a text file with minimal markup as %{_bindir}/txt2tags %changelog +* Fri Jul 17 2026 Fedora Release Engineering - 3.3-26 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild + * Wed Jun 03 2026 Python Maint - 3.3-25 - Rebuilt for Python 3.15 From 1ee4455e2d101cbd3b05fdab0dc19e9d67fbbca2 Mon Sep 17 00:00:00 2001 From: Artur Frenszek-Iwicki Date: Sun, 30 Aug 2026 22:57:10 +0200 Subject: [PATCH 33/33] Update to v3.9 --- .gitignore | 1 + 0000-fix-tests.patch | 24 ++++++++++++++++++++++++ sources | 2 +- txt2tags.spec | 20 ++++++++++++-------- 4 files changed, 38 insertions(+), 9 deletions(-) create mode 100644 0000-fix-tests.patch diff --git a/.gitignore b/.gitignore index cef1096..fe0a27a 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ txt2tags-2.5.tgz /txt2tags.py /txt2tags*.src.rpm /3.3.tar.gz +/txt2tags-3.9.tar.gz diff --git a/0000-fix-tests.patch b/0000-fix-tests.patch new file mode 100644 index 0000000..1478222 --- /dev/null +++ b/0000-fix-tests.patch @@ -0,0 +1,24 @@ +diff -rU4 txt2tags-3.9--orig/test/lib.py txt2tags-3.9/test/lib.py +--- txt2tags-3.9--orig/test/lib.py 2023-10-06 20:07:32.000000000 +0200 ++++ txt2tags-3.9/test/lib.py 2026-08-30 22:49:34.027096973 +0200 +@@ -17,9 +17,9 @@ + + print("Testing txt2tags on Python", platform.python_version()) + + # Path for txt2tags (change here if your txt2tags is in a different location) +-TXT2TAGS = os.path.join(TEST_DIR, "..", "txt2tags.py") ++TXT2TAGS = os.environ['TXT2TAGS_EXE'] + + CONFIG_FILE = "config" + CSS_FILE = "css" + DIR_OK = "ok" +diff -rU4 txt2tags-3.9--orig/test/run.py txt2tags-3.9/test/run.py +--- txt2tags-3.9--orig/test/run.py 2023-10-06 20:07:32.000000000 +0200 ++++ txt2tags-3.9/test/run.py 2026-08-30 22:48:19.714263563 +0200 +@@ -1,5 +1,5 @@ +-#!/usr/bin/env python ++#!/usr/bin/python3 + # + # txt2tags test-suite (http://txt2tags.org) + # See also: lib.py, */run.py + # diff --git a/sources b/sources index 4af9d88..7704390 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (3.3.tar.gz) = a52de3f5226d85af006304a9063b5dd01df2627a45670a91b954f758cb920648f86699acab5cd7822c0183e93eed110ddc7dd8d156b0eccbe1541e7fbc2bdb22 +SHA512 (txt2tags-3.9.tar.gz) = f2a1b0a671049595f12a05ca68acd860002bde9b8510eb9379ad9bdf94026b30522d670d39f2beffafa50104b44b2a3394aa090297ef92b46837c9a8e7e728ea diff --git a/txt2tags.spec b/txt2tags.spec index 704f386..ba5f885 100644 --- a/txt2tags.spec +++ b/txt2tags.spec @@ -1,13 +1,12 @@ Name: txt2tags Summary: Summary: Converts text files to HTML, XHTML, LaTeX, and other formats -Version: 3.3 -Release: 26%{?dist} -# Automatically converted from old format: GPLv2 - review is highly recommended. -License: GPL-2.0-only -URL: http://txt2tags.sourceforge.net/ +Version: 3.9 +Release: 1%{?dist} +License: GPL-2.0-or-later +URL: https://txt2tags.org +Source0: https://github.com/txt2tags/txt2tags/archive/refs/tags/%{version}/%{name}-%{version}.tar.gz -# https://github.com/txt2tags/txt2tags/issues/207#issuecomment-544905237 -Source0: https://github.com/jendrikseipp/txt2tags/archive/%{version}.tar.gz +Patch0: 0000-fix-tests.patch BuildArch: noarch @@ -33,7 +32,7 @@ Txt2tags is a document generator. It reads a text file with minimal markup as * Plain text %prep -%setup -q +%autosetup -p1 %generate_buildrequires %pyproject_buildrequires @@ -47,12 +46,17 @@ Txt2tags is a document generator. It reads a text file with minimal markup as %check %pyproject_check_import +export TXT2TAGS_EXE="%{buildroot}%{_bindir}/txt2tags" +PYTHONPATH="%{buildroot}%{python3_sitelib}:$(pwd)/test" ./test/run.py %files -f %{pyproject_files} %doc CHANGELOG.md README.md %{_bindir}/txt2tags %changelog +* Sun Aug 30 2026 Artur Frenszek-Iwicki - 3.9-1 +- Update to v3.9 + * Fri Jul 17 2026 Fedora Release Engineering - 3.3-26 - Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild