Update to 0.8.9

Update to 0.8.8
Update to 0.8.7
2022-06-23 21:24:09 +02:00 · 2022-06-17 15:09:00 +02:00 · 2022-05-01 16:23:42 +02:00
5 changed files with 24 additions and 261 deletions
--- a/.gitignore
+++ b/.gitignore
@ -22,10 +22,3 @@
 /variety-0.8.7.tar.gz
 /variety-0.8.8.tar.gz
 /variety-0.8.9.tar.gz
-/variety-0.8.10.tar.gz
-/variety-0.8.11.tar.gz
-/variety-0.8.12.tar.gz
-/variety-0.8.13.tar.gz
-/variety-0.9.0-b1.tar.gz
-/variety-0.9.0.tar.gz
-/variety-0.9.1.tar.gz
--- a/796.patch
+++ b/796.patch
@ -1,60 +0,0 @@
-From 325552174e51c56d98297c2a08ddb4d2c7092c58 Mon Sep 17 00:00:00 2001
-From: Martin Gansser <martinkg@fedoraproject.org>
-Date: Thu, 9 Oct 2025 10:00:56 +0200
-Subject: [PATCH] Fix wheel-based installations to include
- variety_build_settings
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Fixes https://github.com/varietywalls/variety/issues/795
-
-This could also move the cleanup to a custom cmdclass,
-but it is not necessary.
-
-Co-Authored-By: Miro Hrončok <miro@hroncok.cz>
---
- setup.py | 12 +++++++-----
- 1 file changed, 7 insertions(+), 5 deletions(-)
-
-diff --git a/setup.py b/setup.py
-index 3f486d9b..00fa31da 100644
--- a/setup.py
-+++ b/setup.py
-@@ -20,6 +20,7 @@
- 
- import os
- import sys
-+from setuptools.command.build_py import build_py as _build_py
- 
- from variety_lib.varietyconfig import get_version
- 
-@@ -41,14 +42,15 @@
- BUILD_SETTINGS_PATH = "variety_lib/variety_build_settings.py"
- 
- 
-class InstallWithDataDirectory(DistUtilsExtra.auto.install_auto):
-+
-+class BuildWithDataDirectory(_build_py):
-     def run(self):
-        data_path = os.path.join(self.prefix, "share/variety/")
-+        data_path = os.path.join(sys.prefix, "share/variety/")
-         with open(BUILD_SETTINGS_PATH, "w") as f:
-             f.write("### Autogenerated by setup.py - do not edit!\n")
-             f.write("__variety_data_directory__ = %r\n" % data_path)
-        print("This build will look for Variety's data in %r." % data_path)
-        DistUtilsExtra.auto.install_auto.run(self)
-+        print(f"[build_py] This build will look for Variety's data in {data_path!r}.")
-+        super().run()
- 
- 
- DistUtilsExtra.auto.setup(
-@@ -69,7 +71,7 @@ def run(self):
- Variety also includes a range of image effects, such as oil painting and blur,
- as well as options to layer quotes and a clock onto the background.""",
-     url="https://github.com/varietywalls/variety",
-    cmdclass={"install": InstallWithDataDirectory},
-+    cmdclass={"build_py": BuildWithDataDirectory},
-     data_files=[("share/metainfo", ["variety.appdata.xml"])],
- )
- 
--- a/2
+++ b/2
@ -1 +1 @@
-SHA512 (variety-0.9.1.tar.gz) = ea07bb82d2398f3602459439dcdb0f27b26c18d5771f21c3d2e24547aa2f0a4abbde7098d1b204bd013084a47877eaad2e6a668acfb48c34a6703b3efe467b26
+SHA512 (variety-0.8.9.tar.gz) = d08cef8af509e576f861279d00e9a8ef2c737657c7609e2797ec126c92764acd133898300d9121939e7c359751be3868e11ba1398baaec72c842cc43c9cadf1b
--- a/variety-0.6.4-fix_webkit_version.patch
+++ b/variety-0.6.4-fix_webkit_version.patch
@ -1,15 +0,0 @@
-diff -up variety-0.6.4/variety/AddPanoramioDialog.py.fix_webkit_version variety-0.6.4/variety/AddPanoramioDialog.py
--- variety-0.6.4/variety/AddPanoramioDialog.py.fix_webkit_version	2017-08-21 12:43:51.512278896 +0200
-+++ variety-0.6.4/variety/AddPanoramioDialog.py	2017-08-21 13:55:36.305538659 +0200
-@@ -17,9 +17,9 @@ import json
- 
- import logging
- import gi
-gi.require_version('WebKit', '3.0')
-+gi.require_version('WebKit2', '4.0')
- 
-from gi.repository import Gtk, WebKit, GObject # pylint: disable=E0611
-+from gi.repository import Gtk, WebKit2, GObject # pylint: disable=E0611
- from variety.Options import Options
- from variety_lib.helpers import get_builder
- from variety import _, _u
--- a/variety.spec
+++ b/variety.spec
@ -4,35 +4,30 @@
 %global commit0 8b8bb63a10fa22760eb976b1fd57338f3dba3233
 %global shortcommit0 %(c=%{commit0}; echo ${c:0:7})
 %global snapshottag .git%{shortcommit0}
-%global upstream_tag 0.9.0-b1
 %endif

 Name:           variety
 %if 0%{?usesnapshot}
-#Release:        0.17%%{?snapshottag}%%{?dist}
-Version:        0.9.0
-Release:        0.3.beta1%{?dist}
+Version:        0.8.6
+Release:        0.3%{?snapshottag}%{?dist}
 %else
-Version:        0.9.1
+Version:        0.8.9
 Release:        1%{?dist}
 %endif
 Summary:        Wallpaper changer that automatically downloads wallpapers
-License:        GPL-3.0-only
+License:        GPLv3
 URL:            https://github.com/varietywalls/variety

 %if 0%{?usesnapshot}
-#Source0:       %%{url}/archive/%%{commit0}/%%{name}-%%{shortcommit0}.tar.gz
-Source0:        %{url}/archive/refs/tags/%{upstream_tag}.tar.gz#/%{name}-%{upstream_tag}.tar.gz
+Source0:        %{url}/archive/%{commit0}/%{name}-%{shortcommit0}.tar.gz
 %else
 Source0:        %{url}/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz
 %endif

-# Fix wheel-based installations to include variety_build_settings
-# Patch0:          https://github.com/varietywalls/variety/pull/796.patch
-
 BuildArch:      noarch

 BuildRequires:  python3-devel
+BuildRequires:  python3-setuptools
 BuildRequires:  python3-distutils-extra
 BuildRequires:  python3-configobj
 BuildRequires:  python3-lxml
@ -49,21 +44,20 @@ BuildRequires:  gettext
 BuildRequires:  desktop-file-utils
 BuildRequires:  libappstream-glib
 BuildRequires:  %{py3_dist beautifulsoup4}
-BuildRequires:  python3-cairo
 Requires:       python3-dbus
 Requires:       hicolor-icon-theme
 Requires:       ImageMagick
+Requires:       libappindicator-gtk3
 Requires:       python3-lxml
 Requires:       python3-pillow
+BuildRequires:  python3-cairo
+#Requires:       python3-appindicator -- not available yet
 Requires:       python3-beautifulsoup4
 Requires:       python3-configobj
 Requires:       python3-gexiv2
 Requires:       python3-pycurl
 Requires:       python3-requests
-Requires:       python3-httplib2
 Requires:       xorg-x11-fonts-Type1
-Requires:       python3-zombie-imp
-

 %description
 Variety changes the desktop wallpaper on a regular basis, 
@ -86,198 +80,49 @@ desktop is always fresh and unique.
 %prep

 %if 0%{?usesnapshot}
-#%%autosetup -p1 -n %%{name}-%%{commit0}
-%autosetup -p1 -n %{name}-%{upstream_tag}
+%setup -q -n %{name}-%{commit0}
 %else
-%autosetup -p1 -n %{name}-%{version}
+%autosetup -p1
 %endif

+
+%if 0%{?fedora} >= 33
 # Replace deprecated getiterator() with iter()
 sed -i -e 's|getiterator|iter|' variety_lib/Builder.py
-
-# Fix setuptools package discovery warnings (Python 3.14)
-sed -i 's/include = \["variety", "variety_lib"\]/include = ["variety*","variety_lib*"]/' pyproject.toml || :
-
-# use a simple SPDX license string 
-sed -i 's/license = { text = "GPL-3.0-only" }/license = "GPL-3.0-only"/' pyproject.toml
-
-# include variety.data in package
-sed -i '/\[tool.setuptools-gettext\]/i [tool.setuptools]\npackages = { find = {} }\n' pyproject.toml
+%endif

 # remove debian part
-# rm -rf debian
-
-%generate_buildrequires
-%pyproject_buildrequires
+rm -rf debian

 %build
-%pyproject_wheel
+# Bytecompile Python modules
+%py_byte_compile %{__python3} setup.py build

 %install
-%pyproject_install
-
-# Install desktop file, as this is not handled by setuptools automatically
-install -D -m 644 %{name}.desktop \
-    %{buildroot}%{_datadir}/applications/%{name}.desktop
-
-# Install application icon
-install -D -m 644 variety/data/media/variety.svg \
-    %{buildroot}%{_datadir}/icons/hicolor/scalable/apps/variety.svg
-
-# optional png as well
-install -D -m 644 variety/data/media/variety128.png \
-    %{buildroot}%{_datadir}/icons/hicolor/128x128/apps/variety.png
-
-# Install man page (if exists)
-if [ -f debian/%{name}.1 ]; then
-    install -D -m 644 debian/%{name}.1 %{buildroot}%{_mandir}/man1/%{name}.1
-fi
-
-rm -rf %{buildroot}%{python3_sitelib}/tests
-rm -rf %{buildroot}%{python3_sitelib}/po
+%{__python3} setup.py install --root=%{buildroot}

 %find_lang %{name}

 %check
 desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
 appstream-util validate-relax --nonet %{buildroot}/%{_metainfodir}/%{name}.appdata.xml
-#%%py3_check_import variety_lib.variety_build_settings

 %files -f %{name}.lang
 %doc README.md
 %license LICENSE
 %{_bindir}/%{name}
 %{_datadir}/applications/%{name}.desktop
-%{_datadir}/icons/hicolor/scalable/apps/variety.svg
-%{_datadir}/icons/hicolor/128x128/apps/variety.png
 %{_metainfodir}/%{name}.appdata.xml
+%{_datadir}/%{name}/
 %{python3_sitelib}/jumble/
-#%%{python3_sitelib}/tests/
-%{python3_sitelib}/%{name}-*.dist-info
+%{python3_sitelib}/%{name}-*-py*.egg-info
 %{python3_sitelib}/%{name}/
 %{python3_sitelib}/%{name}_lib/
-%{_mandir}/man1/%{name}.1*
+%{_datadir}/icons/hicolor/22x22/apps/%{name}-indicator-dark.png
+%{_datadir}/icons/hicolor/22x22/apps/%{name}-indicator.png
+%{_datadir}/icons/hicolor/scalable/apps/%{name}.svg

 %changelog
-* Tue Sep 01 2026 Martin Gansser <martinkg@fedoraproject.org> - 0.9.1-1
- Update to 0.9.1-1
-
-* Fri Jul 17 2026 Fedora Release Engineering <releng@fedoraproject.org> - 0.9.0-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild
-
-* Thu Jun 04 2026 Python Maint <python-maint@redhat.com> - 0.9.0-2
- Rebuilt for Python 3.15
-
-* Wed May 06 2026 Martin Gansser <martinkg@fedoraproject.org> - 0.9.0-1
- Update to 0.9.0-1
-
-* Wed Apr 29 2026 Martin Gansser <martinkg@fedoraproject.org> - 0.9.0-0.2.beta1
- add variety-GExiv2.patch fix (BZ#2463715)
-
-* Mon Mar 02 2026 Martin Gansser <martinkg@fedoraproject.org> - 0.9.0-0.1.beta1
- Update to 0.9.0-0.1.beta1
- Add python3dist(setuptools-gettext)
- Fixed icon installation
- Fixed desktop validation
- Fixed setuptools discovery warnings
-
-* Sat Jan 17 2026 Fedora Release Engineering <releng@fedoraproject.org> - 0.8.13-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild
-
-* Thu Oct 09 2025 Miro Hrončok <mhroncok@redhat.com> - 0.8.13-7
- Fix a crash on startup for not being bale to find the data directory
- Fixes: rhbz#2401190
-
-* Fri Sep 19 2025 Python Maint <python-maint@redhat.com> - 0.8.13-6
- Rebuilt for Python 3.14.0rc3 bytecode
-
-* Fri Aug 15 2025 Python Maint <python-maint@redhat.com> - 0.8.13-5
- Rebuilt for Python 3.14.0rc2 bytecode
-
-* Fri Jul 25 2025 Fedora Release Engineering <releng@fedoraproject.org> - 0.8.13-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
-
-* Wed Jul 09 2025 Martin Gansser <martinkg@fedoraproject.org> - 0.8.13-3
- Updated to use %%pyproject_* macros
-
-* Tue Jun 03 2025 Python Maint <python-maint@redhat.com> - 0.8.13-2
- Rebuilt for Python 3.14
-
-* Wed Feb 26 2025 Martin Gansser <martinkg@fedoraproject.org> - 0.8.13-1
- Update to 0.8.13
-
-* Sun Jan 19 2025 Fedora Release Engineering <releng@fedoraproject.org> - 0.8.12-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
-
-* Mon Jul 29 2024 Miroslav Suchý <msuchy@redhat.com> - 0.8.12-4
- convert license to SPDX
-
-* Sat Jul 20 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.8.12-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
-
-* Sun Jun 09 2024 Python Maint <python-maint@redhat.com> - 0.8.12-2
- Rebuilt for Python 3.13
-
-* Fri Feb 02 2024 Martin Gansser <martinkg@fedoraproject.org> - 0.8.12-1
- Update to 0.8.12
-
-* Tue Oct 24 2023 Martin Gansser <martinkg@fedoraproject.org> - 0.8.10-5
- Add RR python3-httplib2 to allow quotes
-
-* Sun Sep 24 2023 Martin Gansser <martinkg@fedoraproject.org> - 0.8.10-4
- Add RR zombie-imp due imp module was removed from Python 3.12 and it breaks breezy
-
-* Sat Jul 22 2023 Fedora Release Engineering <releng@fedoraproject.org> - 0.8.10-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
-
-* Wed Jun 28 2023 Python Maint <python-maint@redhat.com> - 0.8.10-2
- Rebuilt for Python 3.12
-
-* Mon Jan 30 2023 Martin Gansser <martinkg@fedoraproject.org> - 0.8.10-1
- Update to 0.8.10
-
-* Sat Jan 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 0.8.9-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
-
-* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.8.9-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
-
-* Thu Jun 23 2022 Martin Gansser <martinkg@fedoraproject.org> - 0.8.9-1
- Update to 0.8.9
-
-* Fri Jun 17 2022 Python Maint <python-maint@redhat.com> - 0.8.8-2
- Rebuilt for Python 3.11
-
-* Fri Jun 17 2022 Martin Gansser <martinkg@fedoraproject.org> - 0.8.8-1
- Update to 0.8.8
-
-* Sat Jan 27 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.8.11-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Mon Oct 30 2023 Martin Gansser <martinkg@fedoraproject.org> - 0.8.11-1
- Update to 0.8.11
-
-* Tue Oct 24 2023 Martin Gansser <martinkg@fedoraproject.org> - 0.8.10-5
- Add RR python3-httplib2 to allow quotes
-
-* Sun Sep 24 2023 Martin Gansser <martinkg@fedoraproject.org> - 0.8.10-4
- Add RR zombie-imp due imp module was removed from Python 3.12 and it breaks breezy
-
-* Sat Jul 22 2023 Fedora Release Engineering <releng@fedoraproject.org> - 0.8.10-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
-
-* Wed Jun 28 2023 Python Maint <python-maint@redhat.com> - 0.8.10-2
- Rebuilt for Python 3.12
-
-* Mon Jan 30 2023 Martin Gansser <martinkg@fedoraproject.org> - 0.8.10-1
- Update to 0.8.10
-
-* Sat Jan 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 0.8.9-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
-
-* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.8.9-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
-
 * Thu Jun 23 2022 Martin Gansser <martinkg@fedoraproject.org> - 0.8.9-1
 - Update to 0.8.9
Author	SHA1	Message	Date
Martin Gansser	5e46a46fe6	Update to 0.8.9	2022-06-23 21:24:09 +02:00
Martin Gansser	34dbcf3427	Update to 0.8.8	2022-06-17 15:09:00 +02:00
Martin Gansser	63ede375f5	Update to 0.8.7	2022-05-01 16:23:42 +02:00