- Adapt indexhtml to use from httpd2

- Add gksu for apt-indicator in GNOME Conflicts: branding.spec components.mk components/indexhtml/index-en.html.in components/indexhtml/index-ru.html.in

- Adapt indexhtml to use from httpd2
1fe9afab · Andrey Cherepanov · c4bdfb23 · 1fe9afab · 1fe9afab
Commit 1fe9afab authored Apr 05, 2012 by Andrey Cherepanov
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 0 deletions

branding.spec branding.spec +3 -0

components.mk components.mk +3 -0

No files found.
--- a/branding.spec
+++ b/branding.spec
@@ -177,6 +177,7 @@ Summary: GNOME settings for %Brand %version %Theme
 License: Distributable
 Group: Graphical desktop/GNOME
 Requires: gtk2-theme-mist
+Requires: gksu
 Requires: altlinux-freedesktop-menu-gnomish-menu
 PreReq: gnome-panel
 Provides: gnome-theme-%brand-%theme = %version-%release
@@ -411,6 +412,8 @@ cat '/%_datadir/themes/%XdgThemeName/panel-default-setup.entries' > \

 %files indexhtml
 %ghost %indexhtmldir/index.html
+%indexhtmldir/alt-docs
+%indexhtmldir/documentation
 %indexhtmldir/index-*.html
 %indexhtmldir/index.css
 %indexhtmldir/images

--- a/components.mk
+++ b/components.mk
@@ -64,4 +64,7 @@ indexhtml: components/indexhtml/index.css
 	done
 	install -Dpm644 /dev/null $(INDEXHTML_DIR)/index.html
 	cp -a components/indexhtml/images $(INDEXHTML_DIR)
+	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