Compare commits

...
Sign in to create a new pull request.

31 commits

Author SHA1 Message Date
Artur Frenszek-Iwicki
1ee4455e2d Update to v3.9 2026-08-30 22:57:10 +02:00
Fedora Release Engineering
c64110f1bb Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild 2026-07-17 08:03:17 +00:00
Python Maint
79dd6182fa Rebuilt for Python 3.15 2026-06-03 17:50:03 +02:00
Fedora Release Engineering
0affc0991e Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild 2026-01-17 19:29:51 +00:00
Python Maint
9c6d0bc014 Rebuilt for Python 3.14.0rc3 bytecode 2025-09-19 15:00:52 +02:00
Python Maint
b04d1293ef Rebuilt for Python 3.14.0rc2 bytecode 2025-08-15 15:21:05 +02:00
Miro Hrončok
458170968c 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.
2025-08-11 12:29:49 +02:00
Fedora Release Engineering
34acc96717 Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild 2025-07-25 19:39:53 +00:00
Python Maint
4a1027eb10 Rebuilt for Python 3.14 2025-06-02 20:53:34 +02:00
Fedora Release Engineering
d8da843b58 Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild 2025-01-19 13:30:37 +00:00
Miroslav Suchý
bc5c35fc92 convert GPLv2 license to SPDX
This is part of https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_4
2024-07-29 12:24:04 +02:00
Fedora Release Engineering
dedb4022b0 Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild 2024-07-20 08:02:51 +00:00
Python Maint
7a8db37f67 Rebuilt for Python 3.13 2024-06-07 09:12:08 +02:00
Fedora Release Engineering
d8f47cb8e5 Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild 2024-01-27 06:53:05 +00:00
Fedora Release Engineering
fb00c7a5b8 Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2023-07-22 16:54:19 +00:00
Python Maint
b75cf7a2d5 Rebuilt for Python 3.12 2023-06-13 20:59:57 +02:00
Fedora Release Engineering
bd6dcf8f00 Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2023-01-21 05:35:31 +00:00
Fedora Release Engineering
95d991b2ea Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2022-07-23 11:11:20 +00:00
Python Maint
6e18a8e854 Rebuilt for Python 3.11 2022-06-13 15:42:36 +02:00
Fedora Release Engineering
c6bf8ddbf6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2022-01-22 03:20:18 +00:00
Fedora Release Engineering
54f05ea5f3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2021-07-23 19:51:16 +00:00
Python Maint
c70e7a2ba3 Rebuilt for Python 3.10 2021-06-04 21:18:36 +02:00
Tomas Hrnciar
2c950371ea Add BuildRequire on setuptools 2021-05-06 20:55:52 +02:00
Fedora Release Engineering
7d8b6f1b8f - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2021-01-27 22:30:05 +00:00
Fedora Release Engineering
ba7d023a26 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2020-07-29 13:06:26 +00:00
Miro Hrončok
ba26c01c06 Rebuilt for Python 3.9 2020-05-26 03:53:48 +02:00
Fedora Release Engineering
5c0658c61d - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2020-01-31 02:21:18 +00:00
Christoph Junghans
0b29837193 added missing tarball 2019-12-06 14:49:30 -07:00
Christoph Junghans
3c1d15d98c Version bump to 3.3 2019-12-06 14:41:02 -07:00
Christoph Junghans
1c6f6ac8ce Add more python3.8 fixes by Jendrik Seipp 2019-09-23 08:35:35 -06:00
Christoph Junghans
153f5ecaae bump to 2.6, switch to python3 (bug #1751486) 2019-09-20 22:16:23 -06:00
4 changed files with 142 additions and 84 deletions

5
.gitignore vendored
View file

@ -1 +1,6 @@
txt2tags-2.5.tgz
/2.6.tar.gz
/txt2tags.py
/txt2tags*.src.rpm
/3.3.tar.gz
/txt2tags-3.9.tar.gz

24
0000-fix-tests.patch Normal file
View file

@ -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
#

View file

@ -1 +1 @@
e4d4553651b5be0711263378ca133c43 txt2tags-2.5.tgz
SHA512 (txt2tags-3.9.tar.gz) = f2a1b0a671049595f12a05ca68acd860002bde9b8510eb9379ad9bdf94026b30522d670d39f2beffafa50104b44b2a3394aa090297ef92b46837c9a8e7e728ea

View file

@ -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: 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
Source0: http://txt2tags.googlecode.com/files/txt2tags-%{version}.tgz
Patch0: 0000-fix-tests.patch
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,116 @@ Txt2tags is a document generator. It reads a text file with minimal markup as
* Plain text
%prep
#NONE
%autosetup -p1
%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
%generate_buildrequires
%pyproject_buildrequires
%build
#NONE
%{pyproject_wheel}
%install
#For sanity protection, nuke buildroot
rm -rf %{buildroot}
%{pyproject_install}
%pyproject_save_files -l %{name}
#Install the executable
install -Dp -m0755 txt2tags %{buildroot}%{_bindir}/txt2tags
sed -i '1s/python/&2/' %{buildroot}%{_bindir}/txt2tags
%check
%pyproject_check_import
export TXT2TAGS_EXE="%{buildroot}%{_bindir}/txt2tags"
PYTHONPATH="%{buildroot}%{python3_sitelib}:$(pwd)/test" ./test/run.py
#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 <kairo@kairo.eti.br>
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 <kairo@kairo.eti.br>
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 -f %{pyproject_files}
%doc CHANGELOG.md README.md
%{_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 <fedora@svgames.pl> - 3.9-1
- Update to v3.9
* Fri Jul 17 2026 Fedora Release Engineering <releng@fedoraproject.org> - 3.3-26
- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild
* Wed Jun 03 2026 Python Maint <python-maint@redhat.com> - 3.3-25
- Rebuilt for Python 3.15
* Sat Jan 17 2026 Fedora Release Engineering <releng@fedoraproject.org> - 3.3-24
- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild
* Fri Sep 19 2025 Python Maint <python-maint@redhat.com> - 3.3-23
- Rebuilt for Python 3.14.0rc3 bytecode
* Fri Aug 15 2025 Python Maint <python-maint@redhat.com> - 3.3-22
- Rebuilt for Python 3.14.0rc2 bytecode
* Mon Aug 11 2025 Miro Hrončok <mhroncok@redhat.com> - 3.3-21
- Convert to pyproject RPM macros
- Fixes: rhbz#2378484
* Fri Jul 25 2025 Fedora Release Engineering <releng@fedoraproject.org> - 3.3-20
- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
* Mon Jun 02 2025 Python Maint <python-maint@redhat.com> - 3.3-19
- Rebuilt for Python 3.14
* Sun Jan 19 2025 Fedora Release Engineering <releng@fedoraproject.org> - 3.3-18
- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
* Mon Jul 29 2024 Miroslav Suchý <msuchy@redhat.com> - 3.3-17
- convert license to SPDX
* Sat Jul 20 2024 Fedora Release Engineering <releng@fedoraproject.org> - 3.3-16
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
* Fri Jun 07 2024 Python Maint <python-maint@redhat.com> - 3.3-15
- Rebuilt for Python 3.13
* Sat Jan 27 2024 Fedora Release Engineering <releng@fedoraproject.org> - 3.3-14
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Sat Jul 22 2023 Fedora Release Engineering <releng@fedoraproject.org> - 3.3-13
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
* Tue Jun 13 2023 Python Maint <python-maint@redhat.com> - 3.3-12
- Rebuilt for Python 3.12
* Sat Jan 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 3.3-11
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 3.3-10
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
* Mon Jun 13 2022 Python Maint <python-maint@redhat.com> - 3.3-9
- Rebuilt for Python 3.11
* Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 3.3-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.3-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
* Fri Jun 04 2021 Python Maint <python-maint@redhat.com> - 3.3-6
- Rebuilt for Python 3.10
* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.3-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.3-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Tue May 26 2020 Miro Hrončok <mhroncok@redhat.com> - 3.3-3
- Rebuilt for Python 3.9
* Fri Jan 31 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.3-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
* Fri Dec 06 2019 Christoph Junghans <junghans@votca.org> - 3.3-1
- Version bump to 3.3
* Mon Sep 23 2019 Christoph Junghans <junghans@votca.org> - 2.6-2
- Add more python3.8 fixes by Jendrik Seipp
* Fri Sep 20 2019 Christoph Junghans <junghans@votca.org> - 2.6-1
- bump to 2.6, switch to python3 (bug #1751486)
* Fri Aug 23 2019 Christoph Junghans <junghans@votca.org> - 2.5-23
- fix python dep