diff --git a/.gitignore b/.gitignore index fe0a27a..e78decb 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1 @@ txt2tags-2.5.tgz -/2.6.tar.gz -/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 deleted file mode 100644 index 1478222..0000000 --- a/0000-fix-tests.patch +++ /dev/null @@ -1,24 +0,0 @@ -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 7704390..d7325e2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (txt2tags-3.9.tar.gz) = f2a1b0a671049595f12a05ca68acd860002bde9b8510eb9379ad9bdf94026b30522d670d39f2beffafa50104b44b2a3394aa090297ef92b46837c9a8e7e728ea +e4d4553651b5be0711263378ca133c43 txt2tags-2.5.tgz diff --git a/txt2tags.spec b/txt2tags.spec index ba5f885..5b89784 100644 --- a/txt2tags.spec +++ b/txt2tags.spec @@ -1,17 +1,18 @@ -Name: txt2tags -Summary: Summary: Converts text files to HTML, XHTML, LaTeX, and other formats -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 +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/ -Patch0: 0000-fix-tests.patch +Source0: http://txt2tags.googlecode.com/files/txt2tags-%{version}.tgz BuildArch: noarch -BuildRequires: python3-devel -Requires: python3 +BuildRequires: python2 +BuildRequires: gettext + +Requires: python2 %description Txt2tags is a document generator. It reads a text file with minimal markup as @@ -32,116 +33,86 @@ Txt2tags is a document generator. It reads a text file with minimal markup as * Plain text %prep -%autosetup -p1 +#NONE -%generate_buildrequires -%pyproject_buildrequires +%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 %build -%{pyproject_wheel} +#NONE %install -%{pyproject_install} -%pyproject_save_files -l %{name} +#For sanity protection, nuke buildroot +rm -rf %{buildroot} -%check -%pyproject_check_import -export TXT2TAGS_EXE="%{buildroot}%{_bindir}/txt2tags" -PYTHONPATH="%{buildroot}%{python3_sitelib}:$(pwd)/test" ./test/run.py +#Install the executable +install -Dp -m0755 txt2tags %{buildroot}%{_bindir}/txt2tags +sed -i '1s/python/&2/' %{buildroot}%{_bindir}/txt2tags -%files -f %{pyproject_files} -%doc CHANGELOG.md README.md +#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* %{_bindir}/txt2tags +%dir %{_docdir}/%{name} +%dir %{_docdir}/%{name}/extras +%dir %{_docdir}/%{name}/samples +%{_docdir}/%{name}/extras/* +%{_docdir}/%{name}/samples/* + %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 - -* 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 - -* 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 - -* 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 - -* 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 - -* 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 - -* 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 - -* 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 - -* 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 - -* 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 - -* 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 - -* 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 - -* 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 - -* 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 - -* 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