Use components.mk and Makefile.in from Centaurus 7.0

Makefile.in

@@ -5,10 +5,9 @@ VERSION=@VERSION@
 
 all:
 # background
-	convert images/wallpaper.png -fill '#c62530' -font /usr/share/fonts/ttf/droid/DroidSansCondensed-Bold.ttf -style Normal -weight Normal -pointsize 20 -gravity northeast -draw 'text 25,25 "@STATUS@"' wallpaper.png
+	convert images/wallpaper.png -fill '#c62530' -font /usr/share/fonts/ttf/dejavu/DejaVuSansCondensed-Bold.ttf -style Normal -weight Normal -pointsize 20 -gravity northeast -draw 'text 25,25 "@STATUS@"' wallpaper.png
 	cp -al wallpaper.png graphics/backgrounds/default.png
 	cp -al wallpaper.png graphics/backgrounds/xdm.png
 
 include components.mk
-install: browser-qt ahttpd indexhtml
-x86: boot
+install: browser-qt ahttpd boot-images boot-splash @X86@ indexhtml

branding.spec

 %define theme teacher
 %define Name School Teacher
 %define codename none
-%define status alpha
 %define variants altlinux-backup-server altlinux-desktop altlinux-gnome-desktop altlinux-kdesktop altlinux-lite altlinux-lxdesktop altlinux-office-desktop altlinux-office-server altlinux-school-server altlinux-sisyphus altlinux-spt altlinux-tablet altlinux-workbench informika-schoolmaster ivk-chainmail lxde-desktop lxde-school-lite Platform6-server-light school-junior school-lite school-master school-server school-terminal altlinux-centaurus sisyphus-server-light simply-linux
 %define brand school
+%define status альфа
+%define status_en alpha
 %define distro_name Informika 6.9.9 School Teacher (alpha)
 %define distro_name_ru Информика 6.9.9 Школьный Учитель (альфа)
 
@@ -238,16 +239,19 @@ Some system settings for Simply Linux.
 %prep
 %setup -n branding
 
+%ifnarch %arm
+%define x86 boot
+%else
+%define x86 %nil
+%endif
 
 %build
 autoconf
-THEME=%theme NAME='%Name' STATUS=%status VERSION=%version CODENAME=%codename ./configure
+THEME=%theme NAME='%Name' BRAND_FNAME='%brand' BRAND='%brand' STATUS_EN=%status_en STATUS=%status VERSION=%version PRODUCT_NAME_RU='%distro_name_ru' PRODUCT_NAME='%distro_name' CODENAME='%codename' X86='%x86' ./configure
 make
 
 %install
 %makeinstall
-make x86 DESTDIR=%buildroot datadir=%buildroot%_datadir sysconfdir=%buildroot%_sysconfdir
-
 
 #graphics
 mkdir -p %buildroot/%_datadir/design/{%theme,backgrounds}

components.mk

 # browser-qt
 
 components/browser-qt/design/bg.png: images/installer.png
-	convert $< -resize '800x600!' -fill '#c62530' -font /usr/share/fonts/ttf/dejavu/DejaVuSansCondensed-Bold.ttf -style Normal -weight Normal -pointsize 20 -gravity northeast -draw 'text 25,25 "$(STATUS)"' $@
+	convert $<  -fill '#c62530' -font /usr/share/fonts/ttf/dejavu/DejaVuSansCondensed-Bold.ttf -style Normal -weight Normal -pointsize 20 -gravity northeast -draw 'text 25,25 "$(STATUS)"' $@
 
 browser-qt:components/browser-qt/design/bg.png
 	install -d $(datadir)/alterator-browser-qt/design
-	cd components/browser-qt; rcc-qt4 -binary theme.qrc -o $(datadir)/alterator-browser-qt/design/$(THEME).rcc; cd -
+	rcc-qt4 -binary components/browser-qt/theme.qrc -o $(datadir)/alterator-browser-qt/design/$(THEME).rcc
+	#cp -f components/browser-qt/design/design-live.qss components/browser-qt/design/design.qss
+	rcc-qt4 -binary components/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\t50\n'>$(sysconfdir)/alternatives/packages.d/$(THEME).rcc
 
 # ahttpd
 
 ahttpd:
