Drop gnome-settings,mate-settings

Makefile.in

@@ -173,15 +173,6 @@ install: browser-qt ahttpd boot-images boot-splash @X86@ indexhtml
 	    f="$${r##*/}"; \
 	    touch $(datadir)/alt-notes/"$$f"; \
 	done
-	#mate-settings
-	cd mate-settings; \
-	install -Dm644 50_mate-background.gschema.override $(datadir)/glib-2.0/schemas/50_mate-background.gschema.override; \
-	install -Dm644 60_mate-theme.gschema.override $(datadir)/glib-2.0/schemas/60_mate-theme.gschema.override; \
-	install -Dm644 Trolltech.conf $(sysconfdir)/skel/.config/Trolltech.conf; \
-	cd ..
-	install -d $(sysconfdir)/skel
-	install -Dm 644 gnome-settings/gtkrc-2 $(sysconfdir)/skel/.gtkrc-2.0
-	install -Dm 644 gnome-settings/gtk3-settings.ini $(sysconfdir)/skel/.config/gtk-3.0/settings.ini
 	#slideshow
 	mkdir -p $(datadir)/install2/slideshow
 	mkdir -p $(sysconfdir)/alterator

branding.spec

@@ -7,10 +7,6 @@
 %define status_en alpha
 %define flavour %brand-%theme
 
-%define gtk_theme Breeze
-%define icon_theme Papirus
-%define window_theme Smoothwall
-
 %define design_graphics_abi_epoch 0
 %define design_graphics_abi_major 12
 %define design_graphics_abi_minor 0
@@ -171,28 +167,6 @@ Distribution license and release notes
 В данном пакете находится лицензия и дополнительные сведения
 для дистрибутива %distro_name_ru.
 
-%package mate-settings
-BuildArch: noarch
-Summary: MATE settings for %distro_name
-License: Distributable
-Group:   Graphical desktop/GNOME
-Requires: gksu
-Requires: dconf
-# Specified themes
-Requires: icon-theme-ePapirus
-Requires: icon-theme-Papirus
-Requires: icon-theme-Papirus-Dark
-Requires: icon-theme-Papirus-Light
-Requires: gtk-theme-breeze
-Requires: x-cursor-theme-jimmac
-#
-%branding_add_conflicts %flavour mate-settings
-Requires(post): lightdm-gtk-greeter
-Requires(post): libgio
-
-%description mate-settings
-MATE settings for %distro_name
-
 %package slideshow
 Summary: Slideshow for %distro_name installer
 Summary(ru_RU.UTF-8): Изображения для организации "слайдшоу" в установщике дистрибутива %distro_name_ru
@@ -241,7 +215,7 @@ Requires(post): indexhtml-common
 
 %build
 autoconf
-THEME=%theme NAME='%Brand %Theme' BRAND_FNAME='%brand' BRAND='%brand' STATUS_EN=%status_en STATUS=%status VERSION=%version PRODUCT_NAME_RU='%distro_name_ru' PRODUCT_NAME='%distro_name' CODENAME='%codename' X86='%x86' GTK_THEME='%gtk_theme' ICON_THEME='%icon_theme' WINDOW_THEME='%window_theme' ./configure
+THEME=%theme NAME='%Brand %Theme' BRAND_FNAME='%brand' BRAND='%brand' STATUS_EN=%status_en STATUS=%status VERSION=%version PRODUCT_NAME_RU='%distro_name_ru' PRODUCT_NAME='%distro_name' CODENAME='%codename' X86='%x86' ./configure
 make
 
 %install
@@ -296,11 +270,6 @@ subst "s/Theme=.*/Theme=%theme/" /etc/plymouth/plymouthd.conf
              /etc/sysconfig/grub2 ||:
 %endif
 
-%post mate-settings
-subst 's/^#\?theme-name=.*/theme-name=%gtk_theme/' /etc/lightdm/lightdm-gtk-greeter.conf ||:
-subst 's/^#\?icon-theme-name=.*/icon-theme-name=%icon_theme/' /etc/lightdm/lightdm-gtk-greeter.conf ||:
-/usr/bin/glib-compile-schemas /usr/share/glib-2.0/schemas
-
 #release
 %post release
 if ! [ -e %_sysconfdir/altlinux-release ] && \
