Package /etc/altlinux-release again
Don't preserve previously installed /etc/altlinux-release: we are keep BUILD_ID in /etc/os-release now, it is enough.
This commit is contained in:
parent
bf1bc17f2e
commit
4efd7c2b81
@ -150,16 +150,10 @@ install: browser-qt ahttpd boot-images boot-splash 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 $(prefix)/lib/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
|
||||
#notes
|
||||
cd notes; \
|
||||
|
@ -258,12 +258,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 ] && \
|
||||
cp -a %data_cur_dir/release/*-release %_sysconfdir/
|
||||
fi
|
||||
|
||||
#notes
|
||||
%post notes
|
||||
if ! [ -e %_datadir/alt-notes/license.all.html ]; then
|
||||
@ -285,9 +279,8 @@ fi
|
||||
%_pixmapsdir/system-logo.png
|
||||
|
||||
%files release
|
||||
%_sysconfdir/*-release
|
||||
%_prefix/lib/os-release
|
||||
%dir %data_cur_dir
|
||||
%data_cur_dir/release/
|
||||
%_sysconfdir/buildreqs/packages/ignore.d/*
|
||||
%ghost %config(noreplace) %_sysconfdir/*-release
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user