From 8f17ab3b288aedbfe93106647b7590d0652b18c7 Mon Sep 17 00:00:00 2001
From: Leigh Scott <leigh123linux@gmail.com>
Date: May 13 2020 16:44:47 +0000
Subject: Update to 4.6.0 release


---

diff --git a/.gitignore b/.gitignore
index 08fccde..c72e353 100644
--- a/.gitignore
+++ b/.gitignore
@@ -57,3 +57,4 @@
 /cinnamon-4.4.5.tar.gz
 /cinnamon-4.4.6.tar.gz
 /cinnamon-4.4.8.tar.gz
+/cinnamon-4.6.0.tar.gz
diff --git a/cinnamon.spec b/cinnamon.spec
index 0710b41..90672f3 100644
--- a/cinnamon.spec
+++ b/cinnamon.spec
@@ -1,17 +1,17 @@
 %global __requires_exclude ^lib%{name}.so|^lib%{name}-js.so
 
-%global cjs_version 4.4.0
-%global cinnamon_desktop_version 4.4.0
-%global cinnamon_translations_version 4.4.0
+%global cjs_version 4.6.0
+%global cinnamon_desktop_version 4.6.0
+%global cinnamon_translations_version 4.6.0
 %global gobject_introspection_version 1.38.0
-%global muffin_version 4.4.0
+%global muffin_version 4.6.0
 %global json_glib_version 0.13.2
 
 %global __python %{__python3}
 
 Name:           cinnamon
-Version:        4.4.8
-Release:        8%{?dist}
+Version:        4.6.0
+Release:        1%{?dist}
 Summary:        Window management and application launching for GNOME
 License:        GPLv2+ and LGPLv2+
 URL:            https://github.com/linuxmint/%{name}
@@ -26,8 +26,7 @@ Patch2:         revert_25aef37.patch
 Patch3:         default_panal_launcher.patch
 Patch4:         remove_crap_from_menu.patch
 Patch5:         replace-metacity-with-openbox.patch
-Patch6:         notification.patch
-Patch7:         %{url}/pull/9171.patch#/py38_sysinfo.patch
+#Patch6:         notification.patch
 
 
 BuildRequires:  gcc-c++
@@ -111,7 +110,7 @@ Requires:       python3-dbus%{?_isa}
 Requires:       python3-lxml%{?_isa}
 Requires:       python3-pillow%{?_isa}
 Requires:       python3-pam
-Requires:       python3-tinycss%{?_isa}
+Requires:       python3-tinycss2
 Requires:       python3-setproctitle%{?_isa}
 Requires:       python3-xapp
 Requires:       mintlocale
@@ -284,6 +283,9 @@ EOF
 %endif
 
 %changelog
+* Wed May 13 2020 Leigh Scott <leigh123linux@gmail.com> - 4.6.0-1
+- Update to 4.6.0 release
+
 * Mon Apr 20 2020 Leigh Scott <leigh123linux@gmail.com> - 4.4.8-8
 - Use desktop-backgrounds-basic for background instead of fedora default
 
diff --git a/py38_sysinfo.patch b/py38_sysinfo.patch
deleted file mode 100644
index 71bb60e..0000000
--- a/py38_sysinfo.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From 8e9cbd055a1d4b4ee1da2e783b93e690f6526549 Mon Sep 17 00:00:00 2001
-From: Malek <lekmalek@gmail.com>
-Date: Mon, 17 Feb 2020 08:47:22 +0100
-Subject: [PATCH] python 3.8 compatibility fix for
- platform.linux_distribution()
-
----
- debian/control                                                | 1 +
- files/usr/share/cinnamon/cinnamon-settings/modules/cs_info.py | 3 ++-
- 2 files changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/debian/control b/debian/control
-index 7cd9478ad4..638885ff94 100644
---- a/debian/control
-+++ b/debian/control
-@@ -88,6 +88,7 @@ Depends:
-  policykit-1-gnome,
-  python3,
-  python3-dbus,
-+ python3-distro,
-  python3-gi,
-  python3-gi-cairo,
-  python3-pam | python3-pampy,
-diff --git a/files/usr/share/cinnamon/cinnamon-settings/modules/cs_info.py b/files/usr/share/cinnamon/cinnamon-settings/modules/cs_info.py
-index 568b35dd02..3b4d89e60a 100755
---- a/files/usr/share/cinnamon/cinnamon-settings/modules/cs_info.py
-+++ b/files/usr/share/cinnamon/cinnamon-settings/modules/cs_info.py
-@@ -6,6 +6,7 @@
- import os
- import re
- import threading
-+import distro
- 
- from SettingsWidgets import SidePage
- from xapp.GSettingsWidgets import *
-@@ -105,7 +106,7 @@ def createSystemInfos():
-         title = ' '.join(contents[:2]) or "Manjaro Linux"
-         infos.append((_("Operating System"), title))
-     else:
--        s = '%s (%s)' % (' '.join(platform.linux_distribution()), arch)
-+        s = '%s (%s)' % (' '.join(distro.linux_distribution()), arch)
-         # Normalize spacing in distribution name
-         s = re.sub('\s{2,}', ' ', s)
-         infos.append((_("Operating System"), s))
diff --git a/sources b/sources
index 4c41a86..8af7058 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (cinnamon-4.4.8.tar.gz) = aedf9f470c04bd0a36cdc34546ed92d5709325e3ef2c0f40e8b026a76964231fc950c4a46bb6a87d46a2fa0f1cac50e7dcbe914008e18550b5fc1e27c7135978
+SHA512 (cinnamon-4.6.0.tar.gz) = e0a1203e1b6a1c6a81474d6f03a77fd5913a4ade2315d3c9b72271e9b128c98e439c9db12cffdd077f0dbdf967795f8bb0bcb0940af62f724d0e3c2414645e98