Skip to content

B
branding-etersoft-ximper
Commit 6c080d58 authored by Mikhail Efremov's avatar Mikhail Efremov Committed by Anton V. Boyarshinov
Browse files
Options

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.
parent cdc4c885
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 15 deletions
Makefile.in
View file @ 6c080d58
...@@ -154,16 +154,10 @@ install: browser-qt ahttpd boot indexhtml ...@@ -154,16 +154,10 @@ install: browser-qt ahttpd boot indexhtml
#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
install -d $(datadir)/branding-data-current
install -pD -m644 systemd/os-release $(prefix)/lib/os-release 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 \ for n in fedora redhat system; do \
ln -s altlinux-release $(sysconfdir)/$$n-release; \ 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 done
#notes #notes
cd notes; \ cd notes; \
......
branding.spec
View file @ 6c080d58
...@@ -262,12 +262,6 @@ subst "s/Theme=.*/Theme=%theme/" /etc/plymouth/plymouthd.conf ...@@ -262,12 +262,6 @@ subst "s/Theme=.*/Theme=%theme/" /etc/plymouth/plymouthd.conf
subst "s|GRUB_WALLPAPER=.*|GRUB_WALLPAPER=/usr/share/plymouth/themes/%theme/grub.jpg|" \ subst "s|GRUB_WALLPAPER=.*|GRUB_WALLPAPER=/usr/share/plymouth/themes/%theme/grub.jpg|" \
/etc/sysconfig/grub2 ||: /etc/sysconfig/grub2 ||:
#release
%post release
if ! [ -e %_sysconfdir/altlinux-release ] && \
cp -a %data_cur_dir/release/*-release %_sysconfdir/
fi
#notes #notes
%post notes %post notes
if ! [ -e %_datadir/alt-notes/license.all.html ]; then if ! [ -e %_datadir/alt-notes/license.all.html ]; then
...@@ -289,9 +283,8 @@ fi ...@@ -289,9 +283,8 @@ fi
%_pixmapsdir/system-logo.png %_pixmapsdir/system-logo.png
%files release %files release
%_sysconfdir/*-release
%_prefix/lib/os-release %_prefix/lib/os-release
%dir %data_cur_dir
%data_cur_dir/release/
%_sysconfdir/buildreqs/packages/ignore.d/* %_sysconfdir/buildreqs/packages/ignore.d/*
%ghost %config(noreplace) %_sysconfdir/*-release %ghost %config(noreplace) %_sysconfdir/*-release
......
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