Update macros and rename scripts

Reviewed-on: #1

.gitignore

@@ -1 +1 @@
-SOURCES/msvsphere-configs-0.2.0.tar.xz
+SOURCES/msvsphere-configs-0.3.7.tar.gz

.msvsphere-configs.metadata

@@ -1 +1 @@
-286bbcbc9ff80e423c4e9e048512514130183556  SOURCES/msvsphere-configs-0.2.0.tar.xz
+125414d9a9bac2223c4bbee05340210ead2b91f4  SOURCES/msvsphere-configs-0.3.7.tar.gz

SPECS/msvsphere-configs.spec

@@ -1,46 +1,49 @@
-Summary:	MSVSphere configuration files
+Summary:    MSVSphere configuration files
-Name:		msvsphere-configs
+Name:       msvsphere-configs
-Version:	0.2.0
+Version:    0.3.7
-Release:	2%{?dist}
+Release:    1%{?dist}
 
-License:	GPLv3+
+License:    GPLv3+
-URL:		http://msvsphere-os.ru
+URL:        http://msvsphere-os.ru
-Source0:	https://github.com/reverbrain/%{name}/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.xz
+Source0:    https://git.inferitos.ru/msvsphere/%{name}/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz
 
-BuildArch:	noarch
+BuildArch:  noarch
 
 %description
 Various system configurations for MSVSphere
 
 %package common
-Summary:	Configuration files for MSVSphere
+Summary:    Configuration files for MSVSphere
-Requires:	fontconfig-font-replacements
+Requires:   fontconfig-font-replacements
-Requires:	fontconfig-enhanced-defaults
+Requires:   fontconfig-enhanced-defaults
-Requires:	google-roboto-condensed-fonts
+Requires:   google-roboto-condensed-fonts
 
 %description common
 This package contains common configuration files
 
 %package gnome
-Summary:	Configuration files for GNOME desktop
+Summary:    Configuration files for GNOME desktop
-Requires:	glib2
+Requires:   glib2
-Requires:	%{name}-common = %{version}-%{release}
+Requires:   %{name}-common = %{version}-%{release}
-Requires:	gnome-shell-extension-arcmenu
+Requires:   gnome-shell-extension-arcmenu
-Requires:	gnome-shell-extension-dash-to-panel
+Requires:   gnome-shell-extension-dash-to-panel
-Requires:	gnome-shell-extension-appindicator
+Requires:   gnome-shell-extension-dash-to-dock
-Requires:	gnome-shell-extension-desktop-icons-ng
+Requires:   gnome-shell-extension-appindicator
-Requires:	gnome-shell-extension-top-icons
+Requires:   gnome-shell-extension-desktop-icons-ng
-Requires:	gnome-shell-extension-drive-menu
+Requires:   gnome-shell-extension-top-icons
-Requires:	gnome-shell-extension-notification-banner-reloaded
+Requires:   gnome-shell-extension-drive-menu
+Requires:   gnome-shell-extension-notification-banner-reloaded
 Requires:   gnome-shell-extension-no-overview
-Requires:	kora-icon-theme
+Requires:   kora-icon-theme
-Requires(post): gdm
+Requires(post):    systemd
+Requires(preun):   systemd
+Requires(postun):  systemd
 
 %description gnome
 This package contains configuration files for GNOME
 
 %prep
-%autosetup -n %{name}-src
+%autosetup -n %{name}
 
 %build
 
