From f46cc5526e79079c427245949bc674f882e15d1c Mon Sep 17 00:00:00 2001 From: Artem Proskurnev Date: Fri, 17 Dec 2021 11:33:21 +0300 Subject: [PATCH] Only desktop files and filetrigger for icons --- kometa-std-desktop-1.0/brandicons.filetrigger | 23 ++++++++++++++++++ kometa-std-desktop-1.0/dolphinrc | 4 ---- kometa-std-desktop-1.0/kcminputrc | 2 -- kometa-std-desktop-1.0/kdeglobals | 4 ---- kometa-std-desktop-1.0/kxkbrc | 13 ---------- kometa-std-desktop.spec | 24 ++++++++----------- 6 files changed, 33 insertions(+), 37 deletions(-) create mode 100644 kometa-std-desktop-1.0/brandicons.filetrigger delete mode 100644 kometa-std-desktop-1.0/dolphinrc delete mode 100644 kometa-std-desktop-1.0/kcminputrc delete mode 100644 kometa-std-desktop-1.0/kdeglobals delete mode 100644 kometa-std-desktop-1.0/kxkbrc diff --git a/kometa-std-desktop-1.0/brandicons.filetrigger b/kometa-std-desktop-1.0/brandicons.filetrigger new file mode 100644 index 0000000..7e19b43 --- /dev/null +++ b/kometa-std-desktop-1.0/brandicons.filetrigger @@ -0,0 +1,23 @@ +#!/bin/sh +# +# RPM filetrigger for branding icons. +# +# Copyright (C) 2021 Artem Proskurnev +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. + +for i in $(egrep "(basealt.png|basealt.svg|altlinux.png|altlinux.svg)") +do + f=$(basename $i) + d=$(dirname $i) + suff=$(echo $f | egrep -o "(png|svg)") + f=$(echo $f | egrep -o "(altlinux|basealt)") + k=$d/kometa.$suff + if [ -e $k ] + then + cp -f $k $d/$f.$suff + fi +done \ No newline at end of file diff --git a/kometa-std-desktop-1.0/dolphinrc b/kometa-std-desktop-1.0/dolphinrc deleted file mode 100644 index c19db2d..0000000 --- a/kometa-std-desktop-1.0/dolphinrc +++ /dev/null @@ -1,4 +0,0 @@ -[General] -GlobalViewProps=false -[PreviewSettings] -Plugins=webarchivethumbnail,ffmpegthumbs,imagethumbnail,exrthumbnail,jpegthumbnail,windowsimagethumbnail,svgthumbnail,directorythumbnail,htmlthumbnail,textthumbnail,djvuthumbnail diff --git a/kometa-std-desktop-1.0/kcminputrc b/kometa-std-desktop-1.0/kcminputrc deleted file mode 100644 index a58e3e2..0000000 --- a/kometa-std-desktop-1.0/kcminputrc +++ /dev/null @@ -1,2 +0,0 @@ -[Keyboard] -NumLock=1 diff --git a/kometa-std-desktop-1.0/kdeglobals b/kometa-std-desktop-1.0/kdeglobals deleted file mode 100644 index 12c357f..0000000 --- a/kometa-std-desktop-1.0/kdeglobals +++ /dev/null @@ -1,4 +0,0 @@ -[KDE] -SingleClick=false -[Translations] -LANGUAGE=ru diff --git a/kometa-std-desktop-1.0/kxkbrc b/kometa-std-desktop-1.0/kxkbrc deleted file mode 100644 index 17b383d..0000000 --- a/kometa-std-desktop-1.0/kxkbrc +++ /dev/null @@ -1,13 +0,0 @@ -[Layout] -DisplayNames=АНГ,РУС -LayoutList=us,ru -LayoutLoopCount=-1 -Model=pc101 -Options=compose:menu,grp:alt_shift_toggle -ResetOldOptions=true -ShowFlag=false -ShowLabel=true -ShowLayoutIndicator=true -ShowSingle=false -SwitchMode=WinClass -Use=true diff --git a/kometa-std-desktop.spec b/kometa-std-desktop.spec index c007ac6..36216bb 100644 --- a/kometa-std-desktop.spec +++ b/kometa-std-desktop.spec @@ -1,6 +1,6 @@ Name: kometa-std-desktop Version: 1.0 -Release: kometa1 +Release: kometa2 Summary: Kometa Desktop License: GPLv3 @@ -10,28 +10,25 @@ BuildArch: noarch Source: %name-%version.tar %description -Standart files on Desktop and defaults +Standart files on Desktop and kometa icons %description -l ru_RU.UTF-8 -Файлы по умолчанию для Рабочего стола Кометы и настройки приложений +Файлы по умолчанию для Рабочего стола Кометы и настройка иконок %prep %setup %install %define skeldesktopdir "/etc/skel/Рабочий стол" -%define skelconfig "/etc/skel/.config" +%define ftdir "/usr/lib/rpm" mkdir -p %buildroot%skeldesktopdir -mkdir -p %buildroot%skelconfig +mkdir -p %buildroot%ftdir install -pm644 Home.desktop %buildroot%skeldesktopdir install -pm644 trash.desktop %buildroot%skeldesktopdir install -pm644 Документ.ott %buildroot%skeldesktopdir install -pm644 Таблица.ots %buildroot%skeldesktopdir install -pm644 Презентация.otp %buildroot%skeldesktopdir -install -pm644 dolphinrc %buildroot%skelconfig -install -pm644 kdeglobals %buildroot%skelconfig -install -pm644 kxkbrc %buildroot%skelconfig -install -pm644 kcminputrc %buildroot%skelconfig +install -pm755 brandicons.filetrigger %buildroot%ftdir %files "/etc/skel/Рабочий стол/Home.desktop" @@ -39,13 +36,12 @@ install -pm644 kcminputrc %buildroot%skelconfig "/etc/skel/Рабочий стол/Документ.ott" "/etc/skel/Рабочий стол/Презентация.otp" "/etc/skel/Рабочий стол/Таблица.ots" -"/etc/skel/.config/dolphinrc" -"/etc/skel/.config/kdeglobals" -"/etc/skel/.config/kxkbrc" -"/etc/skel/.config/kcminputrc" - +"/usr/lib/rpm/brandicons.filetrigger" %changelog +* Fri Dec 17 2021 Artem Proskurnev 1.0-kometa2 +- Only desktop icons + filetrigger kometa -> basealt, altlinux + * Thu Oct 21 2021 1.0-kometa1 - Dolphin, single click, ru/us == РУС/АНГ, Num Lock