diff --git a/build-and-update-all-branches b/build-and-update-all-branches deleted file mode 100755 index 7d802c6..0000000 --- a/build-and-update-all-branches +++ /dev/null @@ -1,36 +0,0 @@ -#! /bin/sh - -# Prepare rawhide branch, review the list of branches below and then execute this -# script. - -branches='rawhide epel8 epel7 f32 f33 f34' - -exit_handler () -{ - git checkout rawhide -} - -trap exit_handler EXIT - -set -e -set -x - -koji hello - -tasks= -for branch in $branches; do - if test $branch != rawhide; then - git checkout "$branch" - git merge rawhide - fi - git push - tasks="${tasks}`fedpkg build --nowait | grep 'Created task' | cut -d: -f2`" -done - -koji watch-task $tasks - -for branch in $branches; do - test $branch != rawhide || continue - git checkout $branch - fedpkg update -done diff --git a/distgen.spec b/distgen.spec index bb43453..8f75ee6 100644 --- a/distgen.spec +++ b/distgen.spec @@ -1,39 +1,14 @@ -%global pybin %{?fedora:%{__python3}}%{!?fedora:%{__python2}} -%global pylib %{?fedora:%{python3_sitelib}}%{!?fedora:%{python2_sitelib}} -%global pypkg %{?fedora:python3}%{!?fedora:python} -%global meh_pypkg %{?fedora:%{pypkg}-} - -%if 0%{?rhel} == 8 -%global pybin %__python3 -%global pylib %python3_sitelib -%global pypkg python3 -%global meh_pypkg python3- -%endif - - Name: distgen Summary: Templating system/generator for distributions -Version: 1.7 +Version: 2.4 Release: 1%{?dist} -License: GPLv2+ +License: GPL-2.0-or-later AND Apache-2.0 URL: https://github.com/devexp-db/distgen BuildArch: noarch -Requires: %{pypkg}-jinja2 -Requires: %{pypkg}-distro -Requires: %{meh_pypkg}PyYAML -Requires: %{pypkg}-six - -BuildRequires: make -BuildRequires: %{pypkg}-devel -BuildRequires: %{pypkg}-distro -BuildRequires: %{pypkg}-jinja2 -BuildRequires: %pypkg-mock -BuildRequires: %{meh_pypkg}pytest -BuildRequires: %{pypkg}-pytest-catchlog -BuildRequires: %{meh_pypkg}PyYAML -BuildRequires: %{pypkg}-setuptools -BuildRequires: %{pypkg}-six +BuildRequires: python3-devel +BuildRequires: pyproject-rpm-macros +BuildRequires: python3-pytest Source0: https://pypi.org/packages/source/d/%name/%name-%version.tar.gz @@ -45,33 +20,142 @@ file and preexisting distribution metadata generate output file. %prep %autosetup -p1 +%generate_buildrequires +%pyproject_buildrequires + %build -%{pybin} setup.py build +%pyproject_wheel %install -%{pybin} setup.py install --root=%{buildroot} -mkdir -p %{buildroot}%{_datadir}/distgen -mv %{buildroot}%{pylib}/distgen/{distconf,templates} %{buildroot}%{_datadir}/distgen +%pyproject_install +%pyproject_save_files distgen %check -make PYTHON=%{pybin} check +%pytest tests/unittests/ -%files +%files -f %{pyproject_files} %license LICENSE -%doc AUTHORS NEWS +%doc NEWS %doc docs/ %{_bindir}/dg -%{pylib}/distgen -%{pylib}/%{name}-*.egg-info -%{_datadir}/%{name} %{_mandir}/man1/* %changelog +* Wed Aug 26 2026 Artur Frenszek-Iwicki - 2.4-1 +- Update to v2.4 + +* Wed Jul 15 2026 Fedora Release Engineering - 2.2-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild + +* Wed Jun 03 2026 Python Maint - 2.2-4 +- Rebuilt for Python 3.15 + +* Fri Jan 16 2026 Fedora Release Engineering - 2.2-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild + +* Fri Jan 16 2026 Fedora Release Engineering - 2.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild + +* Mon Dec 29 2025 Pavel Raiskup - 2.2-1 +- new upstream release with F43 config + +* Fri Sep 19 2025 Python Maint - 2.1-6 +- Rebuilt for Python 3.14.0rc3 bytecode + +* Fri Aug 15 2025 Python Maint - 2.1-5 +- Rebuilt for Python 3.14.0rc2 bytecode + +* Wed Jul 23 2025 Fedora Release Engineering - 2.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + +* Mon Jun 02 2025 Python Maint - 2.1-3 +- Rebuilt for Python 3.14 + +* Thu Jan 16 2025 Fedora Release Engineering - 2.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + +* Tue Jan 14 2025 Ales Nezbeda - 2.1-1 +- Update to 2.1 +- Support for RHEL 10 + +* Wed Oct 2 2024 Ales Nezbeda - 2.0-1 +- Update to 2.0 +- Refresh of build system +- Change spec file so it follows fedora guidelines + +* Mon Sep 09 2024 Lumír Balhar - 1.18-1 +- Update to 1.18 + +* Wed Jul 17 2024 Fedora Release Engineering - 1.17-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Fri Jun 07 2024 Python Maint - 1.17-4 +- Rebuilt for Python 3.13 + +* Wed Jan 24 2024 Fedora Release Engineering - 1.17-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Fri Jan 19 2024 Fedora Release Engineering - 1.17-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Mon Jul 24 2023 Zuzana Miklankova - 1.17-1 +- new upstream release, https://github.com/devexp-db/distgen/releases/tag/v1.17 + +* Wed Jul 19 2023 Fedora Release Engineering - 1.16-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Tue Jun 13 2023 Python Maint - 1.16-2 +- Rebuilt for Python 3.12 +* Mon May 29 2023 Zuzana Miklankova - 1.16-1 +- new upstream release, https://github.com/devexp-db/distgen/releases/tag/v1.16 + +* Fri Apr 21 2023 Zuzana Miklankova - 1.15-1 +- new upstream release, https://github.com/devexp-db/distgen/releases/tag/v1.15 + +* Thu Jan 19 2023 Fedora Release Engineering - 1.14-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Tue Sep 06 2022 Zuzana Miklankova - 1.14-1 +- new upstream release, https://github.com/devexp-db/distgen/releases/tag/v1.14 + +* Thu Jul 21 2022 Fedora Release Engineering - 1.13-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Mon Jun 13 2022 Python Maint - 1.13-2 +- Rebuilt for Python 3.11 + +* Thu Jun 09 2022 Zuzana Miklankova - 1.13-1 +- new upstream release, https://github.com/devexp-db/distgen/releases/tag/v1.13 + +* Thu Apr 14 2022 Zuzana Miklankova - 1.12-1 +- new upstream release, https://github.com/devexp-db/distgen/releases/tag/v1.12 + +* Thu Mar 24 2022 Zuzana Miklankova - 1.11-1 +- new upstream release, https://github.com/devexp-db/distgen/releases/tag/v1.11 + +* Thu Jan 27 2022 Pavel Raiskup - 1.10-1 +- fix FTBFS on EPEL9, new release, https://github.com/devexp-db/distgen/releases/tag/v1.10 + +* Wed Jan 26 2022 Pavel Raiskup - 1.9-1 +- new upstream release, https://github.com/devexp-db/distgen/releases/tag/v1.9 + +* Thu Jan 20 2022 Fedora Release Engineering - 1.8-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Wed Jul 21 2021 Fedora Release Engineering - 1.8-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Tue Jun 08 2021 Pavel Raiskup - 1.8-1 +- fix ftbfs in Fedora (rhbz#1968796) + +* Fri Jun 04 2021 Python Maint - 1.7-2 +- Rebuilt for Python 3.10 + * Sat Feb 20 2021 Pavel Raiskup - 1.7-1 - new upstream release diff --git a/sources b/sources index cdf7668..09c25cc 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (distgen-1.7.tar.gz) = 44a0d1043495570575d7198a8a8480aa91fb2884683ba8311da3840512eb2dbec8d6364f640e80065430644497606dbd7af92b93ab4c9de4765aaf11781883b4 +SHA512 (distgen-2.4.tar.gz) = 18108e71463ea76844a79bd2478b4d1892e7b9779542ac1795e57d4ea3f9fbc33f5a5582493d0b33f16dfc2bb4ff0ab2f73e955a3052521af09472e6889f266b