8.0-alt0.4.M80P.1

branding.spec

@@ -159,16 +159,21 @@ Distribution license and release notes
 В данном пакете находится лицензия и дополнительные сведения
 для дистрибутива %distro_name_ru.
 
-%package kde4-settings
+%package kde-settings
 BuildArch: noarch
-Summary: KDE4 settings for %distro_name
+Summary: KDE settings for %distro_name (for KDE4 and KF5)
 License: Distributable
 Group:   Graphical desktop/KDE
 PreReq: %name-graphics
+Requires: kde5-konsole-colorscheme-SolarizedPastel
+Requires: fonts-ttf-google-droid-sans-mono
+Provides: branding-%flavour-kde4-settings = %version-%release
+Obsoletes: branding-%flavour-kde4-settings < %version-%release
+%branding_add_conflicts %flavour kde-settings
 %branding_add_conflicts %flavour kde4-settings
 
-%description kde4-settings
-KDE4 settings for %distro_name
+%description kde-settings
+KDE settings for %distro_name (for KDE4 and KF5)
 
 %package xfce-settings
 Summary: default settings for Xfce 4.6 for %distro_name
@@ -333,12 +338,18 @@ pushd notes
 %makeinstall
 popd
 
-#kde4-settings
+#kde-settings
 pushd kde4-settings
 mkdir -p %buildroot%_sysconfdir/skel/.kde4
 cp -a kde4/* %buildroot%_sysconfdir/skel/.kde4/
 mkdir -p %buildroot%_sysconfdir/kde4/xdg/menus/applications-merged/
 install -m 0644 menu/*.menu %buildroot%_sysconfdir/kde4/xdg/menus/applications-merged/
+install -Dm 0644 Education.profile %buildroot%_datadir/kf5/konsole/Education.profile
+install -Dm 0644 konsolerc %buildroot%_sysconfdir/skel/.config/konsolerc
+mkdir -p %buildroot/%_sysconfdir/skel/.config/autostart/
+for n in nm-applet; do
+    echo -e "[Desktop Entry]\nNotShownIn=GNOME;KDE;" > %buildroot%_sysconfdir/skel/.config/autostart/$n.desktop
+done
 popd
 
 # disable annoing autostart
@@ -486,9 +497,12 @@ subst 's/#theme-name=/theme-name=Clearlooks-Phenix/' /etc/lightdm/lightdm-gtk-gr
 %files notes
 %_datadir/alt-notes/*
 
-%files kde4-settings
+%files kde-settings
 %_sysconfdir/kde4/xdg/menus/applications-merged/*.menu
 %_sysconfdir/skel/.kde4
+%_datadir/kf5/konsole/Education.profile
+/etc/skel/.config/autostart/nm-applet.desktop
+/etc/skel/.config/konsolerc
 
 %files fvwm-settings
 %_sysconfdir/skel/.fvwm2rc
@@ -501,6 +515,8 @@ subst 's/#theme-name=/theme-name=Clearlooks-Phenix/' /etc/lightdm/lightdm-gtk-gr
 /etc/skel/XDG-Templates.skel/
 /etc/skel/.wm-select
 /etc/skel/.config
+%exclude /etc/skel/.config/autostart/nm-applet.desktop
+%exclude /etc/skel/.config/konsolerc
 /etc/skel/.gtkrc-2.0
 /etc/skel/.local
 /etc/skel/.gconf
@@ -531,8 +547,10 @@ subst 's/#theme-name=/theme-name=Clearlooks-Phenix/' /etc/lightdm/lightdm-gtk-gr
 #config %_localstatedir/ldm/.pam_environment
 
 %changelog
-* Fri Sep 02 2016 Andrey Cherepanov <cas@altlinux.org> 8.0-alt0.4.M80P.1
-- Use bright education icon suitable both for light and dark backgrounds
+* Mon Sep 05 2016 Andrey Cherepanov <cas@altlinux.org> 8.0-alt0.4.M80P.1
+- Use bright Education icon suitable both for light and dark backgrounds
+- Rename kde4-settings to kde-settings, package Konsole profile and
+  disable nm-applet.desktop autostart in KDE
 
 * Tue Aug 30 2016 Andrey Cherepanov <cas@altlinux.org> 8.0-alt0.3.M80P.1
 - Set yellow labels for gfxboot

kde4-settings/Education.profile

+[Appearance]
+ColorScheme=SolarizedPastel
+Font=Droid Sans Mono,10,-1,5,50,0,0,0,0,0
+
+[General]
+Icon=utilities-terminal
+LocalTabTitleFormat=%D : %n
+Name=Education
+Name[ru]=Образование
+Parent=FALLBACK/
+RemoteTabTitleFormat=(%u) %H
+ShowTerminalSizeHint=false
+
+[Interaction Options]
+OpenLinksByDirectClickEnabled=false
+WordCharacters=:@-./_~?&=%+
+
+[Scrolling]
+HistoryMode=1
+HistorySize=10000
+ScrollBarPosition=2
+ScrollFullPage=1
+
+[Terminal Features]
+BidiRenderingEnabled=true
+BlinkingTextEnabled=false
+FlowControlEnabled=false

kde4-settings/konsolerc

+[Desktop Entry]
+DefaultProfile=Education.profile
+
+[Favorite Profiles]
+Favorites=Education.profile
+