Merge branch 'alt-desktop' into altlinux-office-server

Makefile.in

@@ -4,17 +4,6 @@ NAME=@NAME@
 VERSION=@VERSION@
 
 all:
-	cp -a  /usr/src/design-bootloader-source ./
-	cp -a bootloader/config design-bootloader-source/
-	cp -a bootloader/gfxboot.cfg design-bootloader-source/data-install/
-	cp -a bootloader/gfxboot.cfg design-bootloader-source/data-boot/
-	for size in 1024x768 800x600 640x480; do \
-		convert images/boot.jpg -resize "$$size!" -fill '#c62530' -font /usr/share/fonts/ttf/dejavu/DejaVuSansCondensed-Bold.ttf -style Normal -weight Normal -pointsize 20 -gravity northeast -draw 'text 25,25 "@STATUS@"' boot-$$size.jpg ;\
-		cp -al boot-$$size.jpg bootsplash/images/silent-$$size.jpg ;\
-		convert -resize "$$size!" images/console.jpg bootsplash/images/bootsplash-$$size.jpg;\
-	done
-	cp -al boot-800x600.jpg design-bootloader-source/data-boot/back.jpg
-	cp -al boot-800x600.jpg design-bootloader-source/data-install/back.jpg
 # background
 	convert images/background.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@"' background.png
 	cp -al background.png graphics/backgrounds/default.png
@@ -26,4 +15,4 @@ all:
 	mv kde3-settings/apps/kdisplay/color-schemes/scheme.kcsrc "kde3-settings/apps/kdisplay/color-schemes/@BRAND_FNAME@ @NAME@.kcsrc"
 
 include components.mk
-install: browser-qt ahttpd
+install: browser-qt ahttpd boot

branding.spec

@@ -17,7 +17,7 @@ BuildRequires(pre): libqt4-core
 BuildRequires: libalternatives-devel
 BuildRequires: libqt4-devel
 
-BuildRequires: ImageMagick fontconfig
+BuildRequires: ImageMagick fontconfig bc
 
 %define status ПРОТОТИП
 %define status_en Prototype
@@ -161,37 +161,9 @@ autoconf
 THEME=%theme NAME='%Theme' BRAND_FNAME='%Brand' BRAND='%brand' STATUS_EN=%status_en STATUS=%status VERSION=%version ./configure 
 make
 
-#bootloader
-    pushd design-bootloader-source/
-    DEFAULT_LANG='--lang-to-subst--' PATH=$PATH:/usr/sbin %make
-    popd
-
 %install
 %makeinstall
 
