From bf73849098e84a386f7b38daaeaea9c3c8b93344 Mon Sep 17 00:00:00 2001
From: Pablo Saratxaga <pablo@mandriva.com>
Date: Fri, 18 Feb 2005 16:45:46 +0000
Subject: put back in spec file the %post script to create index.html, and
 removed the packaging of indexhtml-update

---
 indexhtml.spec | 35 +++++++++++++++++++++++++++++------
 1 file changed, 29 insertions(+), 6 deletions(-)

diff --git a/indexhtml.spec b/indexhtml.spec
index 82333eb..371fc07 100644
--- a/indexhtml.spec
+++ b/indexhtml.spec
@@ -32,7 +32,7 @@ find $RPM_BUILD_DIR/%name -name "CVS" -print | xargs /bin/rm -fr
 
 install -d -m 0755 %buildroot/%_datadir/mdk/indexhtml/
 install -m 0644 HTML/* %buildroot/%_datadir/mdk/indexhtml/
-install -m 0755 update-indexhtml %buildroot/%_datadir/mdk/indexhtml/
+#install -m 0755 update-indexhtml %buildroot/%_datadir/mdk/indexhtml/
 
 install -d -m 0755 %buildroot/%_datadir/mdk/mail/text/
 install -d -m 0755 %buildroot/%_datadir/mdk/mail/html/
@@ -58,25 +58,48 @@ done
 
 install -d -m 0755 %buildroot/%_datadir/doc/HTML/
 install -m 0644 HTML/index-en.html %buildroot/%_datadir/doc/HTML/index.html
-install -d -m 0755 %buildroot/etc/sysconfig/network-scripts/ifup.d
-cd %buildroot/etc/sysconfig/network-scripts/ifup.d
-ln -s ../../../../%_datadir/mdk/indexhtml/update-indexhtml indexhtml
 
 %clean
 rm -fr %buildroot
 
 
 %post
-%_datadir/mdk/indexhtml/update-indexhtml nonetwork
+if [ -r /etc/sysconfig/i18n ] ; then
+    . /etc/sysconfig/i18n
+    LISTLANG="`echo ${LANGUAGE}:${LANG}:en | sed 's/\.[^:@]*//g' | tr ':' ' '`"
+else
+    LISTLANG=en
+fi
+
+for i in $LISTLANG
+do
+    if [ -r %_datadir/mdk/indexhtml/index-$i.html ]; then
+        cat %_datadir/mdk/indexhtml/index-$i.html > %_datadir/doc/HTML/index.html
+        break
+    else
+        lang=`echo $i | cut -d'_' -f1`
+        if [ -r %_datadir/mdk/indexhtml/index-$lang.html ]; then
+            cat %_datadir/mdk/indexhtml/index-$lang.html > %_datadir/doc/HTML/index.html
+            break;
+
+        fi
+    fi
+done
 
 
 %files
 %defattr(-,root,root,-)
 %_datadir/mdk/
 %ghost %_datadir/doc/HTML/index.html
-/etc/sysconfig/network-scripts/ifup.d/indexhtml
+#/etc/sysconfig/network-scripts/ifup.d/indexhtml
 
 %changelog
+* Fri Feb 18 2005 Pablo Saratxaga <pablo@mandrakesoft.com> 10.2-3mdk 
+- removed update-indexhtml from the rpm, now the network testing is
+  done in testonline.html (loaded trough javascript)
+- put back the creation of index.html in the rpm %post script
+  (and improved it a bit)
+
 * Fri Jan 28 2005 Frederic Lepied <flepied@mandrakesoft.com> 10.2-2mdk
 - po updates
 - don't block when updating index
-- 
cgit v1.2.1