-%define qtver 5.7.1
+%define qtver 5.12.1
Summary: A keyboard-driven, vim-like browser based on PyQt5
Name: qutebrowser
-Version: 1.4.1
+Version: 2.3.1
Release: 1
License: GPL v3+
Group: X11/Applications/Networking
-Source0: https://github.com/qutebrowser/qutebrowser/archive/v%{version}.tar.gz
-# Source0-md5: c96b3f6300737c2fab02536001156d8b
+Source0: https://github.com/qutebrowser/qutebrowser/archive/v%{version}/%{name}-%{version}.tar.gz
+# Source0-md5: 337e6aff77f7e93ebd063709e13cd47b
URL: https://www.qutebrowser.org/
BuildRequires: asciidoc
-BuildRequires: python3 >= 3.6
+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: bash
Requires: hicolor-icon-theme
-Requires: python3 >= 3.6
-Requires: python3-PyQt5 >= 5.7.0
+Requires: python3 >= 1:3.6.1
+Requires: python3-PyQt5 >= 5.12.0
+Requires: python3-PyQtWebEngine
Requires: python3-PyYAML
-Requires: python3-attrs
Requires: python3-jinja2
-Requires: python3-pyPEG2
-Requires: python3-pygments
+Suggests: python3-adblock
+Suggests: python3-pygments
+BuildArch: noarch
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%description
under the GPL. It was inspired by other browsers/addons like dwb and
Vimperator/Pentadactyl.
+%package userscripts
+Summary: User scripts for qutebrowser
+Group: X11/Applications/Networking
+Requires: %{name} = %{version}-%{release}
+
+%description userscripts
+User scripts for qutebrowser.
+
%prep
%setup -q
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},'
+grep -r '#!.*env node' -l . | xargs %{__sed} -i -e '1 s,#!.*env node.*,#!/usr/bin/node,'
%build
%py3_build
+%{__python3} scripts/asciidoc2html.py
+
%install
rm -rf $RPM_BUILD_ROOT
%attr(755,root,root) %{_bindir}/qutebrowser
%{py3_sitescriptdir}/qutebrowser
%{py3_sitescriptdir}/qutebrowser-%{version}-py*.egg-info
-%{_desktopdir}/qutebrowser.desktop
+%{_desktopdir}/org.qutebrowser.qutebrowser.desktop
%{_iconsdir}/hicolor/*x*/apps/qutebrowser.png
%{_iconsdir}/hicolor/scalable/apps/qutebrowser.svg
%{_mandir}/man1/qutebrowser.1*
-%{_datadir}/metainfo/qutebrowser.appdata.xml
+%{_datadir}/metainfo/org.qutebrowser.qutebrowser.appdata.xml
%dir %{_datadir}/qutebrowser
%dir %{_datadir}/qutebrowser/scripts
%{_datadir}/qutebrowser/scripts/*.js
%attr(755,root,root) %{_datadir}/qutebrowser/scripts/*.py
%attr(755,root,root) %{_datadir}/qutebrowser/scripts/*.sh
+
+%files userscripts
+%defattr(644,root,root,755)
%dir %{_datadir}/qutebrowser/userscripts
%attr(755,root,root) %{_datadir}/qutebrowser/userscripts/*