PR#5: Rebase to v0.11.1 - rpms/qutebrowser

		`@@ -10,4 +10,4 @@`
		`/qutebrowser-0.9.1.tar.gz`
		`/qutebrowser-0.10.0.tar.gz`
		`/qutebrowser-0.10.1.tar.gz`
		`- /qutebrowser-1.0.2.tar.gz`
		`+ /qutebrowser-0.11.1.tar.gz`

qutebrowser.spec

file modified

+15 -19

		`@@ -1,9 +1,9 @@`
		`%global srcname qutebrowser`

		`Name: %{srcname}`
		`- Version: 1.0.2`
		`+ Version: 0.11.1`
		`Release: 1%{?dist}`
		`- Summary: A keyboard-driven, vim-like browser based on PyQt5 and QtWebEngine`
		`+ Summary: A keyboard-driven, vim-like browser based on PyQt5 and QtWebKit/QtWebEngine`

		`License: GPLv3`
		`URL: http://www.qutebrowser.org`
		`@@ -14,24 +14,24 @@`
		`BuildRequires: asciidoc`
		`BuildRequires: desktop-file-utils`
		`Requires: qt5-qtbase`
		`- Requires: qt5-qtwebengine`
		`Requires: qt5-qtdeclarative`
		`Requires: python3-setuptools`
		`Requires: python3-qt5`
		`- Requires: python3-qt5-webengine`
		`Requires: python3-jinja2`
		`Requires: python3-pygments`
		`Requires: python3-PyYAML`
		`Requires: python3-pyPEG2`
		`- Requires: python3-attrs`
		`- Recommends: python3-cssutils`
		`+ Requires: ((qt5-qtwebengine and python3-qt5-webengine and python3-pyopengl) or (qt5-qtwebkit and python3-qt5-webkit))`
		`+ Recommends: (qt5-qtwebengine and python3-qt5-webengine and python3-pyopengl)`
		`Recommends: (qt5-qtwebkit and python3-qt5-webkit)`
		`+ Recommends: python3-cssutils`


		`%description`
		`qutebrowser is a keyboard-focused browser with a minimal GUI. It’s based on`
		`- Python, PyQt5 and QtWebEngine and free software, licensed under the GPL.`
		`- It was inspired by other browsers/addons like dwb and Vimperator/Pentadactyl.`
		`+ Python, PyQt5 and QtWebKit/QtWebEngine and free software, licensed under the`
		`+ GPL. It was inspired by other browsers/addons like dwb and`
		`+ Vimperator/Pentadactyl.`


		`%prep`
		`@@ -57,7 +57,7 @@`
		`--add-category="Network" \`
		`--delete-original \`
		`--dir=%{buildroot}%{_datadir}/applications \`
		`- misc/%{srcname}.desktop`
		`+ %{srcname}.desktop`

		`# Install man page`
		`install -Dm644 doc/%{srcname}.1 -t %{buildroot}%{_mandir}/man1`
		`@@ -105,8 +105,8 @@`


		`%files`
		`- %license LICENSE`
		`- %doc README.asciidoc doc/changelog.asciidoc qutebrowser/html/doc`
		`+ %license COPYING`
		`+ %doc README.asciidoc CHANGELOG.asciidoc qutebrowser/html/doc`
		`%{python3_sitelib}/%{srcname}-%{version}-py?.?.egg-info`
		`%{python3_sitelib}/%{srcname}`
		`%{_bindir}/%{srcname}`
		`@@ -124,17 +124,13 @@`


		`%changelog`
		`- * Fri Oct 20 2017 Timothée Floure <timothee.floure@fnux.ch> - 1.0.2-1`
		`- - Rebase to 1.0.2`
		`+ * Wed Nov 15 2017 Timothée Floure <timothee.floure@fnux.ch> - 0.11.1-1`
		`+ - Rebase to 0.11.1`
		`- Remove the deprecated Group tag`
		`- - Add the python3-attrs dependency`
		`- - Adapt the descriptions and dependencies to the QtWebEngine backend (new default)`
		`- - Doc tag: do not package the PKG-INFO file anymore`
		`+ - Add the dependencies required by the QtWebEngine backend`
		`+ - Doc tag: do notackage the PKG-INFO file anymore`
		`- Doc tag: package the full HTML documentation instead of sparse asciidoc files`

		`- * Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.10.1-2`
		`- - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild`
		`-`
		`* Tue Mar 14 2017 Tomas Orsava <torsava@redhat.com> - 0.10.1-1`
		`- Rebased to 0.10.1`

sources

file modified

+1 -1

		`@@ -1,1 +1,1 @@`
		`- SHA512 (qutebrowser-1.0.2.tar.gz) = a2b548dd7577064000845e696b87d65e0d7452053741832036c6a89f5f3d1cf03a241e4c8c202c57bf87ecc843a7003dd3d5eb32169a32420345ff46e9cf3186`
		`+ SHA512 (qutebrowser-0.11.1.tar.gz) = be58664bc5f312d11d9b07629c7350c8d3e26785b5b6771583f4aa21bf99f76f8aab37d32cde3a33cd1f3f4f43f5f09d56cea87e67cbd9a23179f012ae6862ed`

fnux commented 6 years ago

As discussed in Bug 1512821 [0], here is the specfile for qutebrowser 0.11.1.

Koji build : https://koji.fedoraproject.org/koji/taskinfo?taskID=23127560
I quickly tested it in a clean F26 VM : everything looks fine with both WebKit and WebEngine.

[0] https://bugzilla.redhat.com/show_bug.cgi?id=1512821

torsava commented 6 years ago

Could you please split the pull request into separate commits, fnux?

First revert the changes that rebased it to 1.0.2 (for example using git-revert), so that you have the original version 0.10.1 that is currently in F26, and then add a commit that updates it to 0.11.1.

That way it's clear what's actually being changed on the F26 branch.

rebased onto 3892f49

6 years ago