diff --git a/.gear/rules b/.gear/rules index 24d3601..fed29d6 100644 --- a/.gear/rules +++ b/.gear/rules @@ -1,3 +1,3 @@ -tar: icons-kometa-classic name=icons-kometa-classic-@version@ base=icons-kometa-classic-@version@ -tar: icon-theme-kometa-classic name=icon-theme-kometa-classic-@version@ base=icon-theme-kometa-classic-@version@ +tar: icons-mos-classic name=icons-mos-classic-@version@ base=icons-mos-classic-@version@ +tar: icon-theme-mos-classic name=icon-theme-mos-classic-@version@ base=icon-theme-mos-classic-@version@ copy: COPYING diff --git a/icon-theme-kometa-classic/index.theme b/icon-theme-mos-classic/index.theme similarity index 82% rename from icon-theme-kometa-classic/index.theme rename to icon-theme-mos-classic/index.theme index 217f318..b1a1acb 100644 --- a/icon-theme-kometa-classic/index.theme +++ b/icon-theme-mos-classic/index.theme @@ -1,8 +1,8 @@ [Icon Theme] -@light Name=Kometa light classic -@light Name[ru]=Комета светлая классическая -@dark Name=Kometa dark classic -@dark Name[ru]=Комета темная классическая +@light Name=M OS light classic +@light Name[ru]=М ОС светлая классическая +@dark Name=M OS dark classic +@dark Name[ru]=М ОС темная классическая @light Inherits=breeze @dark Inherits=breeze-dark diff --git a/icon-theme-kometa-classic/mk-symlinks.sh b/icon-theme-mos-classic/mk-symlinks.sh similarity index 62% rename from icon-theme-kometa-classic/mk-symlinks.sh rename to icon-theme-mos-classic/mk-symlinks.sh index d585201..d37ca7d 100755 --- a/icon-theme-kometa-classic/mk-symlinks.sh +++ b/icon-theme-mos-classic/mk-symlinks.sh @@ -17,15 +17,15 @@ _ln(){ # svg pushd apps/128x128 -_ln ${PREFIX}/hicolor/scalable/apps/kometa.svg basealt.svg -_ln ${PREFIX}/hicolor/scalable/apps/kometa.svg altlinux.svg +_ln ${PREFIX}/hicolor/scalable/apps/mos.svg basealt.svg +_ln ${PREFIX}/hicolor/scalable/apps/mos.svg altlinux.svg popd # png for i in 64x64 48x48 32x32 24x24 16x16 do pushd apps/${i} - _ln ${PREFIX}/hicolor/${i}/apps/kometa.png basealt.png - _ln ${PREFIX}/hicolor/${i}/apps/kometa.png altlinux.png + _ln ${PREFIX}/hicolor/${i}/apps/mos.png basealt.png + _ln ${PREFIX}/hicolor/${i}/apps/mos.png altlinux.png popd done diff --git a/icons-kometa-classic/128x128/apps/kometa.png b/icons-kometa-classic/128x128/apps/kometa.png deleted file mode 100644 index 717571c..0000000 Binary files a/icons-kometa-classic/128x128/apps/kometa.png and /dev/null differ diff --git a/icons-kometa-classic/16x16/apps/kometa.png b/icons-kometa-classic/16x16/apps/kometa.png deleted file mode 100644 index 88fbda6..0000000 Binary files a/icons-kometa-classic/16x16/apps/kometa.png and /dev/null differ diff --git a/icons-kometa-classic/22x22/apps/kometa.png b/icons-kometa-classic/22x22/apps/kometa.png deleted file mode 100644 index 8490955..0000000 Binary files a/icons-kometa-classic/22x22/apps/kometa.png and /dev/null differ diff --git a/icons-kometa-classic/24x24/apps/kometa.png b/icons-kometa-classic/24x24/apps/kometa.png deleted file mode 100644 index e60af68..0000000 Binary files a/icons-kometa-classic/24x24/apps/kometa.png and /dev/null differ diff --git a/icons-kometa-classic/32x32/apps/kometa.png b/icons-kometa-classic/32x32/apps/kometa.png deleted file mode 100644 index 4c20184..0000000 Binary files a/icons-kometa-classic/32x32/apps/kometa.png and /dev/null differ diff --git a/icons-kometa-classic/48x48/apps/kometa.png b/icons-kometa-classic/48x48/apps/kometa.png deleted file mode 100644 index a1b2532..0000000 Binary files a/icons-kometa-classic/48x48/apps/kometa.png and /dev/null differ diff --git a/icons-kometa-classic/64x64/apps/kometa.png b/icons-kometa-classic/64x64/apps/kometa.png deleted file mode 100644 index 088fe04..0000000 Binary files a/icons-kometa-classic/64x64/apps/kometa.png and /dev/null differ diff --git a/icons-kometa-classic/scalable/apps/kometa.svg b/icons-kometa-classic/scalable/apps/kometa.svg deleted file mode 100644 index 2349481..0000000 --- a/icons-kometa-classic/scalable/apps/kometa.svg +++ /dev/null @@ -1,113 +0,0 @@ - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - diff --git a/icons-mos-classic/128x128/apps/mos.png b/icons-mos-classic/128x128/apps/mos.png new file mode 100644 index 0000000..04a70ad Binary files /dev/null and b/icons-mos-classic/128x128/apps/mos.png differ diff --git a/icons-mos-classic/128x128/apps/mos.svg b/icons-mos-classic/128x128/apps/mos.svg new file mode 100644 index 0000000..a0871cc --- /dev/null +++ b/icons-mos-classic/128x128/apps/mos.svg @@ -0,0 +1,92 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/icons-mos-classic/16x16/apps/mos.png b/icons-mos-classic/16x16/apps/mos.png new file mode 100644 index 0000000..e2c3c6d Binary files /dev/null and b/icons-mos-classic/16x16/apps/mos.png differ diff --git a/icons-mos-classic/16x16/apps/mos.svg b/icons-mos-classic/16x16/apps/mos.svg new file mode 100644 index 0000000..a0871cc --- /dev/null +++ b/icons-mos-classic/16x16/apps/mos.svg @@ -0,0 +1,92 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/icons-mos-classic/22x22/apps/mos.png b/icons-mos-classic/22x22/apps/mos.png new file mode 100644 index 0000000..9378585 Binary files /dev/null and b/icons-mos-classic/22x22/apps/mos.png differ diff --git a/icons-mos-classic/22x22/apps/mos.svg b/icons-mos-classic/22x22/apps/mos.svg new file mode 100644 index 0000000..a0871cc --- /dev/null +++ b/icons-mos-classic/22x22/apps/mos.svg @@ -0,0 +1,92 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/icons-mos-classic/24x24/apps/mos.png b/icons-mos-classic/24x24/apps/mos.png new file mode 100644 index 0000000..418c960 Binary files /dev/null and b/icons-mos-classic/24x24/apps/mos.png differ diff --git a/icons-mos-classic/24x24/apps/mos.svg b/icons-mos-classic/24x24/apps/mos.svg new file mode 100644 index 0000000..a0871cc --- /dev/null +++ b/icons-mos-classic/24x24/apps/mos.svg @@ -0,0 +1,92 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/icons-mos-classic/32x32/apps/mos.png b/icons-mos-classic/32x32/apps/mos.png new file mode 100644 index 0000000..321297a Binary files /dev/null and b/icons-mos-classic/32x32/apps/mos.png differ diff --git a/icons-mos-classic/32x32/apps/mos.svg b/icons-mos-classic/32x32/apps/mos.svg new file mode 100644 index 0000000..a0871cc --- /dev/null +++ b/icons-mos-classic/32x32/apps/mos.svg @@ -0,0 +1,92 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/icons-mos-classic/48x48/apps/mos.png b/icons-mos-classic/48x48/apps/mos.png new file mode 100644 index 0000000..9fc1870 Binary files /dev/null and b/icons-mos-classic/48x48/apps/mos.png differ diff --git a/icons-mos-classic/48x48/apps/mos.svg b/icons-mos-classic/48x48/apps/mos.svg new file mode 100644 index 0000000..a0871cc --- /dev/null +++ b/icons-mos-classic/48x48/apps/mos.svg @@ -0,0 +1,92 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/icons-mos-classic/64x64/apps/mos.png b/icons-mos-classic/64x64/apps/mos.png new file mode 100644 index 0000000..3c46716 Binary files /dev/null and b/icons-mos-classic/64x64/apps/mos.png differ diff --git a/icons-mos-classic/64x64/apps/mos.svg b/icons-mos-classic/64x64/apps/mos.svg new file mode 100644 index 0000000..a0871cc --- /dev/null +++ b/icons-mos-classic/64x64/apps/mos.svg @@ -0,0 +1,92 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/icons-mos-classic/scalable/apps/mos.svg b/icons-mos-classic/scalable/apps/mos.svg new file mode 100644 index 0000000..a0871cc --- /dev/null +++ b/icons-mos-classic/scalable/apps/mos.svg @@ -0,0 +1,92 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/kometa-icons.spec b/kometa-icons.spec deleted file mode 100644 index b0c0aac..0000000 --- a/kometa-icons.spec +++ /dev/null @@ -1,96 +0,0 @@ -%define _unpackaged_files_terminate_build 1 - -Name: kometa-icons -Summary: Icons for Kometa distros -Summary(ru): Иконки для дистрибутивов Комета -License: CC-BY-SA-3.0 and GPL-3.0 -Group: Graphics -Version: 1.0 -Release: alt1 -Source0: icons-kometa-classic-%version.tar -Source1: icon-theme-kometa-classic-%version.tar -Source3: COPYING -BuildArch: noarch -# mk-symlinks.sh -BuildRequires: bash - -%description -Icons for Kometa distros -%description -l ru_RU.UTF-8 -Иконки для дистрибутивов Комета - -#--------------------------------------------------------- - -%package core-classic -Summary: Core icons of Kometa, classic variant -Summary(ru): Основные иконки Кометы, классический вариант -License: CC-BY-SA-3.0 -Group: Graphics - -%description core-classic -Core icons of Kometa, classic variant -%description core-classic -l ru_RU.UTF-8 -Основные иконки Кометы, классический вариант - -%files core-classic -%doc COPYING -%_iconsdir/hicolor/*x*/apps/kometa.png -%_iconsdir/hicolor/scalable/apps/kometa.svg - -#--------------------------------------------------------- - -%package theme-classic -Summary: Kometa icon themes, classic variant -Summary(ru): Темы иконок Кометы, классический вариант -License: GPL-3.0 -Group: Graphics -Requires: %name-core-classic = %EVR -Requires: icon-theme-breeze - -%description theme-classic -Light and dark Kometa icon themes. Inherit Breeze and -replace some icons. -%description theme-classic -l ru_RU.UTF-8 -Светлая и темные темы значков для Кометы. Наследуют -тему Breeze, заменяя некоторые иконки. - -%files theme-classic -%doc COPYING -%_iconsdir/kometa-classic-light -%_iconsdir/kometa-classic-dark - -#--------------------------------------------------------- - -%prep -%setup -q -c -a1 -cp %{SOURCE3} . - -%build - -%install - -# core -mkdir -p %buildroot%_iconsdir/hicolor -cp -rv icons-kometa-classic-%version/* %buildroot%_iconsdir/hicolor -# ensure correct modes -find %buildroot%_iconsdir -type f | xargs chmod 0644 -find %buildroot%_iconsdir -type d | xargs chmod 0755 - -# themes -mkdir -p %buildroot%_iconsdir/kometa-classic-light -mkdir -p %buildroot%_iconsdir/kometa-classic-dark -sed icon-theme-kometa-classic-%version/index.theme -e '/^@dark /d' -e 's/^@light //' > %buildroot%_iconsdir/kometa-classic-light/index.theme -sed icon-theme-kometa-classic-%version/index.theme -e '/^@light /d' -e 's/^@dark //' > %buildroot%_iconsdir/kometa-classic-dark/index.theme -export SCRIPT="$PWD"/icon-theme-kometa-classic-%version/mk-symlinks.sh -export PREFIX="../../.." -( cd %buildroot%_iconsdir/kometa-classic-light - bash "$SCRIPT" -) -( cd %buildroot%_iconsdir/kometa-classic-dark - bash "$SCRIPT" -) - -%changelog -* Mon Dec 13 2021 Mikhail Novosyolov 1.0-alt1 -- Init - diff --git a/mos-icons.spec b/mos-icons.spec new file mode 100644 index 0000000..b18d495 --- /dev/null +++ b/mos-icons.spec @@ -0,0 +1,105 @@ +%define _unpackaged_files_terminate_build 1 + +Name: mos-icons +Summary: Icons for M OS distros +Summary(ru): Иконки для дистрибутивов М ОС +License: CC-BY-SA-3.0 and GPL-3.0 +Group: Graphics +Version: 2.0 +Release: alt1 +Source0: icons-mos-classic-%version.tar +Source1: icon-theme-mos-classic-%version.tar +Source3: COPYING +BuildArch: noarch +# mk-symlinks.sh +BuildRequires: bash + +%description +Icons for M OS distros +%description -l ru_RU.UTF-8 +Иконки для дистрибутивов М ОС + +#--------------------------------------------------------- + +%package core-classic +Summary: Core icons of M OS, classic variant +Summary(ru): Основные иконки М ОС, классический вариант +License: CC-BY-SA-3.0 +Group: Graphics +# package was renamed +Obsoletes: kometa-icons-core-classic < 2.0 + +%description core-classic +Core icons of M OS, classic variant +%description core-classic -l ru_RU.UTF-8 +Основные иконки М ОС, классический вариант + +%files core-classic +%doc COPYING +%_iconsdir/hicolor/*x*/apps/mos.png +%_iconsdir/hicolor/*x*/apps/mos.svg +%_iconsdir/hicolor/scalable/apps/mos.svg + +#--------------------------------------------------------- + +%package theme-classic +Summary: M OS icon themes, classic variant +Summary(ru): Темы иконок М ОС, классический вариант +License: GPL-3.0 +Group: Graphics +Requires: %name-core-classic = %EVR +Requires: icon-theme-breeze +# package was renamed +Obsoletes: kometa-icons-theme-classic < 2.0 + +%description theme-classic +Light and dark M OS icon themes. Inherit Breeze and +replace some icons. +%description theme-classic -l ru_RU.UTF-8 +Светлая и темные темы значков для М ОС. Наследуют +тему Breeze, заменяя некоторые иконки. + +%files theme-classic +%doc COPYING +%_iconsdir/mos-classic-light +%_iconsdir/mos-classic-dark + +#--------------------------------------------------------- + +%prep +%setup -q -c -a1 +cp %{SOURCE3} . + +%build + +%install + +# core +mkdir -p %buildroot%_iconsdir/hicolor +cp -rv icons-mos-classic-%version/* %buildroot%_iconsdir/hicolor +# ensure correct modes +find %buildroot%_iconsdir -type f | xargs chmod 0644 +find %buildroot%_iconsdir -type d | xargs chmod 0755 + +# themes +mkdir -p %buildroot%_iconsdir/mos-classic-light +mkdir -p %buildroot%_iconsdir/mos-classic-dark +sed icon-theme-mos-classic-%version/index.theme -e '/^@dark /d' -e 's/^@light //' > %buildroot%_iconsdir/mos-classic-light/index.theme +sed icon-theme-mos-classic-%version/index.theme -e '/^@light /d' -e 's/^@dark //' > %buildroot%_iconsdir/mos-classic-dark/index.theme +export SCRIPT="$PWD"/icon-theme-mos-classic-%version/mk-symlinks.sh +export PREFIX="../../.." +( cd %buildroot%_iconsdir/mos-classic-light + bash "$SCRIPT" +) +( cd %buildroot%_iconsdir/mos-classic-dark + bash "$SCRIPT" +) + +%changelog +* Tue Apr 26 2022 Mikhail Novosyolov 2.0-alt1 +- Rename from Kometa to M OS (Moscow OS) +- Added SVG icons of different sizes alongside PNG + +* Mon Dec 13 2021 Mikhail Novosyolov 1.0-alt1 +- Init +