X-Git-Url: http://git.jankratochvil.net/?p=www.jankratochvil.net.git;a=blobdiff_plain;f=project%2Fcaptive%2FIndex.html.pl;h=b2c8942577c051676e25fc07eb9315fc5bd4dacd;hp=dfbe40b76dca03038db9e07fff538d9d9053913d;hb=aae071f300fdb49e4a02c84a47189b0b478b9e53;hpb=cb491a10d4cdf0d00ba018af82dcdec66216d76e

diff --git a/project/captive/Index.html.pl b/project/captive/Index.html.pl
index dfbe40b..b2c8942 100755
--- a/project/captive/Index.html.pl
+++ b/project/captive/Index.html.pl
@@ -42,7 +42,6 @@ my $W=My::Project->init_project(
 table.mailman > * /* FIXME: What is it? */ > tr > th,
 table.mailman > * /* FIXME: What is it? */ > tr > td { padding: 1ex; text-align: center; }
 ",
-		"no_job"=>1,
 		);
 
 
@@ -71,8 +70,17 @@ print rightimg((map("<p class=\"stuff\">$_</p>\n",($stuff[int rand @stuff])))[0]
 
 print <<"HERE";
 
+
 @{[ vskip "3ex" ]}
 
+<p class="stuff">
+	Why did I install Microsoft Windows and wrote such disgusting piece of code?<br />
+	Expecting @{[ a_href $W->{"resume_url"},"yet another challenging task" ]}!
+</p>
+
+@{[ vskip "3ex" ]}
+
+
 <table border="1" align="center" style="text-align: center;" width="100%"><tr><th>Distribution</th>
 		<th>Installation Case #1<br />Filesystem and installer<br />(recommended)</th>
 		<th>Installation Case #2<br />Manual installation<br />(filesystem, expert user)</th>
@@ -84,13 +92,12 @@ my %pkg=(
 		3=>[qw(captive)],
 		);
 my %reqpkg=(
-		1=>[qw(glib2 gnome-vfs2 ORBit2 libxml2 openssl popt          libgnomeui)],
-		2=>[qw(glib2 gnome-vfs2 ORBit2 libxml2 openssl popt)],
-		3=>[qw(glib2 gnome-vfs2 ORBit2 libxml2 openssl popt readline)],
+		1 =>[qw(glib2 gnome-vfs2 ORBit2 libxml2 openssl popt readline libgnomeui)],
+		23=>[qw(glib2 gnome-vfs2 ORBit2 libxml2 openssl popt readline)],
 		);
 my %version=(
 		map(($_=>["0.9.7","0"]),qw(captive captive-lufs captive-install)),
-		"lufs"=>["0.9.6","1captive5"],
+		"lufs"=>["0.9.6","1captive6"],
 		"gnome-vfs-httpcaptive"=>["2.3.8captive2","0"],
 		"ntfsprogs"=>["200309071734","1captive1"],
 		"ntfsprogs-gnomevfs"=>["1.0.1","0"],
@@ -125,6 +132,8 @@ my($file_base,$text,%args)=@_;
 	return a_href $file_base,$text,"size"=>($case==1),%args;
 };
 
+my @libxml2_rh8_pkgs=qw(libxml2-2.5.4-1.i386.rpm libxml2-python-2.5.4-1.i386.rpm libxml2-devel-2.5.4-1.i386.rpm);
+
 my @dist=(
 		{
 			"name"=>"Red Hat 9<br />Shrike i386",
@@ -138,7 +147,8 @@ my @dist=(
 				},
 			},
 		{
-			"name"=>"Red Hat 8<br />Psyche i386",
+			"name"=>"Red Hat 8<br />Psyche i386<br />"
+					."(".a_href("#libxml2_rh8","libxml2 upgrade note").")",
 			"out"=>sub {
 				my($pkg,$version_base,$version_ext)=@_;
 					my $file="$pkg-$version_base-$version_ext".(!$has_rh8{$pkg} ? "" : "rh8").".i386.rpm";
@@ -146,7 +156,7 @@ my @dist=(
 					(my $filedev=$file)=~s/^\Q$pkg\E-/${pkg}-devel-/;
 					$r.="<br />".&$a_href_arch("dist/$filedev",$filedev) if $has_devel{$pkg};
 					if ($pkg eq "captive-install") {
-						for (qw(libxml2-2.5.4-1.i386.rpm libxml2-python-2.5.4-1.i386.rpm libxml2-devel-2.5.4-1.i386.rpm)) {
+						for (@libxml2_rh8_pkgs) {
 							$r.="<br />".&$a_href_arch('ftp://ftp.redhat.com/pub/redhat/linux/9/en/os/i386/RedHat/RPMS/'.$_,$_)." of Red Hat 9";
 							}
 						}
@@ -211,13 +221,31 @@ for my $dist (@dist) {
 			}
 	print "</tr>\n";
 	}
-print <<'HERE';
+print "<tr style=\"height: 2ex;\"></tr>\n";
+print "<tr>";
+	print "<td>Package Requirements</td>";
+	for my $case (1,23) {
+		print "<td".($case==23 ? ' colspan="2"' : '').">";
+		print join(", ",map("<span class=\"reqpkg\">$_</span>",@{$reqpkg{$case}}));
+		print "</td>";
+		}
+print "</tr>\n";
+print <<"HERE";
 </table>
-HERE
 
-print vskip "3ex";
+<blockquote>
+	<p><a name="libxml2_rh8"><b><i>Red Hat 8 Psyche</i> upgrade of <i>libxml2</i> package:</b></a>
+	Upgrade only the packages already installed on your system to prevent
+	many dependency requirements - do not use &quot;<code>rpm -U</code>&quot;,
+	use &quot;<code>rpm -F</code>&quot; instead:</p>
+	<blockquote><p class="quote">
+		<code>rpm -F @{[ join(" ",@libxml2_rh8_pkgs) ]}</code>
+	</p></blockquote>
+</blockquote>
+
+@{[ vskip "3ex" ]}
+
 
-print <<"HERE";
 <h1>Installation Notes</h1>
 
 <p>You should first run <b>captive-install-acquire</b> command to check your
@@ -356,7 +384,7 @@ print <<"HERE";
 		<li>@{[ a_href 'doc/LinuxNTFS.html.pl',"Re: 7.7 Can't we write a wrapper for Windows' driver?" ]}</li>
 		</ul></li>
 	<li>@{[ a_href 'http://cvs.jankratochvil.net/viewcvs/*checkout*/priv/captive/TODO?rev=HEAD','Known Bugs' ]}</li>
-	<li>Man pages<ul>
+	<li>Man Pages<ul>
 		@{[
 			do {
 				my @mans=(
@@ -381,13 +409,6 @@ print <<"HERE";
 	<li>@{[ a_href 'Resources.html.pl','Related Pages' ]}</li>
 	<li>@{[ a_href 'Thanks.html.pl','Thanks' ]}</li>
 </ul>
-
-@{[ vskip "3ex" ]}
-
-<p class="stuff">
-	Why did I install Microsoft Windows and wrote such disgusting piece of code?<br />
-	Expecting @{[ a_href $W->{"resume_url"},"yet another challenging task" ]}!
-</p>
 HERE