diff --git a/Makefile.in b/Makefile.in index 260ff46..a6c6f15 100644 --- a/Makefile.in +++ b/Makefile.in @@ -155,20 +155,33 @@ install: browser-qt ahttpd boot-images boot-splash @X86@ indexhtml hidden-menu-e #release mkdir -p $(sysconfdir)/buildreqs/packages/ignore.d/ install -pD -m644 /dev/null $(sysconfdir)/buildreqs/packages/ignore.d/$(BRAND)-$(THEME)-release - echo "$(PRODUCT_NAME) ($(CODENAME))" >$(sysconfdir)/altlinux-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 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 *.html $(datadir)/alt-notes; \ + cp -a livecd-*.html $(datadir)/alt-notes; \ + cp -a release-notes.*.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 #xfce-setting (autostart) install -Dm 0644 xfce-settings/org.kde.kgpg.desktop $(sysconfdir)/skel/.config/autostart/org.kde.kgpg.desktop install -Dm 0644 xfce-settings/xscreensaver.desktop $(sysconfdir)/skel/.config/autostart/xscreensaver.desktop diff --git a/branding.spec b/branding.spec index 44877e2..46fded3 100644 --- a/branding.spec +++ b/branding.spec @@ -18,6 +18,8 @@ %define design_graphics_abi_minor 0 %define design_graphics_abi_bugfix 0 +%define data_cur_dir %_datadir/branding-data-current + Name: branding-%flavour Version: 8.90 Release: alt1 @@ -386,6 +388,19 @@ subst 's/^#\?icon-theme-name=.*/icon-theme-name=%icon_theme/' /etc/lightdm/light subst 's/^#\?theme-name=.*/theme-name=%gtk_theme/' /etc/lightdm/lightdm-gtk-greeter.conf ||: subst 's/^#\?icon-theme-name=.*/icon-theme-name=%icon_theme/' /etc/lightdm/lightdm-gtk-greeter.conf ||: +#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 @@ -404,11 +419,17 @@ subst 's/^#\?icon-theme-name=.*/icon-theme-name=%icon_theme/' /etc/lightdm/light %endif %files release -%_sysconfdir/*-release +%dir %data_cur_dir +%data_cur_dir/release/ %_sysconfdir/buildreqs/packages/ignore.d/* +%ghost %config(noreplace) %_sysconfdir/*-release %files notes -%_datadir/alt-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 %files kde-settings /etc/skel/.config/autostart/nm-applet.desktop