Skip to content

B
branding-etersoft-ximper
You need to sign in or sign up before continuing.
Commit eaaa68e9 authored by Anton V. Boyarshinov's avatar Anton V. Boyarshinov
Browse files
Options

9.1-alt4

- alternatives priorities changed
parent 266f5a38
Show whitespace changes
Inline Side-by-side
Showing with 10 additions and 8 deletions
Makefile.in
View file @ eaaa68e9
...@@ -64,7 +64,7 @@ browser-qt:browser-qt/design/bg.png ...@@ -64,7 +64,7 @@ browser-qt:browser-qt/design/bg.png
#cp -f browser-qt/design/design-live.qss browser-qt/design/design.qss #cp -f browser-qt/design/design-live.qss browser-qt/design/design.qss
rcc-qt5 -binary browser-qt/theme.qrc -o $(datadir)/alterator-browser-qt/design/$(THEME)-live.rcc rcc-qt5 -binary browser-qt/theme.qrc -o $(datadir)/alterator-browser-qt/design/$(THEME)-live.rcc
install -d $(sysconfdir)/alternatives/packages.d install -d $(sysconfdir)/alternatives/packages.d
printf '/etc/alterator/design-browser-qt\t/usr/share/alterator-browser-qt/design/$(THEME).rcc\t50\n'>$(sysconfdir)/alternatives/packages.d/$(THEME).rcc printf '/etc/alterator/design-browser-qt\t/usr/share/alterator-browser-qt/design/$(THEME).rcc\t46\n'>$(sysconfdir)/alternatives/packages.d/$(THEME).rcc
# ahttpd # ahttpd
...@@ -149,8 +149,8 @@ install: browser-qt ahttpd boot indexhtml ...@@ -149,8 +149,8 @@ install: browser-qt ahttpd boot indexhtml
cp -a backgrounds icons faces $(datadir)/design/$(THEME) cp -a backgrounds icons faces $(datadir)/design/$(THEME)
ln -s ../../../wallpapers $(datadir)/design/$(THEME)/backgrounds/more ln -s ../../../wallpapers $(datadir)/design/$(THEME)/backgrounds/more
install -d $(sysconfdir)/alternatives/packages.d install -d $(sysconfdir)/alternatives/packages.d
echo "/usr/share/design-current /usr/share/design/$(THEME) 000012000000" >> $(sysconfdir)/alternatives/packages.d/branding-$(BRAND)-$(THEME)-graphics echo "/usr/share/design-current /usr/share/design/$(THEME) 000012000046" >> $(sysconfdir)/alternatives/packages.d/branding-$(BRAND)-$(THEME)-graphics
echo "/usr/share/design/current /usr/share/design/$(THEME) 000012000000" >> $(sysconfdir)/alternatives/packages.d/branding-$(BRAND)-$(THEME)-graphics echo "/usr/share/design/current /usr/share/design/$(THEME) 000012000046" >> $(sysconfdir)/alternatives/packages.d/branding-$(BRAND)-$(THEME)-graphics
#release #release
mkdir -p $(sysconfdir)/buildreqs/packages/ignore.d/ mkdir -p $(sysconfdir)/buildreqs/packages/ignore.d/
install -pD -m644 /dev/null $(sysconfdir)/buildreqs/packages/ignore.d/$(BRAND)-$(THEME)-release install -pD -m644 /dev/null $(sysconfdir)/buildreqs/packages/ignore.d/$(BRAND)-$(THEME)-release
......
branding.spec
View file @ eaaa68e9
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
Name: branding-%flavour Name: branding-%flavour
Version: 9.1 Version: 9.1
Release: alt3 Release: alt4
Url: https://basealt.ru Url: https://basealt.ru
%ifarch %ix86 x86_64 %ifarch %ix86 x86_64
...@@ -56,7 +56,7 @@ License: GPLv2+ ...@@ -56,7 +56,7 @@ License: GPLv2+
Requires(pre): coreutils Requires(pre): coreutils
Provides: design-bootloader-system-%theme design-bootloader-livecd-%theme design-bootloader-livecd-%theme design-bootloader-%theme branding-alt-%theme-bootloader 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 Obsoletes: design-bootloader-system-%theme design-bootloader-livecd-%theme design-bootloader-livecd-%theme design-bootloader-%theme
%branding_add_conflicts %flavour bootloader %branding_add_conflicts %flavour bootloader
%define grub_normal white/light-blue %define grub_normal white/light-blue
...@@ -98,7 +98,6 @@ Group: System/Configuration/Other ...@@ -98,7 +98,6 @@ Group: System/Configuration/Other
BuildArch: noarch BuildArch: noarch
Provides: design-alterator-browser-%theme branding-alt-%theme-browser-qt branding-altlinux-%theme-browser-qt Provides: design-alterator-browser-%theme branding-alt-%theme-browser-qt branding-altlinux-%theme-browser-qt
Provides: alterator-icons design-alterator design-alterator-%theme Provides: alterator-icons design-alterator design-alterator-%theme
Obsoletes: branding-alt-%theme-browser-qt branding-altlinux-%theme-browser-qt
%branding_add_conflicts %flavour alterator %branding_add_conflicts %flavour alterator
Obsoletes: design-alterator-server design-alterator-desktop design-altertor-browser-desktop design-altertor-browser-server branding-altlinux-backup-server-alterator Obsoletes: design-alterator-server design-alterator-desktop design-altertor-browser-desktop design-altertor-browser-server branding-altlinux-backup-server-alterator
...@@ -118,7 +117,7 @@ License: Different licenses ...@@ -118,7 +117,7 @@ License: Different licenses
Group: Graphics Group: Graphics
BuildArch: noarch BuildArch: noarch
Provides: design-graphics-%theme branding-alt-%theme-graphics Provides: design-graphics-%theme branding-alt-%theme-graphics
Obsoletes: branding-alt-%theme-graphics design-graphics-%theme Obsoletes: design-graphics-%theme
Provides: design-graphics = %design_graphics_abi_major.%design_graphics_abi_minor.%design_graphics_abi_bugfix Provides: design-graphics = %design_graphics_abi_major.%design_graphics_abi_minor.%design_graphics_abi_bugfix
Requires(post,preun): alternatives >= 0.2 Requires(post,preun): alternatives >= 0.2
...@@ -141,7 +140,7 @@ Summary(ru_RU.UTF-8): Описание дистрибутива %distro_name_ru ...@@ -141,7 +140,7 @@ Summary(ru_RU.UTF-8): Описание дистрибутива %distro_name_ru
License: GPL License: GPL
Group: System/Configuration/Other Group: System/Configuration/Other
Provides: %(for n in %provide_list; do echo -n "$n-release = %version-%release "; done) altlinux-release-%theme branding-alt-%theme-release Provides: %(for n in %provide_list; do echo -n "$n-release = %version-%release "; done) altlinux-release-%theme branding-alt-%theme-release
Obsoletes: %obsolete_list branding-alt-%theme-release Obsoletes: %obsolete_list
%branding_add_conflicts %flavour release %branding_add_conflicts %flavour release
%description release %description release
...@@ -317,6 +316,9 @@ fi ...@@ -317,6 +316,9 @@ fi
#_iconsdir/hicolor/*/apps/alt-%theme-desktop.png #_iconsdir/hicolor/*/apps/alt-%theme-desktop.png
%changelog %changelog
* Thu Feb 11 2021 Anton V. Boyarshinov <boyarsh@altlinux.org> 9.1-alt4
- alternatives priorities changed
* Thu Jul 9 2020 Anton V. Boyarshinov <boyarsh@altlinux.org> 9.1-alt3 * Thu Jul 9 2020 Anton V. Boyarshinov <boyarsh@altlinux.org> 9.1-alt3
- product version fixed - product version fixed
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment