Compare commits

..

No commits in common. "rawhide" and "f38" have entirely different histories.

2 changed files with 8 additions and 27 deletions

View file

@ -1,12 +0,0 @@
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

View file

@ -28,13 +28,11 @@ 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
BuildRequires: python3-setuptools
BuildRequires: python3-pyqt6-devel
BuildRequires: python3-qt5-devel
BuildRequires: /usr/bin/appstream-util
BuildRequires: /usr/bin/desktop-file-validate
@ -44,8 +42,9 @@ BuildRequires: %{py3_dist pytest-bdd}
BuildRequires: %{py3_dist flaky}
%endif
# Not listed in setup.py
Recommends: %{py3_dist piexif}
Requires: python3-piexif
# python3-qt5-base is pulled in but SVG requires python3-qt5
Requires: python3-qt5
# For icons
Requires: hicolor-icon-theme
@ -60,21 +59,15 @@ Obsoletes: vimiv < 0.9.1-14
%description %_description
%prep
%autosetup -n vimiv-qt-%{version} -p1
%autosetup -n vimiv-qt-%{version}
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