From 97b10f4c6f0a73af03441aa5a8434a6a58245e69 Mon Sep 17 00:00:00 2001 From: Florent Villard Date: Mon, 11 Apr 2005 08:57:11 +0000 Subject: revert to the previous ifup download method --- HTML/index-af.html | 2 +- HTML/index-am.html | 2 +- HTML/index-ar.html | 2 +- HTML/index-az.html | 2 +- HTML/index-bg.html | 2 +- HTML/index-bn.html | 2 +- HTML/index-bs.html | 2 +- HTML/index-ca.html | 2 +- HTML/index-cs.html | 2 +- HTML/index-cy.html | 2 +- HTML/index-da.html | 2 +- HTML/index-de.html | 2 +- HTML/index-el.html | 2 +- HTML/index-en.html | 2 +- HTML/index-eo.html | 2 +- HTML/index-es.html | 2 +- HTML/index-et.html | 2 +- HTML/index-eu.html | 2 +- HTML/index-fa.html | 2 +- HTML/index-fi.html | 2 +- HTML/index-fr.html | 2 +- HTML/index-fur.html | 2 +- HTML/index-gl.html | 2 +- HTML/index-he.html | 2 +- HTML/index-hi.html | 2 +- HTML/index-hr.html | 2 +- HTML/index-hu.html | 2 +- HTML/index-hy.html | 2 +- HTML/index-id.html | 2 +- HTML/index-is.html | 2 +- HTML/index-it.html | 2 +- HTML/index-ja.html | 2 +- HTML/index-ka.html | 2 +- HTML/index-ky.html | 2 +- HTML/index-lt.html | 2 +- HTML/index-ltg.html | 2 +- HTML/index-mk.html | 2 +- HTML/index-ms.html | 2 +- HTML/index-mt.html | 2 +- HTML/index-nb.html | 2 +- HTML/index-nl.html | 2 +- HTML/index-nn.html | 2 +- HTML/index-pa_IN.html | 2 +- HTML/index-pl.html | 2 +- HTML/index-pt.html | 2 +- HTML/index-pt_BR.html | 2 +- HTML/index-ro.html | 2 +- HTML/index-ru.html | 2 +- HTML/index-sc.html | 2 +- HTML/index-sk.html | 2 +- HTML/index-sl.html | 2 +- HTML/index-sr.html | 2 +- HTML/index-sr@Latn.html | 2 +- HTML/index-sv.html | 2 +- HTML/index-ta.html | 2 +- HTML/index-tg.html | 2 +- HTML/index-th.html | 2 +- HTML/index-tl.html | 2 +- HTML/index-tr.html | 2 +- HTML/index-uk.html | 2 +- HTML/index-ur.html | 2 +- HTML/index-vi.html | 2 +- HTML/index-wa.html | 2 +- HTML/index-zh_CN.html | 2 +- HTML/index-zh_TW.html | 2 +- indexhtml.spec | 13 ++++++++++--- update-indexhtml | 2 +- 67 files changed, 76 insertions(+), 69 deletions(-) diff --git a/HTML/index-af.html b/HTML/index-af.html index cb71942..fd0d34c 100644 --- a/HTML/index-af.html +++ b/HTML/index-af.html @@ -109,7 +109,7 @@ - + diff --git a/HTML/index-am.html b/HTML/index-am.html index 747c7fe..1d86163 100644 --- a/HTML/index-am.html +++ b/HTML/index-am.html @@ -109,7 +109,7 @@ - + diff --git a/HTML/index-ar.html b/HTML/index-ar.html index fa80ffe..b3501df 100644 --- a/HTML/index-ar.html +++ b/HTML/index-ar.html @@ -109,7 +109,7 @@ - + diff --git a/HTML/index-az.html b/HTML/index-az.html index 4ba8c89..7d1176c 100644 --- a/HTML/index-az.html +++ b/HTML/index-az.html @@ -109,7 +109,7 @@ - + diff --git a/HTML/index-bg.html b/HTML/index-bg.html index 4f70379..5daaee5 100644 --- a/HTML/index-bg.html +++ b/HTML/index-bg.html @@ -109,7 +109,7 @@ - + diff --git a/HTML/index-bn.html b/HTML/index-bn.html index b88f636..59b9c4b 100644 --- a/HTML/index-bn.html +++ b/HTML/index-bn.html @@ -109,7 +109,7 @@ - + diff --git a/HTML/index-bs.html b/HTML/index-bs.html index e5927ae..9b735f4 100644 --- a/HTML/index-bs.html +++ b/HTML/index-bs.html @@ -109,7 +109,7 @@ - + diff --git a/HTML/index-ca.html b/HTML/index-ca.html index acb6e6f..596a42d 100644 --- a/HTML/index-ca.html +++ b/HTML/index-ca.html @@ -109,7 +109,7 @@ - + diff --git a/HTML/index-cs.html b/HTML/index-cs.html index bd7c787..d29a8f5 100644 --- a/HTML/index-cs.html +++ b/HTML/index-cs.html @@ -109,7 +109,7 @@ - + diff --git a/HTML/index-cy.html b/HTML/index-cy.html index 0ab76b7..458a6e9 100644 --- a/HTML/index-cy.html +++ b/HTML/index-cy.html @@ -109,7 +109,7 @@ - + diff --git a/HTML/index-da.html b/HTML/index-da.html index 361191f..923d6a4 100644 --- a/HTML/index-da.html +++ b/HTML/index-da.html @@ -109,7 +109,7 @@ - + diff --git a/HTML/index-de.html b/HTML/index-de.html index eba254b..f8e84df 100644 --- a/HTML/index-de.html +++ b/HTML/index-de.html @@ -109,7 +109,7 @@ - + diff --git a/HTML/index-el.html b/HTML/index-el.html index 425172d..2b03307 100644 --- a/HTML/index-el.html +++ b/HTML/index-el.html @@ -109,7 +109,7 @@ - + diff --git a/HTML/index-en.html b/HTML/index-en.html index ebbd3e6..fc6398e 100644 --- a/HTML/index-en.html +++ b/HTML/index-en.html @@ -109,7 +109,7 @@ - + diff --git a/HTML/index-eo.html b/HTML/index-eo.html index 9d479a3..115c5ec 100644 --- a/HTML/index-eo.html +++ b/HTML/index-eo.html @@ -85,7 +85,7 @@ - + diff --git a/HTML/index-es.html b/HTML/index-es.html index eb731fc..892dcf9 100644 --- a/HTML/index-es.html +++ b/HTML/index-es.html @@ -109,7 +109,7 @@ - + diff --git a/HTML/index-et.html b/HTML/index-et.html index 123a47e..3f3736b 100644 --- a/HTML/index-et.html +++ b/HTML/index-et.html @@ -109,7 +109,7 @@ - + diff --git a/HTML/index-eu.html b/HTML/index-eu.html index f17d61d..0143d74 100644 --- a/HTML/index-eu.html +++ b/HTML/index-eu.html @@ -109,7 +109,7 @@ - + diff --git a/HTML/index-fa.html b/HTML/index-fa.html index dd6da6f..87e5762 100644 --- a/HTML/index-fa.html +++ b/HTML/index-fa.html @@ -109,7 +109,7 @@ - + diff --git a/HTML/index-fi.html b/HTML/index-fi.html index 6a0ebfe..1964a42 100644 --- a/HTML/index-fi.html +++ b/HTML/index-fi.html @@ -109,7 +109,7 @@ - + diff --git a/HTML/index-fr.html b/HTML/index-fr.html index 8af00d8..0ebdf14 100644 --- a/HTML/index-fr.html +++ b/HTML/index-fr.html @@ -109,7 +109,7 @@ - + diff --git a/HTML/index-fur.html b/HTML/index-fur.html index c2e06d7..56a01f7 100644 --- a/HTML/index-fur.html +++ b/HTML/index-fur.html @@ -86,7 +86,7 @@ - + diff --git a/HTML/index-gl.html b/HTML/index-gl.html index 8da8d3a..e770449 100644 --- a/HTML/index-gl.html +++ b/HTML/index-gl.html @@ -109,7 +109,7 @@ - + diff --git a/HTML/index-he.html b/HTML/index-he.html index 468e186..1bd82da 100644 --- a/HTML/index-he.html +++ b/HTML/index-he.html @@ -109,7 +109,7 @@ - + diff --git a/HTML/index-hi.html b/HTML/index-hi.html index 4aceca9..cd31a21 100644 --- a/HTML/index-hi.html +++ b/HTML/index-hi.html @@ -109,7 +109,7 @@ - + diff --git a/HTML/index-hr.html b/HTML/index-hr.html index 2c3ee8c..89ad9a5 100644 --- a/HTML/index-hr.html +++ b/HTML/index-hr.html @@ -109,7 +109,7 @@ - + diff --git a/HTML/index-hu.html b/HTML/index-hu.html index ae5f0fa..3ce6ec1 100644 --- a/HTML/index-hu.html +++ b/HTML/index-hu.html @@ -109,7 +109,7 @@ - + diff --git a/HTML/index-hy.html b/HTML/index-hy.html index 5bf9c57..b4252c9 100644 --- a/HTML/index-hy.html +++ b/HTML/index-hy.html @@ -86,7 +86,7 @@ - + diff --git a/HTML/index-id.html b/HTML/index-id.html index ceb8190..fe6c56c 100644 --- a/HTML/index-id.html +++ b/HTML/index-id.html @@ -109,7 +109,7 @@ - + diff --git a/HTML/index-is.html b/HTML/index-is.html index 34415c7..b0e564c 100644 --- a/HTML/index-is.html +++ b/HTML/index-is.html @@ -109,7 +109,7 @@ - + diff --git a/HTML/index-it.html b/HTML/index-it.html index 1ce880d..8d655cc 100644 --- a/HTML/index-it.html +++ b/HTML/index-it.html @@ -109,7 +109,7 @@ - + diff --git a/HTML/index-ja.html b/HTML/index-ja.html index e923e5b..daaf894 100644 --- a/HTML/index-ja.html +++ b/HTML/index-ja.html @@ -111,7 +111,7 @@ - + diff --git a/HTML/index-ka.html b/HTML/index-ka.html index ad27b54..c5d9d33 100644 --- a/HTML/index-ka.html +++ b/HTML/index-ka.html @@ -109,7 +109,7 @@ - + diff --git a/HTML/index-ky.html b/HTML/index-ky.html index a09887a..66fca47 100644 --- a/HTML/index-ky.html +++ b/HTML/index-ky.html @@ -109,7 +109,7 @@ - + diff --git a/HTML/index-lt.html b/HTML/index-lt.html index 0ace25e..7895b0b 100644 --- a/HTML/index-lt.html +++ b/HTML/index-lt.html @@ -109,7 +109,7 @@ - + diff --git a/HTML/index-ltg.html b/HTML/index-ltg.html index 64f4285..6f262db 100644 --- a/HTML/index-ltg.html +++ b/HTML/index-ltg.html @@ -109,7 +109,7 @@ - + diff --git a/HTML/index-mk.html b/HTML/index-mk.html index 1cb68e9..edeaa81 100644 --- a/HTML/index-mk.html +++ b/HTML/index-mk.html @@ -109,7 +109,7 @@ - + diff --git a/HTML/index-ms.html b/HTML/index-ms.html index 3f71e33..310ec00 100644 --- a/HTML/index-ms.html +++ b/HTML/index-ms.html @@ -109,7 +109,7 @@ - + diff --git a/HTML/index-mt.html b/HTML/index-mt.html index c0bd358..664284c 100644 --- a/HTML/index-mt.html +++ b/HTML/index-mt.html @@ -109,7 +109,7 @@ - + diff --git a/HTML/index-nb.html b/HTML/index-nb.html index 320d028..7ab95cf 100644 --- a/HTML/index-nb.html +++ b/HTML/index-nb.html @@ -109,7 +109,7 @@ - + diff --git a/HTML/index-nl.html b/HTML/index-nl.html index f27d463..0b3b2c9 100644 --- a/HTML/index-nl.html +++ b/HTML/index-nl.html @@ -109,7 +109,7 @@ - + diff --git a/HTML/index-nn.html b/HTML/index-nn.html index 1633133..24982ea 100644 --- a/HTML/index-nn.html +++ b/HTML/index-nn.html @@ -109,7 +109,7 @@ - + diff --git a/HTML/index-pa_IN.html b/HTML/index-pa_IN.html index bba9558..3b18c5a 100644 --- a/HTML/index-pa_IN.html +++ b/HTML/index-pa_IN.html @@ -109,7 +109,7 @@ - + diff --git a/HTML/index-pl.html b/HTML/index-pl.html index 38d482d..ff818da 100644 --- a/HTML/index-pl.html +++ b/HTML/index-pl.html @@ -109,7 +109,7 @@ - + diff --git a/HTML/index-pt.html b/HTML/index-pt.html index 49ed4fd..125ab5a 100644 --- a/HTML/index-pt.html +++ b/HTML/index-pt.html @@ -109,7 +109,7 @@ - + diff --git a/HTML/index-pt_BR.html b/HTML/index-pt_BR.html index 8bbfdde..b2fbd9a 100644 --- a/HTML/index-pt_BR.html +++ b/HTML/index-pt_BR.html @@ -109,7 +109,7 @@ - + diff --git a/HTML/index-ro.html b/HTML/index-ro.html index c5b7a8c..29ace7e 100644 --- a/HTML/index-ro.html +++ b/HTML/index-ro.html @@ -109,7 +109,7 @@ - + diff --git a/HTML/index-ru.html b/HTML/index-ru.html index f32e095..215e805 100644 --- a/HTML/index-ru.html +++ b/HTML/index-ru.html @@ -109,7 +109,7 @@ - + diff --git a/HTML/index-sc.html b/HTML/index-sc.html index d0ec499..ba312c9 100644 --- a/HTML/index-sc.html +++ b/HTML/index-sc.html @@ -109,7 +109,7 @@ - + diff --git a/HTML/index-sk.html b/HTML/index-sk.html index c28c6c9..6cac5b4 100644 --- a/HTML/index-sk.html +++ b/HTML/index-sk.html @@ -109,7 +109,7 @@ - + diff --git a/HTML/index-sl.html b/HTML/index-sl.html index 394dc44..af4c049 100644 --- a/HTML/index-sl.html +++ b/HTML/index-sl.html @@ -109,7 +109,7 @@ - + diff --git a/HTML/index-sr.html b/HTML/index-sr.html index 632444e..c43d738 100644 --- a/HTML/index-sr.html +++ b/HTML/index-sr.html @@ -109,7 +109,7 @@ - + diff --git a/HTML/index-sr@Latn.html b/HTML/index-sr@Latn.html index 4c40139..e81c867 100644 --- a/HTML/index-sr@Latn.html +++ b/HTML/index-sr@Latn.html @@ -109,7 +109,7 @@ - + diff --git a/HTML/index-sv.html b/HTML/index-sv.html index 9f44b00..92edac6 100644 --- a/HTML/index-sv.html +++ b/HTML/index-sv.html @@ -109,7 +109,7 @@ - + diff --git a/HTML/index-ta.html b/HTML/index-ta.html index 70f2fab..eda0e3b 100644 --- a/HTML/index-ta.html +++ b/HTML/index-ta.html @@ -86,7 +86,7 @@ - + diff --git a/HTML/index-tg.html b/HTML/index-tg.html index f72af79..cfbc33a 100644 --- a/HTML/index-tg.html +++ b/HTML/index-tg.html @@ -109,7 +109,7 @@ - + diff --git a/HTML/index-th.html b/HTML/index-th.html index 5cf17f5..13f0f7d 100644 --- a/HTML/index-th.html +++ b/HTML/index-th.html @@ -109,7 +109,7 @@ - + diff --git a/HTML/index-tl.html b/HTML/index-tl.html index bcc9084..ea9ea49 100644 --- a/HTML/index-tl.html +++ b/HTML/index-tl.html @@ -109,7 +109,7 @@ - + diff --git a/HTML/index-tr.html b/HTML/index-tr.html index 54d2d60..ef6d1b9 100644 --- a/HTML/index-tr.html +++ b/HTML/index-tr.html @@ -86,7 +86,7 @@ - + diff --git a/HTML/index-uk.html b/HTML/index-uk.html index 2e9cd71..1b7e4fd 100644 --- a/HTML/index-uk.html +++ b/HTML/index-uk.html @@ -109,7 +109,7 @@ - + diff --git a/HTML/index-ur.html b/HTML/index-ur.html index 1c5521e..e8bb5eb 100644 --- a/HTML/index-ur.html +++ b/HTML/index-ur.html @@ -109,7 +109,7 @@ - + diff --git a/HTML/index-vi.html b/HTML/index-vi.html index c673697..a6ca75f 100644 --- a/HTML/index-vi.html +++ b/HTML/index-vi.html @@ -109,7 +109,7 @@ - + diff --git a/HTML/index-wa.html b/HTML/index-wa.html index 3af2bc7..cab5d71 100644 --- a/HTML/index-wa.html +++ b/HTML/index-wa.html @@ -109,7 +109,7 @@ - + diff --git a/HTML/index-zh_CN.html b/HTML/index-zh_CN.html index 059a104..48aef9c 100644 --- a/HTML/index-zh_CN.html +++ b/HTML/index-zh_CN.html @@ -109,7 +109,7 @@ - + diff --git a/HTML/index-zh_TW.html b/HTML/index-zh_TW.html index f13bd36..fa2c457 100644 --- a/HTML/index-zh_TW.html +++ b/HTML/index-zh_TW.html @@ -109,7 +109,7 @@ - + diff --git a/indexhtml.spec b/indexhtml.spec index 5c8de3f..e0566a2 100644 --- a/indexhtml.spec +++ b/indexhtml.spec @@ -1,7 +1,7 @@ Summary: Mandrakelinux html welcome page Name: indexhtml Version: 10.2 -Release: 3mdk +Release: 4mdk URL: http://www.mandrakelinux.com/ Requires: wget Source: indexhtml-%version.tar.bz2 @@ -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,6 +58,9 @@ 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 @@ -85,15 +88,19 @@ do fi fi done +%_datadir/mdk/indexhtml/update-indexhtml nonetwork %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 +* Mon Apr 11 2005 Warly 10.2-4mdk +- revert to previous update-indexhtml method + * Thu Mar 31 2005 Pablo Saratxaga 10.2-3mdk - removed update-indexhtml from the rpm, now the network testing is done in testonline.html (loaded trough javascript) diff --git a/update-indexhtml b/update-indexhtml index db485a3..fa2cbae 100755 --- a/update-indexhtml +++ b/update-indexhtml @@ -35,7 +35,7 @@ fi ( if [ "$1" != nonetwork ] && /sbin/ip route | grep -q default; then - URL=http://www.mandrakelinux.com/dist/10.2 + URL=http://www.mandrakelinux.com/dist/2005LE if [ -r /etc/profile.d/proxy.sh ]; then . /etc/profile.d/proxy.sh fi -- cgit v1.2.1