From 99e0e9fa0f5483207a6e33de163fa2a4f897e670 Mon Sep 17 00:00:00 2001
From: Stanislav Ievlev <inger@altlinux.org>
Date: Fri, 23 Oct 2009 17:36:08 +0400
Subject: [PATCH] Revert "5.0.0-alt35"

This reverts commit 64fab7a415e2105627d313045929b12d02aa4f2b.
---
 branding.spec                                       |  10 ++++++----
 components.mk                                       |  11 +++++++++++
 .../indexhtml}/img/alt-linux-team.png               | Bin
 {indexhtml => components/indexhtml}/img/bullet.png  | Bin
 {indexhtml => components/indexhtml}/img/null.gif    | Bin
 {indexhtml => components/indexhtml}/index.css.in    |   0
 .../indexhtml}/indexhtml.desktop.in                 |   0
 configure.ac                                        |  10 +++++-----
 8 files changed, 22 insertions(+), 9 deletions(-)
 rename {indexhtml => components/indexhtml}/img/alt-linux-team.png (100%)
 rename {indexhtml => components/indexhtml}/img/bullet.png (100%)
 rename {indexhtml => components/indexhtml}/img/null.gif (100%)
 rename {indexhtml => components/indexhtml}/index.css.in (100%)
 rename {indexhtml => components/indexhtml}/indexhtml.desktop.in (100%)

diff --git a/branding.spec b/branding.spec
index 46d7a29..efa88b0 100644
--- a/branding.spec
+++ b/branding.spec
@@ -266,11 +266,13 @@ echo $lang > lang
 %files slideshow
 /usr/share/install2/slideshow
 
+%define indexhtmldir %_datadir/doc/alt-docs/indexhtml
+
 %files indexhtml
-%ghost %_indexhtmldir/index.html
-%_indexhtmldir/index-*.html
-%_indexhtmldir/index.css
-%_indexhtmldir/img
+%ghost %indexhtmldir/index.html
+%indexhtmldir/index-*.html
+%indexhtmldir/index.css
+%indexhtmldir/img
 %_desktopdir/indexhtml.desktop
 
 %changelog
diff --git a/components.mk b/components.mk
index 4f165b6..4ad27e0 100644
--- a/components.mk
+++ b/components.mk
@@ -45,3 +45,14 @@ boot:
 	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)
+
+# index html page, start page for all local browsers
+INDEXHTML_DIR=$(datadir)/doc/alt-docs/indexhtml
+indexhtml:
+	for i in notes/index*.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/img $(INDEXHTML_DIR)
+	install -Dpm644 images/product-logo.png $(INDEXHTML_DIR)/img/product-logo.png
+	install -Dpm644 components/indexhtml/indexhtml.desktop $(datadir)/applications/indexhtml.desktop
diff --git a/indexhtml/img/alt-linux-team.png b/components/indexhtml/img/alt-linux-team.png
similarity index 100%
rename from indexhtml/img/alt-linux-team.png
rename to components/indexhtml/img/alt-linux-team.png
diff --git a/indexhtml/img/bullet.png b/components/indexhtml/img/bullet.png
similarity index 100%
rename from indexhtml/img/bullet.png
rename to components/indexhtml/img/bullet.png
diff --git a/indexhtml/img/null.gif b/components/indexhtml/img/null.gif
similarity index 100%
rename from indexhtml/img/null.gif
rename to components/indexhtml/img/null.gif
diff --git a/indexhtml/index.css.in b/components/indexhtml/index.css.in
similarity index 100%
rename from indexhtml/index.css.in
rename to components/indexhtml/index.css.in
diff --git a/indexhtml/indexhtml.desktop.in b/components/indexhtml/indexhtml.desktop.in
similarity index 100%
rename from indexhtml/indexhtml.desktop.in
rename to components/indexhtml/indexhtml.desktop.in
diff --git a/configure.ac b/configure.ac
index 98d895a..099d5dc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -53,11 +53,11 @@ AC_CONFIG_FILES([
 		 notes/release-notes.all.html
 		 notes/license.ru.html
 		 notes/license.all.html
-		 indexhtml/index-ru.html
-		 indexhtml/index-uk.html
-		 indexhtml/index-en.html
-		 indexhtml/indexhtml.desktop
-		 indexhtml/index.css
+		 notes/index-ru.html
+		 notes/index-uk.html
+		 notes/index-en.html
+		 components/indexhtml/indexhtml.desktop
+		 components/indexhtml/index.css
 		 gnome-settings/gtkrc
 		 gnome-settings/index.theme
 		 gnome-settings/metacity-theme-1.xml