@@ -342,11 +311,6 @@ fi
 %_datadir/alt-notes/release-notes.*
 %ghost %config(noreplace) %_datadir/alt-notes/license.*.html
 
-%files mate-settings
-%_sysconfdir/skel/.config/
-%_sysconfdir/skel/.gtkrc-2.0
-%_datadir/glib-2.0/schemas/*.gschema.override
-
 %files slideshow
 /etc/alterator/slideshow.conf
 /usr/share/install2/slideshow

configure.ac

@@ -26,9 +26,6 @@ AC_SUBST(VERSION)
 AC_SUBST(PRODUCT_NAME)
 AC_SUBST(PRODUCT_NAME_RU)
 AC_SUBST(DOCDIR)
-AC_SUBST(GTK_THEME)
-AC_SUBST(ICON_THEME)
-AC_SUBST(WINDOW_THEME)
 AC_SUBST(PROGRESS_COLOR)
 AC_SUBST(LIGHT_COLOR_HEX)
 AC_SUBST(MIDDLE_COLOR_HEX)
@@ -59,8 +56,5 @@ AC_CONFIG_FILES([
 	 indexhtml/index-en.html
 	 systemd/os-release
 	 ahttpd/styles/alterator.css
-	 gnome-settings/gtkrc-2
-	 gnome-settings/gtk3-settings.ini
-	 mate-settings/60_mate-theme.gschema.override
 ])
 AC_OUTPUT

gnome-settings/gnome-applications.menu

-<!DOCTYPE Menu PUBLIC "-//freedesktop//DTD Menu 1.0//EN"
- "http://www.freedesktop.org/standards/menu-spec/menu-1.0.dtd">
-
-<Menu>
-  <MergeFile>altlinux-applications.menu</MergeFile>
-  <Name>Applications</Name>
-  <Menu>
-    <Name>Multimedia</Name>
-    <Exclude>
-      <Filename>adobe_flash_player_eula.desktop</Filename>
-    </Exclude>
-  </Menu>
-  <Menu>
-    <Name>Internet</Name>
-    <Exclude>
-      <Filename>lftp.desktop</Filename>
-    </Exclude>
-  </Menu>
-  <Menu>
-    <Name>Development</Name>
-    <Exclude>
-      <Filename>gdb.desktop</Filename>
-    </Exclude>
-  </Menu>
-</Menu>

gnome-settings/gtk3-settings.ini.in

-[Settings]
-gtk-theme-name=@GTK_THEME@
-gtk-icon-theme-name=@ICON_THEME@
-gtk-fallback-icon-theme=gnome
-gtk-toolbar-style=GTK_TOOLBAR_ICONS
-gtk-menu-images=1
-gtk-button-images=1
-gtk-alternative-button-order=1

gnome-settings/gtkrc-2.in

-include "/usr/share/themes/@GTK_THEME@/gtk-2.0/gtkrc"
-include "/etc/gtk-2.0/gtkrc"
-gtk-theme-name="@GTK_THEME@"
-gtk-icon-theme-name="@ICON_THEME@"
-gtk-fallback-icon-theme="gnome"
-gtk-toolbar-style=GTK_TOOLBAR_ICONS
-gtk-menu-images=1
-gtk-button-images=1
-gtk-alternative-button-order=1

mate-settings/50_mate-background.gschema.override

-[org.mate.desktop.background]
-picture-options="zoom"
-picture-filename="/usr/share/design/current/backgrounds/default.png"
-

mate-settings/60_mate-theme.gschema.override.in

-[org.mate.desktop.interface]
-gtk-theme="@GTK_THEME@"
-icon-theme="@ICON_THEME@"
-
-[org.mate.marco.general]
-theme="@WINDOW_THEME@"
-
-[org.mate.interface]
-gtk-theme="@GTK_THEME@"
-icon-theme="@ICON_THEME@"
-
-[org.mate.Marco.general]
-theme="@WINDOW_THEME@"
-

mate-settings/Trolltech.conf

-[Qt]
-style=GTK+