konevsa/branding-alt-virtualization-one
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Don't change license and *-release files during update"

Browse Source 
This reverts commit 13178632a8df06a8d2d1c95fb0c663ded87f2cdd.

# Conflicts:
#	Makefile.in
#	branding.spec
This commit is contained in:
Алексей Шабалин 2021-08-02 19:35:17 +03:00
parent 52b65ba6df
commit 23c2cf7e62
2 changed files with 5 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
Makefile.in
View File

@ -154,33 +154,20 @@ install: browser-qt ahttpd boot indexhtml
#release
mkdir -p $(sysconfdir)/buildreqs/packages/ignore.d/
install -pD -m644 /dev/null $(sysconfdir)/buildreqs/packages/ignore.d/$(BRAND)-$(THEME)-release
install -d $(datadir)/branding-data-current
install -pD -m644 systemd/os-release $(datadir)/branding-data-current/release/os-release
echo "$(PRODUCT_NAME) ($(CODENAME))" >$(datadir)/branding-data-current/release/altlinux-release
echo "$(PRODUCT_NAME) ($(CODENAME))" >$(sysconfdir)/altlinux-release
for n in fedora redhat system; do \
ln -s altlinux-release $(sysconfdir)/$$n-release; \
ln -s altlinux-release $(datadir)/branding-data-current/release/$$n-release; \
done
for r in $(datadir)/branding-data-current/release/*-release; do \
f="$${r##*/}"; \
touch $(sysconfdir)/"$$f"; \
done
install -pD -m644 systemd/os-release $(sysconfdir)/os-release
#notes
cd notes; \
install -d $(datadir)/alt-notes; \
cp -a livecd-*.html $(datadir)/alt-notes; \
cp -a release-notes.*.html $(datadir)/alt-notes; \
cp -a *.html $(datadir)/alt-notes; \
for relnotes in release-notes.*.html; do \
suffix="$${relnotes#release-notes.}"; \
ln -s $$relnotes $(datadir)/alt-notes/livecd-finish.$$suffix; \
done; \
install -d $(datadir)/branding-data-current/alt-notes; \
cp -a license.*.html $(datadir)/branding-data-current/alt-notes; \
cd ..
for r in $(datadir)/branding-data-current/alt-notes/license.*.html; do \
f="$${r##*/}"; \
touch $(datadir)/alt-notes/"$$f"; \
done
#slideshow
mkdir -p $(datadir)/install2/slideshow
mkdir -p $(sysconfdir)/alterator

25
branding.spec
View File

@ -12,8 +12,6 @@
%define design_graphics_abi_minor 0
%define design_graphics_abi_bugfix 0
%define data_cur_dir %_datadir/branding-data-current
%define _unpackaged_files_terminate_build 1
Name: branding-%flavour
@ -262,19 +260,6 @@ subst "s/Theme=.*/Theme=%theme/" /etc/plymouth/plymouthd.conf
subst "s|GRUB_WALLPAPER=.*|GRUB_WALLPAPER=/usr/share/plymouth/themes/%theme/grub.jpg|" \
/etc/sysconfig/grub2 ||:
#release
%post release
if ! [ -e %_sysconfdir/altlinux-release ] && \
! [ -e %_sysconfdir/os-release ]; then
cp -a %data_cur_dir/release/*-release %_sysconfdir/
fi
#notes
%post notes
if ! [ -e %_datadir/alt-notes/license.all.html ]; then
cp -a %data_cur_dir/alt-notes/license.*.html %_datadir/alt-notes/
fi
%files alterator
%config %_altdir/*.rcc
/usr/share/alterator-browser-qt/design/*.rcc
@ -290,17 +275,11 @@ fi
%_pixmapsdir/system-logo.png
%files release
%dir %data_cur_dir
%data_cur_dir/release/
%_sysconfdir/*-release
%_sysconfdir/buildreqs/packages/ignore.d/*
%ghost %config(noreplace) %_sysconfdir/*-release
%files notes
%dir %data_cur_dir
%data_cur_dir/alt-notes
%_datadir/alt-notes/livecd-*
%_datadir/alt-notes/release-notes.*
%ghost %config(noreplace) %_datadir/alt-notes/license.*.html
%_datadir/alt-notes/*
%files slideshow
/etc/alterator/slideshow.conf