diff --git a/branding-kometa-school/branding-kometa-school.spec b/branding-kometa-school/branding-kometa-school.spec index 35e19fa..f49761f 100644 --- a/branding-kometa-school/branding-kometa-school.spec +++ b/branding-kometa-school/branding-kometa-school.spec @@ -7,7 +7,7 @@ Name: branding-%brand-%theme Version: 4.1 -Release: alt3 +Release: alt4 BuildRequires: cpio gfxboot >= 4 fonts-ttf-dejavu fonts-ttf-google-droid-sans BuildRequires: design-bootloader-source >= 5.0-alt2 @@ -405,7 +405,10 @@ cat '/%_datadir/themes/%XdgThemeName/panel-default-setup.entries' > \ %_desktopdir/indexhtml.desktop %changelog -* Mon Mar 14 2022 Artem Proskurnev 4.1-alt3 +* Fri Mar 18 2022 Artem Proskurnev 4.1-alt4 +- Dark boot.jpg + +* Tue Mar 15 2022 Artem Proskurnev 4.1-alt3 - New images * Fri Mar 11 2022 Evgeniy Kukhtinov 4.0-alt3 diff --git a/branding-kometa-school/branding-kometa-school/branding.spec b/branding-kometa-school/branding-kometa-school/branding.spec index 44d3805..f49761f 100644 --- a/branding-kometa-school/branding-kometa-school/branding.spec +++ b/branding-kometa-school/branding-kometa-school/branding.spec @@ -6,19 +6,16 @@ %define distribution KOMETA Name: branding-%brand-%theme -Version: 4.0 -Release: kometa0 -Packager: Artem Proskurnev - +Version: 4.1 +Release: alt4 BuildRequires: cpio gfxboot >= 4 fonts-ttf-dejavu fonts-ttf-google-droid-sans BuildRequires: design-bootloader-source >= 5.0-alt2 %ifnarch %arm %endif -BuildRequires(pre): libqt4-core +BuildRequires: qt5-base-devel BuildRequires: libalternatives-devel -BuildRequires: libqt4-devel BuildRequires: ImageMagick fontconfig bc libGConf-devel @@ -27,22 +24,21 @@ BuildRequires: ImageMagick fontconfig bc libGConf-devel %define variants Platform6-server-light alt-desktop alt-education alt-server alt-starterkit alt-workstation altlinux-backup-server altlinux-centaurus altlinux-desktop altlinux-gnome-desktop altlinux-kdesktop altlinux-lite altlinux-lxdesktop altlinux-office-desktop altlinux-office-server altlinux-p7 altlinux-school-server altlinux-sisyphus altlinux-spt altlinux-starterkit altlinux-tablet altlinux-workbench basealt-server basealt-starterkit basealt-workstation informika-schoolmaster ivk-chainmail lxde-desktop lxde-school-lite school-junior school-lite school-master school-server school-teacher school-terminal simply-linux sisyphus-server-light xalt-kworkstation altlinux-club-small kometa-home kometa-sport kometa-business -Source: branding.tar +Source: %name-%version.tar Group: Graphics Summary: System/Base -License: GPL +License: GPL-1 %description Distro-specific packages with design and texts - %package bootloader Group: System/Configuration/Boot and Init Summary: Graphical boot logo for grub2, lilo and syslinux License: GPL -PreReq: coreutils +Requires: coreutils Provides: design-bootloader-system-%theme design-bootloader-livecd-%theme design-bootloader-livecd-%theme design-bootloader-%theme branding-alt-%theme-bootloader Obsoletes: design-bootloader-system-%theme design-bootloader-livecd-%theme design-bootloader-livecd-%theme design-bootloader-%theme branding-alt-%theme-bootloader @@ -61,13 +57,12 @@ License: Distributable Group: System/Configuration/Boot and Init Provides: plymouth-theme-%theme Requires: plymouth-plugin-script -PreReq: plymouth +Requires(pre): plymouth Conflicts: %(for n in %variants ; do [ "$n" = %brand-%theme ] || echo -n "branding-$n-bootsplash ";done ) %description bootsplash This package contains graphics for boot process, displayed via Plymouth - %package alterator BuildArch: noarch Summary: Design for alterator for %Brand %Theme @@ -79,7 +74,7 @@ Obsoletes: branding-alt-%theme-browser-qt branding-altlinux-%theme-browser-qt Conflicts: %(for n in %variants ; do [ "$n" = %brand-%theme ] || echo -n "branding-$n-alterator ";done ) Obsoletes: design-alterator-server design-alterator-desktop design-altertor-browser-desktop design-altertor-browser-server -PreReq(post,preun): alternatives >= 0.2 alterator +Requires(post,preun): alternatives >= 0.2 alterator %description alterator Design for QT and web alterator for %Brand %Theme @@ -94,13 +89,12 @@ Provides: design-graphics-%theme branding-alt-%theme-graphics Obsoletes: branding-alt-%theme-graphics design-graphics-%theme Provides: design-graphics = 12.0.0 Provides: gnome-session-splash = %version-%release -PreReq(post,preun): alternatives >= 0.2 +Requires(post,preun): alternatives >= 0.2 Conflicts: %(for n in %variants ; do [ "$n" = %brand-%theme ] || echo -n "branding-$n-graphics ";done ) %description graphics This package contains some graphics for ALT design. - %define provide_list altlinux fedora redhat system altlinux %define obsolete_list altlinux-release fedora-release redhat-release %define conflicts_list altlinux-release-sisyphus altlinux-release-4.0 altlinux-release-junior altlinux-release-master altlinux-release-server altlinux-release-terminal altlinux-release-small_business @@ -138,7 +132,7 @@ Summary: KDE4 settings for %Brand %version %Theme License: Distributable Group: Graphical desktop/KDE Conflicts: %(for n in %variants ; do [ "$n" = %brand-%theme ] || echo -n "branding-$n-kde4-settings ";done ) -PreReq: %name-graphics +Requires(pre): %name-graphics %description kde4-settings KDE4 settings for %Brand %version %Theme @@ -150,7 +144,7 @@ Summary: KDE3 settings for %Brand %version %Theme License: Distributable Group: Graphical desktop/KDE Requires: ksplash-engine-moodin -PreReq: %name-graphics +Requires(pre): %name-graphics Conflicts: %(for n in %variants ; do [ "$n" = %brand-%theme ] || echo -n "branding-$n-kde3-settings ";done ) %description kde3-settings @@ -176,7 +170,7 @@ License: Distributable Group: Graphical desktop/GNOME Requires: gtk2-theme-mist Requires: altlinux-freedesktop-menu-gnomish-menu -PreReq: gnome-panel +Requires(pre): gnome-panel Provides: gnome-theme-%brand-%theme = %version-%release Provides: metacity-theme-%brand-%theme = %version-%release Provides: metacity-theme @@ -186,7 +180,6 @@ Conflicts: %(for n in %variants ; do [ "$n" = %brand-%theme ] || echo -n "brandi %description gnome-settings GNOME settings for %Brand %version %Theme - %package slideshow BuildArch: noarch @@ -222,7 +215,7 @@ Requires(post): indexhtml-common ALT Linux index.html welcome page. %prep -%setup -n branding +%setup -q -n %name-%version %ifnarch %arm %define x86 boot @@ -332,7 +325,6 @@ shell_config_set /etc/sysconfig/grub2 GRUB_THEME /boot/grub/themes/%theme/theme. shell_config_set /etc/sysconfig/grub2 GRUB_COLOR_NORMAL %grub_normal shell_config_set /etc/sysconfig/grub2 GRUB_COLOR_HIGHLIGHT %grub_high - %preun bootloader [ $1 = 0 ] || exit 0 [ "`readlink /boot/splash/message`" != "%theme/message" ] || @@ -365,8 +357,6 @@ cat '/%_datadir/themes/%XdgThemeName/panel-default-setup.entries' > \ /usr/bin/gconftool-2 --direct --config-source=$(/usr/bin/gconftool-2 --get-default-source) \ --load='/%_datadir/themes/%XdgThemeName/panel-default-setup.entries' /apps/panel - - %files alterator %config %_altdir/*.rcc /usr/share/alterator-browser-qt/design/*.rcc @@ -415,6 +405,21 @@ cat '/%_datadir/themes/%XdgThemeName/panel-default-setup.entries' > \ %_desktopdir/indexhtml.desktop %changelog +* Fri Mar 18 2022 Artem Proskurnev 4.1-alt4 +- Dark boot.jpg + +* Tue Mar 15 2022 Artem Proskurnev 4.1-alt3 +- New images + +* Fri Mar 11 2022 Evgeniy Kukhtinov 4.0-alt3 +- add wallpaper image + +* Wed Mar 09 2022 Evgeniy Kukhtinov 4.0-alt2 +- changed qt4 to qt5 + +* Sun Mar 06 2022 Evgeniy Kukhtinov 4.0-alt1 +- new version (fixed building) + * Thu Mar 22 2018 Artem Proskurnev 3.3-kometa3 - Исправление фонов diff --git a/branding-kometa-school/branding-kometa-school/color_dec b/branding-kometa-school/branding-kometa-school/color_dec old mode 100755 new mode 100644 diff --git a/branding-kometa-school/branding-kometa-school/fetch_color b/branding-kometa-school/branding-kometa-school/fetch_color old mode 100755 new mode 100644 diff --git a/branding-kometa-school/branding-kometa-school/graphics/backgrounds/desktop_1.png b/branding-kometa-school/branding-kometa-school/graphics/backgrounds/desktop_1.png deleted file mode 120000 index 0f2e083..0000000 --- a/branding-kometa-school/branding-kometa-school/graphics/backgrounds/desktop_1.png +++ /dev/null @@ -1 +0,0 @@ -default.png \ No newline at end of file diff --git a/branding-kometa-school/branding-kometa-school/graphics/backgrounds/desktop_2.png b/branding-kometa-school/branding-kometa-school/graphics/backgrounds/desktop_2.png deleted file mode 120000 index 0f2e083..0000000 --- a/branding-kometa-school/branding-kometa-school/graphics/backgrounds/desktop_2.png +++ /dev/null @@ -1 +0,0 @@ -default.png \ No newline at end of file diff --git a/branding-kometa-school/branding-kometa-school/graphics/backgrounds/desktop_3.png b/branding-kometa-school/branding-kometa-school/graphics/backgrounds/desktop_3.png deleted file mode 120000 index 0f2e083..0000000 --- a/branding-kometa-school/branding-kometa-school/graphics/backgrounds/desktop_3.png +++ /dev/null @@ -1 +0,0 @@ -default.png \ No newline at end of file diff --git a/branding-kometa-school/branding-kometa-school/graphics/backgrounds/desktop_4.png b/branding-kometa-school/branding-kometa-school/graphics/backgrounds/desktop_4.png deleted file mode 120000 index 0f2e083..0000000 --- a/branding-kometa-school/branding-kometa-school/graphics/backgrounds/desktop_4.png +++ /dev/null @@ -1 +0,0 @@ -default.png \ No newline at end of file diff --git a/branding-kometa-school/branding-kometa-school/images/boot.jpg b/branding-kometa-school/branding-kometa-school/images/boot.jpg index 2095136..46ff61c 100644 Binary files a/branding-kometa-school/branding-kometa-school/images/boot.jpg and b/branding-kometa-school/branding-kometa-school/images/boot.jpg differ diff --git a/branding-kometa-school/branding-kometa-school/kde3-settings/apps/kviewviewer/kpartplugins/kviewbrowser.rc b/branding-kometa-school/branding-kometa-school/kde3-settings/apps/kviewviewer/kpartplugins/kviewbrowser.rc old mode 100755 new mode 100644 diff --git a/branding-kometa-school/branding-kometa-school/kde3-settings/config/kcmlaptoprc b/branding-kometa-school/branding-kometa-school/kde3-settings/config/kcmlaptoprc old mode 100755 new mode 100644 diff --git a/branding-kometa-school/branding-kometa-school/kde3-settings/config/kdeglobals.in b/branding-kometa-school/branding-kometa-school/kde3-settings/config/kdeglobals.in old mode 100755 new mode 100644 diff --git a/branding-kometa-school/branding-kometa-school/kde3-settings/config/konsolerc b/branding-kometa-school/branding-kometa-school/kde3-settings/config/konsolerc old mode 100755 new mode 100644 diff --git a/branding-kometa-school/branding-kometa-school/kde3-settings/config/kontactrc b/branding-kometa-school/branding-kometa-school/kde3-settings/config/kontactrc old mode 100755 new mode 100644 diff --git a/branding-kometa-school/branding-kometa-school/kde3-settings/config/kviewcanvasrc b/branding-kometa-school/branding-kometa-school/kde3-settings/config/kviewcanvasrc old mode 100755 new mode 100644 diff --git a/branding-kometa-school/branding-kometa-school/kde3-settings/config/kviewrc b/branding-kometa-school/branding-kometa-school/kde3-settings/config/kviewrc old mode 100755 new mode 100644 diff --git a/branding-kometa-school/branding-kometa-school/kde3-settings/config/kviewviewerrc b/branding-kometa-school/branding-kometa-school/kde3-settings/config/kviewviewerrc old mode 100755 new mode 100644 diff --git a/branding-kometa-school/branding-kometa-school/kde3-settings/kde/bookmarks-ru.xml b/branding-kometa-school/branding-kometa-school/kde3-settings/kde/bookmarks-ru.xml old mode 100755 new mode 100644 diff --git a/branding-kometa-school/branding-kometa-school/kde3-settings/kde/bookmarks.xml b/branding-kometa-school/branding-kometa-school/kde3-settings/kde/bookmarks.xml old mode 100755 new mode 100644 diff --git a/branding-kometa-school/branding-kometa-school/xfce-settings/bin/xfce4-spreadsheet b/branding-kometa-school/branding-kometa-school/xfce-settings/bin/xfce4-spreadsheet old mode 100755 new mode 100644 diff --git a/branding-kometa-school/branding-kometa-school/xfce-settings/bin/xfce4-wordprocessor b/branding-kometa-school/branding-kometa-school/xfce-settings/bin/xfce4-wordprocessor old mode 100755 new mode 100644 diff --git a/branding-kometa-school/build.sh b/branding-kometa-school/build.sh old mode 100755 new mode 100644