@@ -48,27 +51,78 @@ This package contains configuration files for GNOME
 install -d %{buildroot}%{_datadir}/glib-2.0/schemas
 install -m644 schemas-override/*.gschema.override %{buildroot}%{_datadir}/glib-2.0/schemas
 install -d %{buildroot}%{_bindir}
+install -d %{buildroot}%{_sysconfdir}/gnome-flavour-selector
 install -m755 bin/* %{buildroot}%{_bindir}
+install -m644 configs/extensions.json %{buildroot}%{_sysconfdir}/gnome-flavour-selector/
+install -m755 gnome-keyboard-toggle-configure/gnome-keyboard-toggle-configure.sh %{buildroot}%{_bindir}
+install -p -D -m 0644 gnome-keyboard-toggle-configure/gnome-keyboard-toggle-configure.service   %{buildroot}%{_unitdir}/gnome-keyboard-toggle-configure.service
 
 %post gnome
 glib-compile-schemas %{_datadir}/glib-2.0/schemas > /dev/null 2>&1
-
+%systemd_post gnome-keyboard-toggle-configure.service
-# fixme (disable xorg by default)
+/usr/bin/systemctl enable gnome-keyboard-toggle-configure.service
-sed -i 's@#WaylandEnable=false@WaylandEnable=false@' /etc/gdm/custom.conf
 
 %postun gnome
+%systemd_postun gnome-keyboard-toggle-configure.service
 glib-compile-schemas %{_datadir}/glib-2.0/schemas > /dev/null 2>&1
 
+%preun gnome
+%systemd_preun gnome-keyboard-toggle-configure.service
 
 %files gnome
 %doc README.md
+%config(noreplace) %{_sysconfdir}/gnome-flavour-selector/extensions.json
 %{_datadir}/glib-2.0/schemas/*.gschema.override
+%{_unitdir}/gnome-keyboard-toggle-configure.service
+%{_bindir}/gnome-keyboard-toggle-configure.sh
 
 %files common
-%{_bindir}/*
+%{_bindir}/sphere*
 %doc README.md
 
 %changelog
+* Thu Oct 03 2024 Arkady L. Shane <tigro@msvsphere-os.ru> - 0.3.7-1
+- Update macros
+- Rename scripts
+
+* Tue Oct 1 2024 Dmitry Samoylik <Dmitriy.Samoylik@softline.com> - 0.3.6-1
+- Autoconfiguration of layout change at first start
+
+* Thu Sep 26 2024 Arkady L. Shane <tigro@msvsphere-os.ru> - 0.3.5-1
+- Use Alt+Shift again
+
+* Thu Sep 19 2024 Arkady L. Shane <tigro@msvsphere-os.ru> - 0.3.4-1
+- Use only right Alt+Shift
+
+* Tue Sep 17 2024 Eduard Basov <ebasov@msvsphere-os.ru> - 0.3.3-1
+- Adding scaling x11 to default settings operation system
+
+* Tue Sep 10 2024 Arkady L. Shane <tigro@msvsphere-os.ru> - 0.3.2-1
+- Set default keybindings to switch layout in Wayland
+
+* Tue Sep 10 2024 Arkady L. Shane <tigro@msvsphere-os.ru> - 0.3.1-1
+- Rename sphere-add-flatpack-repos to sphere-add-flatpak-repos
+
+* Tue Sep 10 2024 Arkady L. Shane <tigro@msvsphere-os.ru> - 0.3.0-2
+- Use Wayland by default
+
+* Tue Sep 10 2024 Arkady L. Shane <tigro@msvsphere-os.ru> - 0.3.0-1
+- Added config for gnome-flavour-selector
+- Added R: gnome-shell-extension-dash-to-dock
+
+* Thu Aug 29 2024 Arkady L. Shane <tigro@msvsphere-os.ru> - 0.2.1-2
+- Disable Wayland in gdm only after installation, not upgrade
+
+* Mon Aug 26 2024 Arkady L. Shane <tigro@msvsphere-os.ru> - 0.2.1-1
+- Fixed a discrepancy in the files
+
+* Mon Jul 22 2024 Arkady L. Shane <tigro@msvsphere-os.ru> - 0.2.0-4
+- Rename flatpak script
+
+* Mon May 06 2024 Arkady L. Shane <tigro@msvsphere-os.ru> - 0.2.0-3
+- INF-1272: set scaling-factor=1
+- Disable background-logo@fedorahosted.org
+
 * Sat Feb 17 2024 Arkady L. Shane <tigro@msvsphere-os.ru> - 0.2.0-2
 - Added R: gnome-shell-extension-no-overview