From bf8256c2fa765a33393647e59c87562c5497ceb2 Mon Sep 17 00:00:00 2001
From: Ximi1970 <ximi.github@gmail.com>
Date: Tue, 12 May 2020 00:01:59 +0200
Subject: [PATCH] Fix gnome package

---
 dist/deb/gnome/debian.control       | 2 +-
 dist/deb/gnome/systray-x-gnome.dsc  | 2 +-
 dist/rpm/gnome/_service             | 3 ++-
 dist/rpm/gnome/systray-x-gnome.spec | 7 +++----
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/dist/deb/gnome/debian.control b/dist/deb/gnome/debian.control
index 546ba1c..41645c5 100644
--- a/dist/deb/gnome/debian.control
+++ b/dist/deb/gnome/debian.control
@@ -1,4 +1,4 @@
-Source: systray-x
+Source: systray-x-gnome
 Section: misc
 Priority: optional
 Maintainer: Maxime Rijnders <ximi.obs@gmail.com>
diff --git a/dist/deb/gnome/systray-x-gnome.dsc b/dist/deb/gnome/systray-x-gnome.dsc
index a4209ba..afcca16 100644
--- a/dist/deb/gnome/systray-x-gnome.dsc
+++ b/dist/deb/gnome/systray-x-gnome.dsc
@@ -1,5 +1,5 @@
 Format: 1.0
-Source: systray-x
+Source: systray-x-gnome
 Version: 0
 Binary: SysTray-X
 Maintainer: Maxime Rijnders <ximi.obs@gmail.com>
diff --git a/dist/rpm/gnome/_service b/dist/rpm/gnome/_service
index 671e7c8..32d1ff6 100644
--- a/dist/rpm/gnome/_service
+++ b/dist/rpm/gnome/_service
@@ -3,7 +3,8 @@
     <param name="url">https://github.com/Ximi1970/systray-x.git</param>
     <param name="scm">git</param>
     <param name="revision">0.1.5</param>
-    <param name="versionformat">0.1.5</param>    
+    <param name="versionformat">0.1.5</param>
+    <param name="filename">systray-x-gnome</param>
     <param name="extract">dist/rpm/gnome/systray-x-gnome.changes</param>
     <param name="extract">dist/rpm/gnome/systray-x-gnome.spec</param>
     <param name="extract">dist/rpm/VERSION</param>
diff --git a/dist/rpm/gnome/systray-x-gnome.spec b/dist/rpm/gnome/systray-x-gnome.spec
index 95c1562..5ba6b61 100644
--- a/dist/rpm/gnome/systray-x-gnome.spec
+++ b/dist/rpm/gnome/systray-x-gnome.spec
@@ -15,15 +15,14 @@
 # Please submit bugfixes or comments via https://bugs.opensuse.org/
 #
 
-%define base_name    systray-x
-Name:           %{base_name}-gnome
+Name:           systray-x-gnome
 Version:        0
 Release:        0
 Summary:        A system tray extension for Thunderbird 68+
 License:        MPL-2.0
 Group:          Productivity/Networking/Email/Clients
 URL:            https://github.com/Ximi1970/systray-x
-Source0:        %{base_name}-%{version}.tar.xz
+Source0:        %{name}-%{version}.tar.xz
 Source1:        VERSION
 BuildRequires:  unzip
 BuildRequires:  zip
@@ -53,7 +52,7 @@ The add-on and system tray application can do:
   * minimize on close
 
 %prep
-%autosetup -p1 -n %{base_name}-%{version}
+%autosetup -p1
 
 %build
 export VERSION=`cat %{S:1} | grep VERSION | sed -e "s/VERSION=\(.*\)/\1/"`