6.0.0-alt2

branding.spec

@@ -176,6 +176,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
@@ -412,12 +413,18 @@ 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
 %_desktopdir/indexhtml.desktop
 
 %changelog
+* Thu Apr 05 2012 Andrey Cherepanov <cas@altlinux.org> 6.0.0-alt2
+- Adapt indexhtml to use from httpd2
+- Add gksu for apt-indicator in GNOME
+
 * Thu Nov 10 2011 Anton V. Boyarshinov <boyarsh@altlinux.ru> 6.0.0-alt1
 - school server branding on top of centaurus one
 

components.mk

@@ -66,5 +66,8 @@ 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 images/product-logo.png $(INDEXHTML_DIR)/images/product-logo.png
 	install -Dpm644 components/indexhtml/indexhtml.desktop $(datadir)/applications/indexhtml.desktop

components/indexhtml/index-en.html.in

@@ -30,8 +30,8 @@
 <tr>
 <td width="33%" class="column"> <!-- First column: documentation -->
 <ul>
-<li><a href="file:///usr/share/doc/documentation/index.html">User Manual</a></li>
-<li><a href="file:///usr/share/doc/alt-docs/modules/index.html">Local Documentation</a></li>
+<li><a href="documentation/index.html">User Manual</a></li>
+<li><a href="alt-docs/modules/index.html">Local Documentation</a></li>
 <li><a href="http://docs.altlinux.org">Online Documentation</a></li>
 <li><a href="http://shop.altlinux.ru/index.php?categoryID=559">Books</a></li>
 <li><a href="http://altlinux.org/">Wiki</a></li>

components/indexhtml/index-ru.html.in

@@ -30,8 +30,8 @@
 <tr>
 <td width="33%" class="column"> <!-- First column: documentation -->
 <ul>
-<li><a href="file:///usr/share/doc/documentation/index.html">Руководство пользователя</a></li>
-<li><a href="file:///usr/share/doc/alt-docs/modules/index.html">Локальная документация</a></li>
+<li><a href="documentation/index.html">Руководство пользователя</a></li>
+<li><a href="alt-docs/modules/index.html">Локальная документация</a></li>
 <li><a href="http://docs.altlinux.org">Онлайновая документация</a></li>
 <li><a href="http://shop.altlinux.ru/index.php?categoryID=559">Книги</a></li>
 <li><a href="http://altlinux.org/">Wiki</a></li>