From b083937d8838649fca88263fd2a6129ca99390f9 Mon Sep 17 00:00:00 2001
From: Hans de Goede <hdegoede@redhat.com>
Date: Mon, 9 Aug 2021 16:40:17 +0200
Subject: [PATCH] Update to latest upstream release: v40 (rhbz#1971135) This
 includes legacy X11 tray-icon support, make  
 gnome-shell-extension-appindicator obsolete and provide  
 gnome-shell-extension-topicons-plus

---
 .gitignore                              |  1 +
 README.md                               |  3 ---
 gnome-shell-extension-appindicator.spec | 23 ++++++++++++++++++++---
 sources                                 |  2 +-
 4 files changed, 22 insertions(+), 7 deletions(-)
 delete mode 100644 README.md

diff --git a/.gitignore b/.gitignore
index 5ba5997..59577bb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@
 /gnome-shell-extension-appindicator-34.tar.gz
 /gnome-shell-extension-appindicator-35.tar.gz
 /gnome-shell-extension-appindicator-37.tar.gz
+/gnome-shell-extension-appindicator-40.tar.gz
diff --git a/README.md b/README.md
deleted file mode 100644
index ce32238..0000000
--- a/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# gnome-shell-extension-appindicator
-
-The gnome-shell-extension-appindicator package
\ No newline at end of file
diff --git a/gnome-shell-extension-appindicator.spec b/gnome-shell-extension-appindicator.spec
index 52e8fa1..5e20252 100644
--- a/gnome-shell-extension-appindicator.spec
+++ b/gnome-shell-extension-appindicator.spec
@@ -1,8 +1,8 @@
 %global uuid appindicatorsupport@rgcjonas.gmail.com
 
 Name: gnome-shell-extension-appindicator
-Version: 37
-Release: 2%{?dist}
+Version: 40
+Release: 1%{?dist}
 Summary: AppIndicator/KStatusNotifierItem support for GNOME Shell
 BuildArch: noarch
 
@@ -13,6 +13,12 @@ Source0: %{url}/archive/v%{version}/%{name}-%{version}.tar.gz
 Requires: gnome-shell >= 3.14.0
 Requires: libappindicator-gtk3
 
+# gnome-shell-extension-appindicator version >= 40 now also includes
+# support for legacy X11 tray icons and the topicons(-plus) extensions
+# are no longer maintained upstream
+Provides:  gnome-shell-extension-topicons-plus = %{version}-%{release}
+Obsoletes: gnome-shell-extension-topicons-plus <= 27-9
+
 %description
 This extension integrates Ubuntu AppIndicators and KStatusNotifierItems (KDE's
 blessed successor of the systray) into GNOME Shell.
@@ -26,9 +32,14 @@ You can use gnome-tweaks (additional package) or run in terminal:
 %autosetup -p1
 
 
+%build
+%make_build
+
+
 %install
 mkdir -p %{buildroot}%{_datadir}/gnome-shell/extensions/%{uuid}
-cp -axv *.js metadata.json interfaces-xml \
+cp -axv --parents *.js metadata.json interfaces-xml locale/*/LC_MESSAGES/*.mo \
+                  schemas/*.xml schemas/gschemas.compiled                     \
     %{buildroot}%{_datadir}/gnome-shell/extensions/%{uuid}/
 
 
@@ -39,6 +50,12 @@ cp -axv *.js metadata.json interfaces-xml \
 
 
 %changelog
+* Mon Aug  9 2021 Hans de Goede <hdegoede@redhat.com> - 40-1
+- Update to latest upstream release: v40 (rhbz#1971135)
+- This includes legacy X11 tray-icon support, make
+  gnome-shell-extension-appindicator obsolete and provide
+  gnome-shell-extension-topicons-plus
+
 * Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 37-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
 
diff --git a/sources b/sources
index b199990..d3fb0fb 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (gnome-shell-extension-appindicator-37.tar.gz) = 2aeb93ca015936577f314e0313dd963d3712edf27a5e9721813b6d72b5050de9427d7aa3a296ced40352a421251ecae7022fb58c1da02947bc0a6205e2d41d1b
+SHA512 (gnome-shell-extension-appindicator-40.tar.gz) = 72b3ecf0eadde40fd3567b19d7c7064953847ec86298691097f9fe14cada37206f8edd898c1d2a8fe71aeb0ace4921d1797d2dcc9eeacc0cb04a25841125b2ef