track current state of qt6 port

diff --git a/qutebrowser.spec b/qutebrowser.spec
index f1b00b4ae5354db8edd0cf1dfba756c993829ad2..bc12e0657256536bad464620527ccf84af923d8a 100644 (file)
--- a/qutebrowser.spec
+++ b/qutebrowser.spec
@@ -1,34 +1,37 @@
-%define                qtver   5.12.1
-Summary:       A keyboard-driven, vim-like browser based on PyQt5
+# qt6-v2 branch
+%define                gitref  d9a46b1a62792b3f74e428bbde852209328f1e8d
+%define                snap    20221029
+%define                qtver   6
+Summary:       A keyboard-driven, vim-like browser based on PyQt6
 Name:          qutebrowser
 Version:       2.5.2
-Release:       1
+Release:       0.%{snap}.qt6.1
 License:       GPL v3+
 Group:         X11/Applications/Networking
-Source0:       https://github.com/qutebrowser/qutebrowser/archive/v%{version}/%{name}-%{version}.tar.gz
-# Source0-md5: 11265a3e578abb79bdeaafccf8c348ba
+Source0:       https://github.com/qutebrowser/qutebrowser/archive/%{gitref}/%{name}-qt6-%{snap}.tar.gz
+# Source0-md5: 6623fe30e9e3468ec71ce662905e5881
 URL:           https://www.qutebrowser.org/
 BuildRequires: asciidoc
 BuildRequires: python3 >= 1:3.6.1
 BuildRequires: python3-setuptools
 BuildRequires: rpm-pythonprov
 BuildRequires: rpmbuild(macros) >= 1.714
-Requires:      Qt5Core >= %{qtver}
-Requires:      Qt5DBus >= %{qtver}
-Requires:      Qt5Gui >= %{qtver}
-Requires:      Qt5Network >= %{qtver}
-Requires:      Qt5OpenGL >= %{qtver}
-Requires:      Qt5PrintSupport >= %{qtver}
-Requires:      Qt5Qml >= %{qtver}
-Requires:      Qt5Sql >= %{qtver}
-Requires:      Qt5Sql-sqldriver-sqlite3 >= %{qtver}
-Requires:      Qt5WebEngine >= %{qtver}
-Requires:      Qt5Widgets >= %{qtver}
+Requires:      Qt6Core >= %{qtver}
+Requires:      Qt6DBus >= %{qtver}
+Requires:      Qt6Gui >= %{qtver}
+Requires:      Qt6Network >= %{qtver}
+Requires:      Qt6OpenGL >= %{qtver}
+Requires:      Qt6PrintSupport >= %{qtver}
+Requires:      Qt6Qml >= %{qtver}
+Requires:      Qt6Sql >= %{qtver}
+Requires:      Qt6Sql-sqldriver-sqlite3 >= %{qtver}
+Requires:      Qt6WebEngine >= %{qtver}
+Requires:      Qt6Widgets >= %{qtver}
 Requires:      bash
 Requires:      hicolor-icon-theme
 Requires:      python3 >= 1:3.6.1
-Requires:      python3-PyQt5 >= 5.12.0
-Requires:      python3-PyQtWebEngine
+Requires:      python3-PyQt6
+Requires:      python3-PyQt6-WebEngine
 Requires:      python3-PyYAML
 Requires:      python3-devel-tools
 Requires:      python3-jinja2
@@ -40,7 +43,7 @@ BuildRoot:    %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
 qutebrowser is a keyboard-focused browser with a minimal GUI. It's
-based on Python, PyQt5 and QtWebEngine and free software, licensed
+based on Python, PyQt6 and QtWebEngine and free software, licensed
 under the GPL. It was inspired by other browsers/addons like dwb and
 Vimperator/Pentadactyl.
 
@@ -48,7 +51,7 @@ Vimperator/Pentadactyl.
 Summary:       qutebrowser userscript: Create bookmarks in Nextcloud's Bookmarks app
 Group:         X11/Applications/Networking
 Requires:      %{name} = %{version}-%{release}
-Requires:      python3-PyQt5
+Requires:      python3-PyQt6
 Requires:      python3-modules
 Requires:      python3-requests
 
@@ -59,7 +62,7 @@ qutebrowser userscript: Create bookmarks in Nextcloud's Bookmarks app.
 Summary:       qutebrowser userscript: Add recipes to Nextcloud's Cookbook app
 Group:         X11/Applications/Networking
 Requires:      %{name} = %{version}-%{release}
-Requires:      python3-PyQt5
+Requires:      python3-PyQt6
 Requires:      python3-modules
 Requires:      python3-requests
 
@@ -238,7 +241,7 @@ Requires:   mpv
 qutebrowser userscript: Views the current web page in mpv.
 
 %prep
-%setup -q
+%setup -q -n %{name}-%{gitref}
 
 grep -r '#!.*env bash' -l . | xargs %{__sed} -i -e '1 s,#!.*env bash.*,#!/bin/bash,'
 grep -r '#!.*env python' -l . | xargs %{__sed} -i -e '1 s,#!.*env python.*,#!%{__python3},'