Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
B
branding-etersoft-ximper
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Ximper Linux
branding-etersoft-ximper
Commits
eaaa68e9
You need to sign in or sign up before continuing.
Commit
eaaa68e9
authored
Feb 11, 2021
by
Anton V. Boyarshinov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
9.1-alt4
- alternatives priorities changed
parent
266f5a38
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
8 deletions
+10
-8
Makefile.in
Makefile.in
+3
-3
branding.spec
branding.spec
+7
-5
No files found.
Makefile.in
View file @
eaaa68e9
...
...
@@ -64,7 +64,7 @@ browser-qt:browser-qt/design/bg.png
#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
install
-d
$(sysconfdir)
/alternatives/packages.d
printf
'/etc/alterator/design-browser-qt\t/usr/share/alterator-browser-qt/design/
$(THEME)
.rcc\t
50
\n'
>
$(sysconfdir)
/alternatives/packages.d/
$(THEME)
.rcc
printf
'/etc/alterator/design-browser-qt\t/usr/share/alterator-browser-qt/design/
$(THEME)
.rcc\t
46
\n'
>
$(sysconfdir)
/alternatives/packages.d/
$(THEME)
.rcc
# ahttpd
...
...
@@ -149,8 +149,8 @@ install: browser-qt ahttpd boot indexhtml
cp
-a
backgrounds
icons
faces
$(datadir)/design/$(THEME)
ln
-s
../../../wallpapers
$(datadir)/design/$(THEME)/backgrounds/more
install
-d
$(sysconfdir)/alternatives/packages.d
echo
"/usr/share/design-current /usr/share/design/$(THEME) 0000120000
00
"
>>
$(sysconfdir)/alternatives/packages.d/branding-$(BRAND)-$(THEME)-graphics
echo
"/usr/share/design/current /usr/share/design/$(THEME) 0000120000
00
"
>>
$(sysconfdir)/alternatives/packages.d/branding-$(BRAND)-$(THEME)-graphics
echo
"/usr/share/design-current /usr/share/design/$(THEME) 0000120000
46
"
>>
$(sysconfdir)/alternatives/packages.d/branding-$(BRAND)-$(THEME)-graphics
echo
"/usr/share/design/current /usr/share/design/$(THEME) 0000120000
46
"
>>
$(sysconfdir)/alternatives/packages.d/branding-$(BRAND)-$(THEME)-graphics
#release
mkdir
-p
$(sysconfdir)/buildreqs/packages/ignore.d/
install
-pD
-m644
/dev/null
$(sysconfdir)/buildreqs/packages/ignore.d/$(BRAND)-$(THEME)-release
...
...
branding.spec
View file @
eaaa68e9
...
...
@@ -18,7 +18,7 @@
Name: branding-%flavour
Version: 9.1
Release: alt
3
Release: alt
4
Url: https://basealt.ru
%ifarch %ix86 x86_64
...
...
@@ -56,7 +56,7 @@ License: GPLv2+
Requires(pre): 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
Obsoletes: design-bootloader-system-%theme design-bootloader-livecd-%theme design-bootloader-livecd-%theme design-bootloader-%theme
%branding_add_conflicts %flavour bootloader
%define grub_normal white/light-blue
...
...
@@ -98,7 +98,6 @@ Group: System/Configuration/Other
BuildArch: noarch
Provides: design-alterator-browser-%theme branding-alt-%theme-browser-qt branding-altlinux-%theme-browser-qt
Provides: alterator-icons design-alterator design-alterator-%theme
Obsoletes: branding-alt-%theme-browser-qt branding-altlinux-%theme-browser-qt
%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
...
...
@@ -118,7 +117,7 @@ License: Different licenses
Group: Graphics
BuildArch: noarch
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
Requires(post,preun): alternatives >= 0.2
...
...
@@ -141,7 +140,7 @@ Summary(ru_RU.UTF-8): Описание дистрибутива %distro_name_ru
License: GPL
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
Obsoletes: %obsolete_list
branding-alt-%theme-release
Obsoletes: %obsolete_list
%branding_add_conflicts %flavour release
%description release
...
...
@@ -317,6 +316,9 @@ fi
#_iconsdir/hicolor/*/apps/alt-%theme-desktop.png
%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
- product version fixed
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment