diff --git a/.gitignore b/.gitignore index 143693b..86c6231 100644 --- a/.gitignore +++ b/.gitignore @@ -8,14 +8,3 @@ /wike-1.7.2.tar.gz /wike-1.8.0.tar.gz /wike-1.8.1.tar.gz -/wike-1.8.2.tar.gz -/wike-1.8.3.tar.gz -/wike-2.0.0.tar.gz -/wike-2.0.1.tar.gz -/wike-2.1.0.tar.gz -/wike-3.0.0.tar.gz -/wike-3.0.1.tar.gz -/wike-3.1.0.tar.gz -/wike-3.1.1.tar.gz -/wike-3.2.0.tar.gz -/wike-3.2.1.tar.gz diff --git a/90.patch b/90.patch new file mode 100644 index 0000000..d5ba378 --- /dev/null +++ b/90.patch @@ -0,0 +1,22 @@ +From 5a6f2831c477d0f41271647e7f4ba55dd0b97ff9 Mon Sep 17 00:00:00 2001 +From: Gustavo Costa +Date: Thu, 22 Sep 2022 12:53:58 -0300 +Subject: [PATCH] Fix _fill_menu bug + +--- + src/toc.py | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/src/toc.py b/src/toc.py +index 068de5a..f289819 100644 +--- a/src/toc.py ++++ b/src/toc.py +@@ -92,6 +92,8 @@ def _fill_menu(self, menu, toc, index): + menu.append_item(button) + return index + ++ return index ++ + # On menu activated load section + + def _section_activate_cb(self, action, parameter): diff --git a/changelog b/changelog deleted file mode 100644 index 17d8093..0000000 --- a/changelog +++ /dev/null @@ -1,62 +0,0 @@ -* Fri Apr 14 2023 Gustavo Costa - 2.0.0-1 -- Update to 2.0.0 (rhbz#2186215) -- Change gtk3, libhandy and webkit2gtk4.1 to gtk4, libadwaita and webkitgtk6.1 - -* Sat Mar 04 2023 Gustavo Costa - 1.8.3-2 -- Use webkit2gtk4.1 - -* Sat Mar 04 2023 Gustavo Costa - 1.8.3-1 -- Update to 1.8.3 (rhbz#2175378) - -* Fri Feb 24 2023 Gustavo Costa - 1.8.2-1 -- Drop patch -- Use SPDX license -- Update to 1.8.2 (rhbz#2137400) - -* Sat Jan 21 2023 Fedora Release Engineering - 1.8.1-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Sat Sep 24 2022 Gustavo Costa - 1.8.1-2 -- Fix _fill_menu bug (rhbz#2128121) - -* Fri Sep 09 2022 Gustavo Costa - 1.8.1-1 -- Update to 1.8.1 (rhbz#2125166) - -* Sat Jul 23 2022 Fedora Release Engineering - 1.8.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Sun May 29 2022 Gustavo Costa - 1.8.0-1 -- Update to 1.8.0 - -* Mon Apr 04 2022 Gustavo Costa - 1.7.2-1 -- Update to 1.7.2 - -* Tue Feb 08 2022 Gustavo Costa - 1.7.1-1 -- Update to 1.7.1 - -* Fri Jan 21 2022 Gustavo Costa - 1.7.0-1 -- Fix unowned directories -- Update to 1.7.0 - -* Fri Dec 17 2021 Gustavo Costa - 1.6.3-1 -- Update to 1.6.3 - -* Sat Dec 04 2021 Gustavo Costa - 1.6.2-1 -- Update to 1.6.2 - -* Wed Nov 17 2021 Gustavo Costa - 1.6.1-1 -- Update to 1.6.1 - -* Sat Oct 16 2021 Gustavo Costa - 1.6.0-1 -- Update to 1.6.0 - -* Wed Sep 22 2021 Gustavo Costa - 1.5.7-1 -- Update to 1.5.7 - -* Thu Sep 09 2021 Gustavo Costa - 1.5.6-1 -- Update to 1.5.6 -- Remove BR libhandy1-devel -- Add BR glib2-devel - -* Thu Sep 02 2021 Gustavo Costa - 1.5.4-1 -- Initial package diff --git a/sources b/sources index af4d0d0..90546c6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wike-3.2.1.tar.gz) = 562f97396e05c1e679f9977305eff6b75e8918fc87b0e567f9e09ff1bafcf2858cc9e376cbab558095438729854cbb76597f0fca65de42c683234590a2b04b9e +SHA512 (wike-1.8.1.tar.gz) = e98907dedaf06887122dbfadb3c87c13be8fa277fd540a042ad807ceb4e23ac43ae8084690f0d8ae94895c76c42f855aa719be2a55445fc13fa25c3a7f94fb77 diff --git a/wike.spec b/wike.spec index c07f1e1..73c7121 100644 --- a/wike.spec +++ b/wike.spec @@ -1,13 +1,17 @@ %global appid com.github.hugolabe.Wike Name: wike -Version: 3.2.1 -Release: %autorelease +Version: 1.8.1 +Release: 2%{?dist} Summary: Wikipedia Reader for the GNOME Desktop -License: GPL-3.0-or-later -URL: https://hugolabe.github.io/Wike -Source0: https://github.com/hugolabe/wike/archive/%{version}/%{name}-%{version}.tar.gz +License: GPLv3 +URL: https://github.com/hugolabe/wike +Source0: %{url}/archive/%{version}/%{name}-%{version}.tar.gz + +# Fix _fill_menu bug +# https://github.com/hugolabe/Wike/issues/89 +Patch0: %{url}/pull/90.patch BuildArch: noarch @@ -17,23 +21,22 @@ BuildRequires: gettext BuildRequires: glib2-devel BuildRequires: desktop-file-utils BuildRequires: libappstream-glib -BuildRequires: gtk-update-icon-cache Requires: hicolor-icon-theme Requires: python3-gobject -Requires: gtk4 -Requires: libadwaita -Requires: webkitgtk6.0 -Requires: libsoup -Requires: pango +Requires: gtk3 +Requires: libhandy1 +Requires: webkit2gtk3 +Requires: python3dist(dbus-python) +Requires: python3dist(requests) %description -Wike is a Wikipedia reader for the GNOME Desktop. Provides access to all the -content of this online encyclopedia in a native application, with a simpler and +Wike is a Wikipedia reader for the GNOME Desktop. Provides access to all the +content of this online encyclopedia in a native application, with a simpler and distraction-free view of articles. %prep -%autosetup -n Wike-%{version} +%autosetup -n Wike-%{version} -p1 %build %meson @@ -54,15 +57,58 @@ desktop-file-validate %{buildroot}/%{_datadir}/applications/%{appid}.desktop %{_datadir}/%{name} %{_datadir}/applications/%{appid}.desktop %{_datadir}/icons/hicolor/*/apps/* +%{_datadir}/icons/hicolor/*/actions/* %{_datadir}/glib-2.0/schemas/%{appid}.gschema.xml %{_metainfodir}/%{appid}.metainfo.xml %dir %{_datadir}/dbus-1 %dir %{_datadir}/dbus-1/services -%{_datadir}/dbus-1/services/%{appid}.service %{_datadir}/dbus-1/services/%{appid}.SearchProvider.service %dir %{_datadir}/gnome-shell %dir %{_datadir}/gnome-shell/search-providers %{_datadir}/gnome-shell/search-providers/%{appid}.SearchProvider.ini %changelog -%autochangelog +* Sat Sep 24 2022 Gustavo Costa - 1.8.1-2 +- Fix _fill_menu bug (rhbz#2128121) + +* Fri Sep 09 2022 Gustavo Costa - 1.8.1-1 +- Update to 1.8.1 (rhbz#2125166) + +* Sat Jul 23 2022 Fedora Release Engineering - 1.8.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Sun May 29 2022 Gustavo Costa - 1.8.0-1 +- Update to 1.8.0 + +* Mon Apr 04 2022 Gustavo Costa - 1.7.2-1 +- Update to 1.7.2 + +* Tue Feb 08 2022 Gustavo Costa - 1.7.1-1 +- Update to 1.7.1 + +* Fri Jan 21 2022 Gustavo Costa - 1.7.0-1 +- Fix unowned directories +- Update to 1.7.0 + +* Fri Dec 17 2021 Gustavo Costa - 1.6.3-1 +- Update to 1.6.3 + +* Sat Dec 04 2021 Gustavo Costa - 1.6.2-1 +- Update to 1.6.2 + +* Wed Nov 17 2021 Gustavo Costa - 1.6.1-1 +- Update to 1.6.1 + +* Sat Oct 16 2021 Gustavo Costa - 1.6.0-1 +- Update to 1.6.0 + +* Wed Sep 22 2021 Gustavo Costa - 1.5.7-1 +- Update to 1.5.7 + +* Thu Sep 09 2021 Gustavo Costa - 1.5.6-1 +- Update to 1.5.6 +- Remove BR libhandy1-devel +- Add BR glib2-devel + +* Thu Sep 02 2021 Gustavo Costa - 1.5.4-1 +- Initial package