From 194d22ab159ac1c2364e2abbe5a122ab590b842a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Tue, 26 May 2020 03:54:34 +0200 Subject: [PATCH 01/37] Rebuilt for Python 3.9 --- vimiv-qt.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vimiv-qt.spec b/vimiv-qt.spec index b1d0e84..143bf1e 100644 --- a/vimiv-qt.spec +++ b/vimiv-qt.spec @@ -22,7 +22,7 @@ Full documentation is available at https://karlch.github.io/vimiv-qt.} Name: %{pypi_name} Version: 0.7.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: An image viewer with vim-like keybindings License: GPLv3+ @@ -95,6 +95,9 @@ pytest-%{python3_version} %{_mandir}/man1/%{binname}.* %changelog +* Tue May 26 2020 Miro Hrončok - 0.7.0-2 +- Rebuilt for Python 3.9 + * Sun May 17 2020 Ankur Sinha - 0.7.0-1 - Update to new release From aadb742c7c4c348d24a4511a9d0600f9d918130e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 29 Jul 2020 13:45:50 +0000 Subject: [PATCH 02/37] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- vimiv-qt.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vimiv-qt.spec b/vimiv-qt.spec index 143bf1e..c63a44e 100644 --- a/vimiv-qt.spec +++ b/vimiv-qt.spec @@ -22,7 +22,7 @@ Full documentation is available at https://karlch.github.io/vimiv-qt.} Name: %{pypi_name} Version: 0.7.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: An image viewer with vim-like keybindings License: GPLv3+ @@ -95,6 +95,9 @@ pytest-%{python3_version} %{_mandir}/man1/%{binname}.* %changelog +* Wed Jul 29 2020 Fedora Release Engineering - 0.7.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Tue May 26 2020 Miro Hrončok - 0.7.0-2 - Rebuilt for Python 3.9 From 5924c7b1a2a2de236526d80bcda764fc17ca4d4f Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Sat, 9 Jan 2021 00:42:42 +0000 Subject: [PATCH 03/37] Add BuildRequires: make https://fedoraproject.org/wiki/Changes/Remove_make_from_BuildRoot --- vimiv-qt.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/vimiv-qt.spec b/vimiv-qt.spec index c63a44e..addbac8 100644 --- a/vimiv-qt.spec +++ b/vimiv-qt.spec @@ -28,6 +28,7 @@ Summary: An image viewer with vim-like keybindings License: GPLv3+ URL: https://karlch.github.io/vimiv-qt/ Source0: https://github.com/karlch/vimiv-qt/archive/v%{version}/%{name}-%{version}.tar.gz +BuildRequires: make BuildRequires: gcc BuildRequires: python3-devel BuildRequires: python3-setuptools From 229eb21052aef635c0cb95df15188a24453af354 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 27 Jan 2021 23:07:23 +0000 Subject: [PATCH 04/37] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- vimiv-qt.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vimiv-qt.spec b/vimiv-qt.spec index addbac8..47823a2 100644 --- a/vimiv-qt.spec +++ b/vimiv-qt.spec @@ -22,7 +22,7 @@ Full documentation is available at https://karlch.github.io/vimiv-qt.} Name: %{pypi_name} Version: 0.7.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: An image viewer with vim-like keybindings License: GPLv3+ @@ -96,6 +96,9 @@ pytest-%{python3_version} %{_mandir}/man1/%{binname}.* %changelog +* Wed Jan 27 2021 Fedora Release Engineering - 0.7.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Wed Jul 29 2020 Fedora Release Engineering - 0.7.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From b27687cfbfe41ccd8a9df6515820849c8ab63933 Mon Sep 17 00:00:00 2001 From: "Ankur Sinha (Ankur Sinha Gmail)" Date: Sun, 28 Mar 2021 15:56:23 +0100 Subject: [PATCH 05/37] enh: update to 0.8.0 --- .gitignore | 1 + sources | 2 +- vimiv-qt.spec | 12 ++++++++---- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index bb80ca6..d7c0f34 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /vimiv-qt-0.5.0.tar.gz /vimiv-qt-0.6.1.tar.gz /vimiv-qt-0.7.0.tar.gz +/vimiv-qt-0.8.0.tar.gz diff --git a/sources b/sources index 03e3754..0e52168 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vimiv-qt-0.7.0.tar.gz) = d73572bf2c9888290ea9889c13b099f72f0d4c379bd50ed26ca7f9af7d4a7d67e161caa0142145cb0dddaee80bb72714c8dab803e7090437ac43d1df26e10114 +SHA512 (vimiv-qt-0.8.0.tar.gz) = 91f4cc151904d4b3aa1919006eabce03840ac633f48012c1500bf606e5332c5d7b4647d8c8581f16958e43b1e435a0a7749bb9ac7735920c23ae17718898bac9 diff --git a/vimiv-qt.spec b/vimiv-qt.spec index 47823a2..fe040d7 100644 --- a/vimiv-qt.spec +++ b/vimiv-qt.spec @@ -4,6 +4,7 @@ %global pypi_name vimiv-qt %global binname vimiv +%global appdataid org.karlch.vimiv.qt %global _description %{expand: Vimiv is an image viewer with vim-like keybindings. It is written in python3 @@ -21,8 +22,8 @@ Full documentation is available at https://karlch.github.io/vimiv-qt.} Name: %{pypi_name} -Version: 0.7.0 -Release: 4%{?dist} +Version: 0.8.0 +Release: 1%{?dist} Summary: An image viewer with vim-like keybindings License: GPLv3+ @@ -76,7 +77,7 @@ sed -i '/LICENSE/ d' Makefile %py3_install %make_install -appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{binname}.appdata.xml +appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{appdataid}.metainfo.xml desktop-file-validate %{buildroot}/%{_datadir}/applications/%{binname}.desktop %check @@ -92,10 +93,13 @@ pytest-%{python3_version} %{_bindir}/%{binname} %{_datadir}/applications/%{binname}.desktop %{_datadir}/icons/hicolor/*/apps/%{binname}.* -%{_metainfodir}/%{binname}.appdata.xml +%{_metainfodir}/%{appdataid}.metainfo.xml %{_mandir}/man1/%{binname}.* %changelog +* Sun Mar 28 2021 Ankur Sinha - 0.8.0-1 +- Update to latest release + * Wed Jan 27 2021 Fedora Release Engineering - 0.7.0-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From 466050795c9b324029a0c5e281c1503c5dae46f4 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 4 Jun 2021 21:19:23 +0200 Subject: [PATCH 06/37] Rebuilt for Python 3.10 --- vimiv-qt.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vimiv-qt.spec b/vimiv-qt.spec index fe040d7..d2bf5d8 100644 --- a/vimiv-qt.spec +++ b/vimiv-qt.spec @@ -23,7 +23,7 @@ Full documentation is available at https://karlch.github.io/vimiv-qt.} Name: %{pypi_name} Version: 0.8.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: An image viewer with vim-like keybindings License: GPLv3+ @@ -97,6 +97,9 @@ pytest-%{python3_version} %{_mandir}/man1/%{binname}.* %changelog +* Fri Jun 04 2021 Python Maint - 0.8.0-2 +- Rebuilt for Python 3.10 + * Sun Mar 28 2021 Ankur Sinha - 0.8.0-1 - Update to latest release From 04e1f8bee432e3cb6737d2c808b02368befae51e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 23 Jul 2021 20:31:50 +0000 Subject: [PATCH 07/37] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- vimiv-qt.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vimiv-qt.spec b/vimiv-qt.spec index d2bf5d8..6683253 100644 --- a/vimiv-qt.spec +++ b/vimiv-qt.spec @@ -23,7 +23,7 @@ Full documentation is available at https://karlch.github.io/vimiv-qt.} Name: %{pypi_name} Version: 0.8.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: An image viewer with vim-like keybindings License: GPLv3+ @@ -97,6 +97,9 @@ pytest-%{python3_version} %{_mandir}/man1/%{binname}.* %changelog +* Fri Jul 23 2021 Fedora Release Engineering - 0.8.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Fri Jun 04 2021 Python Maint - 0.8.0-2 - Rebuilt for Python 3.10 From bd28116384a2c2f2c996493ddd4f4418402bfcda Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Tue, 3 Aug 2021 13:23:34 -0400 Subject: [PATCH 08/37] A little closer to running the tests Update to reflect that pytest-bdd is now in Fedora. Use %pytest macro to set up the correct environment --- vimiv-qt.spec | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/vimiv-qt.spec b/vimiv-qt.spec index 6683253..3c5a1d9 100644 --- a/vimiv-qt.spec +++ b/vimiv-qt.spec @@ -1,5 +1,5 @@ # Disabled by default, rely on upstream's test -# Requires pytest-bdd that is not in Fedora +# Requires pytest-qt, not yet packaged in Fedora %bcond_with tests %global pypi_name vimiv-qt @@ -23,7 +23,7 @@ Full documentation is available at https://karlch.github.io/vimiv-qt.} Name: %{pypi_name} Version: 0.8.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: An image viewer with vim-like keybindings License: GPLv3+ @@ -39,6 +39,7 @@ BuildRequires: /usr/bin/desktop-file-validate %if %{with tests} BuildRequires: %{py3_dist pytest} +BuildRequires: %{py3_dist pytest-bdd} BuildRequires: %{py3_dist flaky} %endif # Not listed in setup.py @@ -82,7 +83,7 @@ desktop-file-validate %{buildroot}/%{_datadir}/applications/%{binname}.desktop %check %if %{with tests} -pytest-%{python3_version} +%pytest %endif %files @@ -97,6 +98,9 @@ pytest-%{python3_version} %{_mandir}/man1/%{binname}.* %changelog +* Tue Aug 03 2021 Benjamin A. Beasley - 0.8.0-4 +- A little closer to running tests now that pytest-bdd *is* in Fedora + * Fri Jul 23 2021 Fedora Release Engineering - 0.8.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From 0a980e623d9cc8c944536e9208f34dd41c306063 Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Tue, 3 Aug 2021 13:25:28 -0400 Subject: [PATCH 09/37] Drop unnecessary python_enable_dependency_generator macro --- vimiv-qt.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vimiv-qt.spec b/vimiv-qt.spec index 3c5a1d9..8d3efae 100644 --- a/vimiv-qt.spec +++ b/vimiv-qt.spec @@ -55,7 +55,6 @@ Requires: hicolor-icon-theme Provides: vimiv = 0.9.2 Obsoletes: vimiv < 0.9.1-14 -%{?python_enable_dependency_generator} %{?python_provide:%python_provide python3-%{pypi_name}} %description %_description @@ -100,6 +99,7 @@ desktop-file-validate %{buildroot}/%{_datadir}/applications/%{binname}.desktop %changelog * Tue Aug 03 2021 Benjamin A. Beasley - 0.8.0-4 - A little closer to running tests now that pytest-bdd *is* in Fedora +- Update obsolete macros * Fri Jul 23 2021 Fedora Release Engineering - 0.8.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From 94b2193a9386d7f9c3ef5969d1934b0c978163a1 Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Tue, 3 Aug 2021 13:27:10 -0400 Subject: [PATCH 10/37] Update from obsolete python_provide macro to py_provides, and fix name --- vimiv-qt.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vimiv-qt.spec b/vimiv-qt.spec index 8d3efae..5a4acb7 100644 --- a/vimiv-qt.spec +++ b/vimiv-qt.spec @@ -55,7 +55,7 @@ Requires: hicolor-icon-theme Provides: vimiv = 0.9.2 Obsoletes: vimiv < 0.9.1-14 -%{?python_provide:%python_provide python3-%{pypi_name}} +%py_provides python3-%{binname} %description %_description From 64ec3f4d87b3aaf82138dc44d9fd11ad48e2bfb0 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jan 2022 04:02:23 +0000 Subject: [PATCH 11/37] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- vimiv-qt.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vimiv-qt.spec b/vimiv-qt.spec index 5a4acb7..fad301f 100644 --- a/vimiv-qt.spec +++ b/vimiv-qt.spec @@ -23,7 +23,7 @@ Full documentation is available at https://karlch.github.io/vimiv-qt.} Name: %{pypi_name} Version: 0.8.0 -Release: 4%{?dist} +Release: 5%{?dist} Summary: An image viewer with vim-like keybindings License: GPLv3+ @@ -97,6 +97,9 @@ desktop-file-validate %{buildroot}/%{_datadir}/applications/%{binname}.desktop %{_mandir}/man1/%{binname}.* %changelog +* Sat Jan 22 2022 Fedora Release Engineering - 0.8.0-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Tue Aug 03 2021 Benjamin A. Beasley - 0.8.0-4 - A little closer to running tests now that pytest-bdd *is* in Fedora - Update obsolete macros From 86ac35073cd08dd2724f764ed0948b190c89f3bf Mon Sep 17 00:00:00 2001 From: Python Maint Date: Mon, 13 Jun 2022 22:20:13 +0200 Subject: [PATCH 12/37] Rebuilt for Python 3.11 --- vimiv-qt.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vimiv-qt.spec b/vimiv-qt.spec index fad301f..92abf98 100644 --- a/vimiv-qt.spec +++ b/vimiv-qt.spec @@ -23,7 +23,7 @@ Full documentation is available at https://karlch.github.io/vimiv-qt.} Name: %{pypi_name} Version: 0.8.0 -Release: 5%{?dist} +Release: 6%{?dist} Summary: An image viewer with vim-like keybindings License: GPLv3+ @@ -97,6 +97,9 @@ desktop-file-validate %{buildroot}/%{_datadir}/applications/%{binname}.desktop %{_mandir}/man1/%{binname}.* %changelog +* Mon Jun 13 2022 Python Maint - 0.8.0-6 +- Rebuilt for Python 3.11 + * Sat Jan 22 2022 Fedora Release Engineering - 0.8.0-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From 631ab90a80443c45bc13ceaf522018ff68740401 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 23 Jul 2022 11:57:35 +0000 Subject: [PATCH 13/37] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- vimiv-qt.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vimiv-qt.spec b/vimiv-qt.spec index 92abf98..b46b1c8 100644 --- a/vimiv-qt.spec +++ b/vimiv-qt.spec @@ -23,7 +23,7 @@ Full documentation is available at https://karlch.github.io/vimiv-qt.} Name: %{pypi_name} Version: 0.8.0 -Release: 6%{?dist} +Release: 7%{?dist} Summary: An image viewer with vim-like keybindings License: GPLv3+ @@ -97,6 +97,9 @@ desktop-file-validate %{buildroot}/%{_datadir}/applications/%{binname}.desktop %{_mandir}/man1/%{binname}.* %changelog +* Sat Jul 23 2022 Fedora Release Engineering - 0.8.0-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Mon Jun 13 2022 Python Maint - 0.8.0-6 - Rebuilt for Python 3.11 From dbe5a838c95a34d95b0213d3fe1e3aae553f1f1e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 21 Jan 2023 06:21:49 +0000 Subject: [PATCH 14/37] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- vimiv-qt.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vimiv-qt.spec b/vimiv-qt.spec index b46b1c8..39c567a 100644 --- a/vimiv-qt.spec +++ b/vimiv-qt.spec @@ -23,7 +23,7 @@ Full documentation is available at https://karlch.github.io/vimiv-qt.} Name: %{pypi_name} Version: 0.8.0 -Release: 7%{?dist} +Release: 8%{?dist} Summary: An image viewer with vim-like keybindings License: GPLv3+ @@ -97,6 +97,9 @@ desktop-file-validate %{buildroot}/%{_datadir}/applications/%{binname}.desktop %{_mandir}/man1/%{binname}.* %changelog +* Sat Jan 21 2023 Fedora Release Engineering - 0.8.0-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Sat Jul 23 2022 Fedora Release Engineering - 0.8.0-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From 7cc1238267795dcaabc8fdbad7bb8618dde470db Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 16 Jun 2023 17:31:01 +0200 Subject: [PATCH 15/37] Rebuilt for Python 3.12 --- vimiv-qt.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vimiv-qt.spec b/vimiv-qt.spec index 39c567a..3fdc6da 100644 --- a/vimiv-qt.spec +++ b/vimiv-qt.spec @@ -23,7 +23,7 @@ Full documentation is available at https://karlch.github.io/vimiv-qt.} Name: %{pypi_name} Version: 0.8.0 -Release: 8%{?dist} +Release: 9%{?dist} Summary: An image viewer with vim-like keybindings License: GPLv3+ @@ -97,6 +97,9 @@ desktop-file-validate %{buildroot}/%{_datadir}/applications/%{binname}.desktop %{_mandir}/man1/%{binname}.* %changelog +* Fri Jun 16 2023 Python Maint - 0.8.0-9 +- Rebuilt for Python 3.12 + * Sat Jan 21 2023 Fedora Release Engineering - 0.8.0-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From 90000801c841accdc9a887a824878b96b1dbceae Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jul 2023 17:42:53 +0000 Subject: [PATCH 16/37] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- vimiv-qt.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vimiv-qt.spec b/vimiv-qt.spec index 3fdc6da..b8e4dc6 100644 --- a/vimiv-qt.spec +++ b/vimiv-qt.spec @@ -23,7 +23,7 @@ Full documentation is available at https://karlch.github.io/vimiv-qt.} Name: %{pypi_name} Version: 0.8.0 -Release: 9%{?dist} +Release: 10%{?dist} Summary: An image viewer with vim-like keybindings License: GPLv3+ @@ -97,6 +97,9 @@ desktop-file-validate %{buildroot}/%{_datadir}/applications/%{binname}.desktop %{_mandir}/man1/%{binname}.* %changelog +* Sat Jul 22 2023 Fedora Release Engineering - 0.8.0-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Fri Jun 16 2023 Python Maint - 0.8.0-9 - Rebuilt for Python 3.12 From 9cd994a9e085fdf9d34aa6e06f621d5971d3a445 Mon Sep 17 00:00:00 2001 From: "Ankur Sinha (Ankur Sinha Gmail)" Date: Fri, 28 Jul 2023 23:44:51 +0100 Subject: [PATCH 17/37] chore: remove unneeded macro --- vimiv-qt.spec | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/vimiv-qt.spec b/vimiv-qt.spec index b8e4dc6..11fd71a 100644 --- a/vimiv-qt.spec +++ b/vimiv-qt.spec @@ -2,7 +2,6 @@ # Requires pytest-qt, not yet packaged in Fedora %bcond_with tests -%global pypi_name vimiv-qt %global binname vimiv %global appdataid org.karlch.vimiv.qt @@ -21,7 +20,7 @@ The initial GTK3 version of vimiv will no longer be maintained. Full documentation is available at https://karlch.github.io/vimiv-qt.} -Name: %{pypi_name} +Name: vimiv-qt Version: 0.8.0 Release: 10%{?dist} Summary: An image viewer with vim-like keybindings @@ -60,8 +59,8 @@ Obsoletes: vimiv < 0.9.1-14 %description %_description %prep -%autosetup -n %{pypi_name}-%{version} -rm -rf %{pypi_name}.egg-info +%autosetup -n vimiv-qt-%{version} +rm -rf vimiv-qt.egg-info # Don't do the python bit there mv -v misc/Makefile . sed -i '/python3 setup.py install/ d' Makefile From 120f6625d87a31abad3ed0f65f740607ac45a52f Mon Sep 17 00:00:00 2001 From: "Ankur Sinha (Ankur Sinha Gmail)" Date: Fri, 28 Jul 2023 23:45:29 +0100 Subject: [PATCH 18/37] feat: use rpmautospec --- changelog | 61 ++++++++++++++++++++++++++++++++++++++++++++++++ vimiv-qt.spec | 64 ++------------------------------------------------- 2 files changed, 63 insertions(+), 62 deletions(-) create mode 100644 changelog diff --git a/changelog b/changelog new file mode 100644 index 0000000..2aae1e2 --- /dev/null +++ b/changelog @@ -0,0 +1,61 @@ +* Sat Jul 22 2023 Fedora Release Engineering - 0.8.0-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Fri Jun 16 2023 Python Maint - 0.8.0-9 +- Rebuilt for Python 3.12 + +* Sat Jan 21 2023 Fedora Release Engineering - 0.8.0-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Sat Jul 23 2022 Fedora Release Engineering - 0.8.0-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Mon Jun 13 2022 Python Maint - 0.8.0-6 +- Rebuilt for Python 3.11 + +* Sat Jan 22 2022 Fedora Release Engineering - 0.8.0-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Tue Aug 03 2021 Benjamin A. Beasley - 0.8.0-4 +- A little closer to running tests now that pytest-bdd *is* in Fedora +- Update obsolete macros + +* Fri Jul 23 2021 Fedora Release Engineering - 0.8.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Fri Jun 04 2021 Python Maint - 0.8.0-2 +- Rebuilt for Python 3.10 + +* Sun Mar 28 2021 Ankur Sinha - 0.8.0-1 +- Update to latest release + +* Wed Jan 27 2021 Fedora Release Engineering - 0.7.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Wed Jul 29 2020 Fedora Release Engineering - 0.7.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Tue May 26 2020 Miro Hrončok - 0.7.0-2 +- Rebuilt for Python 3.9 + +* Sun May 17 2020 Ankur Sinha - 0.7.0-1 +- Update to new release + +* Sat Mar 07 2020 Ankur Sinha - 0.6.1-1 +- Update to new release + +* Fri Jan 31 2020 Fedora Release Engineering - 0.5.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Tue Jan 21 2020 Ankur Sinha - 0.5.0-2 +- Add python3-qt5 as dependency: required for SVG + +* Wed Jan 15 2020 Ankur Sinha - 0.5.0-1 +- Update to 0.5.0 + +* Sat Nov 09 2019 Ankur Sinha - 0.3.0-1 +- Make description for doc package longer than summary +- Remove docs sub package + +* Fri Nov 08 2019 Ankur Sinha - 0.3.0-1 +- Initial build diff --git a/vimiv-qt.spec b/vimiv-qt.spec index 11fd71a..611e370 100644 --- a/vimiv-qt.spec +++ b/vimiv-qt.spec @@ -22,7 +22,7 @@ Full documentation is available at https://karlch.github.io/vimiv-qt.} Name: vimiv-qt Version: 0.8.0 -Release: 10%{?dist} +Release: %autorelease Summary: An image viewer with vim-like keybindings License: GPLv3+ @@ -96,64 +96,4 @@ desktop-file-validate %{buildroot}/%{_datadir}/applications/%{binname}.desktop %{_mandir}/man1/%{binname}.* %changelog -* Sat Jul 22 2023 Fedora Release Engineering - 0.8.0-10 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Fri Jun 16 2023 Python Maint - 0.8.0-9 -- Rebuilt for Python 3.12 - -* Sat Jan 21 2023 Fedora Release Engineering - 0.8.0-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Sat Jul 23 2022 Fedora Release Engineering - 0.8.0-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Mon Jun 13 2022 Python Maint - 0.8.0-6 -- Rebuilt for Python 3.11 - -* Sat Jan 22 2022 Fedora Release Engineering - 0.8.0-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Tue Aug 03 2021 Benjamin A. Beasley - 0.8.0-4 -- A little closer to running tests now that pytest-bdd *is* in Fedora -- Update obsolete macros - -* Fri Jul 23 2021 Fedora Release Engineering - 0.8.0-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Fri Jun 04 2021 Python Maint - 0.8.0-2 -- Rebuilt for Python 3.10 - -* Sun Mar 28 2021 Ankur Sinha - 0.8.0-1 -- Update to latest release - -* Wed Jan 27 2021 Fedora Release Engineering - 0.7.0-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Wed Jul 29 2020 Fedora Release Engineering - 0.7.0-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Tue May 26 2020 Miro Hrončok - 0.7.0-2 -- Rebuilt for Python 3.9 - -* Sun May 17 2020 Ankur Sinha - 0.7.0-1 -- Update to new release - -* Sat Mar 07 2020 Ankur Sinha - 0.6.1-1 -- Update to new release - -* Fri Jan 31 2020 Fedora Release Engineering - 0.5.0-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Tue Jan 21 2020 Ankur Sinha - 0.5.0-2 -- Add python3-qt5 as dependency: required for SVG - -* Wed Jan 15 2020 Ankur Sinha - 0.5.0-1 -- Update to 0.5.0 - -* Sat Nov 09 2019 Ankur Sinha - 0.3.0-1 -- Make description for doc package longer than summary -- Remove docs sub package - -* Fri Nov 08 2019 Ankur Sinha - 0.3.0-1 -- Initial build +%autochangelog From 0f4f9aca450a66403bf57cfac9619e74da88f7ae Mon Sep 17 00:00:00 2001 From: "Ankur Sinha (Ankur Sinha Gmail)" Date: Fri, 28 Jul 2023 23:52:01 +0100 Subject: [PATCH 19/37] feat: use pyproject macros --- vimiv-qt.spec | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/vimiv-qt.spec b/vimiv-qt.spec index 611e370..acbe00e 100644 --- a/vimiv-qt.spec +++ b/vimiv-qt.spec @@ -69,11 +69,16 @@ sed -i '/LICENSE/ d' Makefile # Can use something similar to correct/remove /usr/bin/python shebangs also # find . -type f -name "*.py" -exec sed -i '/^#![ ]*\/usr\/bin\/env.*$/ d' {} 2>/dev/null ';' +%generate_buildrequires +%pyproject_buildrequires + %build -%py3_build +%pyproject_wheel %install -%py3_install +%pyproject_install +%pyproject_save_files %{binname} + %make_install appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{appdataid}.metainfo.xml @@ -84,11 +89,8 @@ desktop-file-validate %{buildroot}/%{_datadir}/applications/%{binname}.desktop %pytest %endif -%files -%license LICENSE +%files -f %{pyproject_files} %doc README.md -%{python3_sitearch}/%{binname}-%{version}-py%{python3_version}.egg-info -%{python3_sitearch}/%{binname} %{_bindir}/%{binname} %{_datadir}/applications/%{binname}.desktop %{_datadir}/icons/hicolor/*/apps/%{binname}.* From 363ca41f6d106a97ebd25b169d8c034fbd0cc1ac Mon Sep 17 00:00:00 2001 From: "Ankur Sinha (Ankur Sinha Gmail)" Date: Fri, 28 Jul 2023 23:59:58 +0100 Subject: [PATCH 20/37] feat: update to 0.9.0 (fixes rhbz#2223099) --- .gitignore | 1 + sources | 2 +- vimiv-qt.spec | 4 ++-- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index d7c0f34..afba5a6 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ /vimiv-qt-0.6.1.tar.gz /vimiv-qt-0.7.0.tar.gz /vimiv-qt-0.8.0.tar.gz +/vimiv-qt-0.9.0.tar.gz diff --git a/sources b/sources index 0e52168..ead345f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vimiv-qt-0.8.0.tar.gz) = 91f4cc151904d4b3aa1919006eabce03840ac633f48012c1500bf606e5332c5d7b4647d8c8581f16958e43b1e435a0a7749bb9ac7735920c23ae17718898bac9 +SHA512 (vimiv-qt-0.9.0.tar.gz) = bf8207da1d84a6a47dda04ff06303d553a866e413521057e0c5ba0492a705abe9c941367e8977621ba695f4f8fcf7f2461f53feb4456842973977b8e07d4dd56 diff --git a/vimiv-qt.spec b/vimiv-qt.spec index acbe00e..83b5bcf 100644 --- a/vimiv-qt.spec +++ b/vimiv-qt.spec @@ -21,14 +21,14 @@ Full documentation is available at https://karlch.github.io/vimiv-qt.} Name: vimiv-qt -Version: 0.8.0 +Version: 0.9.0 Release: %autorelease Summary: An image viewer with vim-like keybindings License: GPLv3+ URL: https://karlch.github.io/vimiv-qt/ Source0: https://github.com/karlch/vimiv-qt/archive/v%{version}/%{name}-%{version}.tar.gz -BuildRequires: make +BuildRequires: make BuildRequires: gcc BuildRequires: python3-devel BuildRequires: python3-setuptools From 480881dacc36c522745ec2a02b6d994fb4bf4e87 Mon Sep 17 00:00:00 2001 From: "Ankur Sinha (Ankur Sinha Gmail)" Date: Sat, 29 Jul 2023 00:30:26 +0100 Subject: [PATCH 21/37] chore: add packing config --- .packit.yaml | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 .packit.yaml diff --git a/.packit.yaml b/.packit.yaml new file mode 100644 index 0000000..42de40b --- /dev/null +++ b/.packit.yaml @@ -0,0 +1,8 @@ +upstream_project_url: https://github.com/karlch/vimiv-qt +copy_upstream_release_description: false + +jobs: + - job: pull_from_upstream + trigger: release + dist_git_branches: + - fedora-all From a5ef6e115cce502e91db0b31cfef259eda12c1bd Mon Sep 17 00:00:00 2001 From: "Ankur Sinha (Ankur Sinha Gmail)" Date: Sat, 29 Jul 2023 00:31:15 +0100 Subject: [PATCH 22/37] feat: use spdx identifier --- vimiv-qt.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vimiv-qt.spec b/vimiv-qt.spec index 83b5bcf..5534673 100644 --- a/vimiv-qt.spec +++ b/vimiv-qt.spec @@ -25,7 +25,7 @@ Version: 0.9.0 Release: %autorelease Summary: An image viewer with vim-like keybindings -License: GPLv3+ +License: GPL-3.0-or-later URL: https://karlch.github.io/vimiv-qt/ Source0: https://github.com/karlch/vimiv-qt/archive/v%{version}/%{name}-%{version}.tar.gz BuildRequires: make From a98962ca2511569df90bfcbb78d647c3e270a099 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jan 2024 07:54:47 +0000 Subject: [PATCH 23/37] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 98ba6fd678f759cbf0314f3989af829f85b76c24 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 7 Jun 2024 21:04:46 +0200 Subject: [PATCH 24/37] Rebuilt for Python 3.13 From e3fa878a82bc432bd2ea3758f83ec73b443f4240 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 7 Jun 2024 23:21:35 +0200 Subject: [PATCH 25/37] Rebuilt for Python 3.13 From 140ab7fa9baf2fb232cad8f65fa4abefb7040615 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 20 Jul 2024 08:51:08 +0000 Subject: [PATCH 26/37] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From 6b2f3fc996fdf6690be27cc03f1ecb203c0f25c2 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 19 Jan 2025 14:26:02 +0000 Subject: [PATCH 27/37] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From e1c61b4dc94a8d119f4a07929e2930387f4416fd Mon Sep 17 00:00:00 2001 From: Python Maint Date: Tue, 3 Jun 2025 15:53:10 +0200 Subject: [PATCH 28/37] Rebuilt for Python 3.14 From 7ddeb8c6834deb064bce18cad94676aaf05066aa Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 20:07:55 +0000 Subject: [PATCH 29/37] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From 1c002c8b5504cf583179034eb9fec8c968df4956 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 15 Aug 2025 15:22:03 +0200 Subject: [PATCH 30/37] Rebuilt for Python 3.14.0rc2 bytecode From 816c6854c5d3acb0d0d3c9596560aa57c6c8400c Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 19 Sep 2025 15:02:15 +0200 Subject: [PATCH 31/37] Rebuilt for Python 3.14.0rc3 bytecode From 9b93cdc000dcdd5f9ba09d2f76244d422273cdf6 Mon Sep 17 00:00:00 2001 From: "Ankur Sinha (Ankur Sinha Gmail)" Date: Mon, 10 Nov 2025 15:46:12 +0000 Subject: [PATCH 32/37] fix: backport patch for handling pyqt version strings with `dev` prefix Referece: https://github.com/karlch/vimiv-qt/commit/0902c81a4cefc516cfdac3627a23bcd133291580 --- 0001-fix-check-version.patch | 12 ++++++++++++ vimiv-qt.spec | 4 +++- 2 files changed, 15 insertions(+), 1 deletion(-) create mode 100644 0001-fix-check-version.patch diff --git a/0001-fix-check-version.patch b/0001-fix-check-version.patch new file mode 100644 index 0000000..63d8dfe --- /dev/null +++ b/0001-fix-check-version.patch @@ -0,0 +1,12 @@ +diff -ur vimiv-qt-0.9.0.orig/vimiv/checkversion.py vimiv-qt-0.9.0/vimiv/checkversion.py +--- vimiv-qt-0.9.0.orig/vimiv/checkversion.py 2025-11-10 15:42:55.589597665 +0000 ++++ vimiv-qt-0.9.0/vimiv/checkversion.py 2025-11-10 15:43:08.323760397 +0000 +@@ -22,7 +22,7 @@ + try: + from PyQt5.QtCore import PYQT_VERSION_STR + +- PYQT_VERSION = tuple(map(int, PYQT_VERSION_STR.split("."))) ++ PYQT_VERSION = tuple(map(int, PYQT_VERSION_STR.split(".")[:3])) + except ImportError: # pragma: no cover # PyQt is there in tests, using None is tested + # We check explicitly for None before using the tuple version + PYQT_VERSION = None # type: ignore diff --git a/vimiv-qt.spec b/vimiv-qt.spec index 5534673..baf5841 100644 --- a/vimiv-qt.spec +++ b/vimiv-qt.spec @@ -28,6 +28,8 @@ Summary: An image viewer with vim-like keybindings License: GPL-3.0-or-later URL: https://karlch.github.io/vimiv-qt/ Source0: https://github.com/karlch/vimiv-qt/archive/v%{version}/%{name}-%{version}.tar.gz +# Backport: https://github.com/karlch/vimiv-qt/commit/0902c81a4cefc516cfdac3627a23bcd133291580 +Patch: 0001-fix-check-version.patch BuildRequires: make BuildRequires: gcc BuildRequires: python3-devel @@ -59,7 +61,7 @@ Obsoletes: vimiv < 0.9.1-14 %description %_description %prep -%autosetup -n vimiv-qt-%{version} +%autosetup -n vimiv-qt-%{version} -p1 rm -rf vimiv-qt.egg-info # Don't do the python bit there mv -v misc/Makefile . From bdb663bcb24c85d469a4f1b7a504f0805a58b559 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 17 Jan 2026 19:57:12 +0000 Subject: [PATCH 33/37] Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild From 3352db85b52723bdcd3749378769c55775efaae5 Mon Sep 17 00:00:00 2001 From: "Ankur Sinha (Ankur Sinha Gmail)" Date: Fri, 6 Feb 2026 12:17:49 +0000 Subject: [PATCH 34/37] feat: update to use pyqt6 and other tweaks --- vimiv-qt.spec | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/vimiv-qt.spec b/vimiv-qt.spec index baf5841..e7584f3 100644 --- a/vimiv-qt.spec +++ b/vimiv-qt.spec @@ -34,7 +34,7 @@ BuildRequires: make BuildRequires: gcc BuildRequires: python3-devel BuildRequires: python3-setuptools -BuildRequires: python3-qt5-devel +BuildRequires: python3-pyqt6-devel BuildRequires: /usr/bin/appstream-util BuildRequires: /usr/bin/desktop-file-validate @@ -44,9 +44,8 @@ BuildRequires: %{py3_dist pytest-bdd} BuildRequires: %{py3_dist flaky} %endif # Not listed in setup.py -Requires: python3-piexif -# python3-qt5-base is pulled in but SVG requires python3-qt5 -Requires: python3-qt5 +Recommends: %{py3_dist piexif} + # For icons Requires: hicolor-icon-theme @@ -63,13 +62,19 @@ Obsoletes: vimiv < 0.9.1-14 %prep %autosetup -n vimiv-qt-%{version} -p1 rm -rf vimiv-qt.egg-info + +# Comment out to remove /usr/bin/env shebangs +# Can use something similar to correct/remove /usr/bin/python shebangs also +# find . -type f -name "*.py" -exec sed -i '/^#![ ]*\/usr\/bin\/env.*$/ d' {} 2>/dev/null ';' + +# update req +sed -i 's/"PyQt5>=.*"/"PyQt6"/' setup.py +cat setup.py + # Don't do the python bit there mv -v misc/Makefile . sed -i '/python3 setup.py install/ d' Makefile sed -i '/LICENSE/ d' Makefile -# Comment out to remove /usr/bin/env shebangs -# Can use something similar to correct/remove /usr/bin/python shebangs also -# find . -type f -name "*.py" -exec sed -i '/^#![ ]*\/usr\/bin\/env.*$/ d' {} 2>/dev/null ';' %generate_buildrequires %pyproject_buildrequires From ae64704bb59a94e0376bd84c194fb10588022e03 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Thu, 4 Jun 2026 09:33:19 +0200 Subject: [PATCH 35/37] Rebuilt for Python 3.15 From 3549c2301990535e59f7154bead2bc72aceceb1a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 17 Jul 2026 08:31:17 +0000 Subject: [PATCH 36/37] Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild From e2c5c95d7b45d6e08bbdd22f69e839d0844c25c1 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Wed, 22 Jul 2026 10:16:22 +0200 Subject: [PATCH 37/37] Rebuilt for Python 3.15.0b4 ABI change