-#bootloader
-    pushd design-bootloader-source
-    install -d -m 755 %buildroot/boot/splash/%theme
-    install -d -m 755 %buildroot/%_datadir/gfxboot/%theme
-    install -m 644 message %buildroot/boot/splash/%theme
-    install -m 644 bootlogo %buildroot%_datadir/gfxboot/%theme
-    popd
-
-#bootsplash
-## create directory structure
-mkdir -p $RPM_BUILD_ROOT/%_sysconfdir/bootsplash/themes/%theme
-cp -a bootsplash/* $RPM_BUILD_ROOT%_sysconfdir/bootsplash/themes/%theme
-
-pushd $RPM_BUILD_ROOT%_sysconfdir/bootsplash/themes/%theme/config
-#for i in 1 2 3 4 5 11; do \
-for i in 1; do \
- for f in bootsplash-*.cfg; do \
-    res=`echo "$f"| sed 's|.*\-\(.*\)\.cfg|\1|'`
-    ln -s $f vt${i}-${res}.cfg
- done
-done
-popd
-
 #graphics
 mkdir -p %buildroot/%_datadir/design/{%theme,backgrounds}
 cp -ar graphics/* %buildroot/%_datadir/design/%theme
@@ -231,10 +203,10 @@ install slideshow/*  %buildroot/usr/share/install2/slideshow/
 pushd indexhtml
 mkdir -p %buildroot{%_indexhtmldir/,%_desktopdir/}
 cp -r * %buildroot%_indexhtmldir/
-rm -f %buildroot%_indexhtmldir/*.in
+rm -f %buildroot%_indexhtmldir/*.in %buildroot%_indexhtmldir/indexhtml.desktop
 touch %buildroot%_indexhtmldir/index.html
-popd
 install -m644 indexhtml.desktop %buildroot%_desktopdir/
+popd
 
 #bootloader
 %pre bootloader

components.mk

@@ -16,3 +16,26 @@ ahttpd:
 	cp -a components/ahttpd/images $(datadir)/alterator/design
 	[ ! -f images/logo.png ] || convert images/logo.png -fill '#ffffff' -font /usr/share/fonts/ttf/dejavu/DejaVuSans-Bold.ttf -style Normal -weight Normal -pointsize 24 -gravity northwest -draw 'text 0,0 "$(VERSION) $(NAME)"' $(datadir)/alterator/design/images/logo.png
 	cp -a components/ahttpd/styles/*.css $(datadir)/alterator/design/styles
+
+# bootloader and bootsplash
+boot:
+	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/
+	cp -a components/bootloader/gfxboot.cfg design-bootloader-source/data-boot/
+	for size in 1024x768 800x600 640x480; do \
+		convert images/boot.jpg -resize "$$size!" -fill '#c62530' -font /usr/share/fonts/ttf/dejavu/DejaVuSansCondensed-Bold.ttf -style Normal -weight Normal -pointsize 20 -gravity northeast -draw 'text 25,25 "@STATUS@"' boot-$$size.jpg ;\
+		cp -al boot-$$size.jpg components/bootsplash/images/silent-$$size.jpg ;\
+		convert -resize "$$size!" images/console.jpg components/bootsplash/images/bootsplash-$$size.jpg;\
+	done
+	cp -al boot-800x600.jpg design-bootloader-source/data-boot/back.jpg
+	cp -al boot-800x600.jpg design-bootloader-source/data-install/back.jpg
+#bootsplash
+	mkdir -p $(sysconfdir)/bootsplash/themes/$(THEME)
+	cp -a components/bootsplash/* $(sysconfdir)/bootsplash/themes/$(THEME)
+#bootloader
+	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)
+	install -m 644 design-bootloader-source/message $(sysconfdir)/../boot/splash/$(THEME)
+	install -m 644 design-bootloader-source/bootlogo $(datadir)/gfxboot/$(THEME)

configure.ac

 AC_INIT( [branding], [0.1], [http://bugzilla.altlinux.ru] )
 
 
-PROGRESS_COLOR=`./fetch_color selectBackground` //MIDDLE_COLOR_DEC
+PROGRESS_COLOR=`./fetch_color selectBackground` #MIDDLE_COLOR_DEC
 TITLE_COLOR=`./fetch_color handle`
 INACTIVE_COLOR=`./fetch_color inactiveTitleBtnBg`
 LIGHT_COLOR_HEX=DFDFE0
@@ -35,18 +35,19 @@ AC_SUBST(INACTIVE_COLOR)
 
 AC_CONFIG_FILES([
 		 Makefile
-		 bootloader/config
-		 bootsplash/config/bootsplash-640x480.cfg
-		 bootsplash/config/bootsplash-800x600.cfg
+		 components/bootloader/config
+		 components/bootsplash/config/bootsplash-640x480.cfg
+		 components/bootsplash/config/bootsplash-800x600.cfg
+		 components/bootsplash/config/bootsplash-1024x768.cfg
 		 components/browser-qt/design/design.ini
 		 components/browser-qt/design/design.qss
-		 bootloader/gfxboot.cfg
+		 components/bootloader/gfxboot.cfg
 		 kde3-settings/apps/kdisplay/color-schemes/scheme.kcsrc
 		 notes/release-notes.ru.html
 		 notes/release-notes.all.html
 		 notes/license.ru.html
 		 notes/license.all.html
-		 indexhtml.desktop
+		 indexhtml/indexhtml.desktop
 		 indexhtml/index-ru.html
 		 indexhtml/index-uk.html
 		 indexhtml/index-en.html