+	for i in components/ahttpd/images/*.svg; do \
+	    image=$${i%.svg}; \
+	    convert -background none $$image.svg $$image.png ; \
+	done
 	install -d $(datadir)/alterator/design/styles
 	cp -a components/ahttpd/images $(datadir)/alterator/design
-#	install -Dpm644 images/product-logo.png $(datadir)/alterator/design/images/product-logo.png
 	cp -a components/ahttpd/styles/*.css $(datadir)/alterator/design/styles
 
 
 # bootloader and bootsplash
-boot:
+boot-images:
 	cp -a  /usr/src/design-bootloader-source ./
 	cp -a components/bootloader/config design-bootloader-source/
 	cp -a components/bootloader/gfxboot.cfg design-bootloader-source/data-install/
@@ -30,13 +35,14 @@ boot:
 	cp -al boot-800x600.jpg design-bootloader-source/data-boot/back.jpg
 	convert images/boot.png -resize "800x600!" -fill '#c62530' -font /usr/share/fonts/ttf/dejavu/DejaVuSansCondensed-Bold.ttf -style Normal -weight Normal -pointsize 20 -gravity northeast -draw 'text 25,25 "$(STATUS)"' design-bootloader-source/data-install/back.jpg
 #bootsplash
+boot-splash: boot-images
 	mkdir -p $(datadir)/plymouth/themes/$(THEME)
-	convert -size 800x600 xc:#306ac4 $(datadir)/plymouth/themes/$(THEME)/grub.jpg
-	#cp -al images/background*x*.png $(datadir)/plymouth/themes/$(THEME)/
+	#cp -al boot-800x600.jpg $(datadir)/plymouth/themes/$(THEME)/grub.jpg
+	cp -al images/background*x*.png $(datadir)/plymouth/themes/$(THEME)/
 	cp -a components/bootsplash/* $(datadir)/plymouth/themes/$(THEME)
 	mv $(datadir)/plymouth/themes/$(THEME)/theme.plymouth $(datadir)/plymouth/themes/$(THEME)/$(THEME).plymouth
 #bootloader
-	subst 's/label:ALT/label:School/g' design-bootloader-source/src/dia_install.inc
+boot: boot-images
 	DEFAULT_LANG='--lang-to-subst--' PATH=$(PATH):/usr/sbin make -C design-bootloader-source
 	install -d -m 755  $(sysconfdir)/../boot/splash/$(THEME)
 	install -d -m 755 $(datadir)/gfxboot/$(THEME)
@@ -45,15 +51,21 @@ boot:
 #grub2
 	install -d -m 755  $(sysconfdir)/../boot/grub/themes/$(THEME)
 	cp -a components/grub2/* $(sysconfdir)/../boot/grub/themes/$(THEME)/
-	 install -m 644 images/grub.png $(sysconfdir)/../boot/grub/themes/$(THEME)/boot.png
+	install -m 644 images/grub.png $(sysconfdir)/../boot/grub/themes/$(THEME)/boot.png
+	install -m 644 boot-800x600.jpg $(sysconfdir)/../boot/grub/themes/$(THEME)/grub.jpg
 
 # index html page, start page for all local browsers
+components/indexhtml/index.css:
+	sed 's|/design/|file:///usr/share/alterator/design/|g' components/ahttpd/styles/alterator.css > components/indexhtml/index.css
+
 INDEXHTML_DIR=$(datadir)/doc/indexhtml
-indexhtml:
-	for i in notes/index*.html components/indexhtml/*.css;do \
+indexhtml: components/indexhtml/index.css
+	for i in components/indexhtml/*.html components/indexhtml/*.css;do \
 	  install -Dpm644 $$i $(INDEXHTML_DIR)/`basename $$i`; \
 	done
 	install -Dpm644 /dev/null $(INDEXHTML_DIR)/index.html
 	cp -a components/indexhtml/images $(INDEXHTML_DIR)
-#	install -Dpm644 images/product-logo.png $(INDEXHTML_DIR)/images/product-logo.png
+	for i in alt-docs documentation;do \
+	  ln -s /usr/share/doc/$$i $(INDEXHTML_DIR)/$$i; \
+	done
 	install -Dpm644 components/indexhtml/indexhtml.desktop $(datadir)/applications/indexhtml.desktop

configure.ac.tmp

-AC_INIT( [branding], [0.1], [http://bugzilla.altlinux.ru] )
-
-
-PROGRESS_COLOR=23b8dc
-TITLE_COLOR=23b8dc
-INACTIVE_COLOR=d3d7cf
-
-
-AC_SUBST(THEME)
-AC_SUBST(NAME)
-AC_SUBST(STATUS)
-AC_SUBST(VERSION)
-AC_SUBST(PROGRESS_COLOR)
-AC_SUBST(TITLE_COLOR)
-AC_SUBST(INACTIVE_COLOR)
-
-AC_CONFIG_FILES([
-		 Makefile
-		 bootloader/config
-		 bootsplash/config/bootsplash-640x480.cfg
-		 bootsplash/config/bootsplash-800x600.cfg
-		 bootsplash/config/bootsplash-1024x768.cfg
-		 alterator/design/design.ini
-		 bootloader/gfxboot.cfg
-		 notes/release-notes.ru.html
-		 notes/release-notes.all.html
-		 notes/license.ru.html
-		 notes/license.all.html
-		 indexhtml.desktop
-		 indexhtml/index-ru.html
-		 indexhtml/index-en.html
-])
-AC_OUTPUT