Tue, 14 Apr 2009 13:13:43 +0200
Correct misaligned image and table in main output page.
webalizer/webalizer.patch | file | annotate | diff | comparison | revisions | |
webalizer/webalizer.spec | file | annotate | diff | comparison | revisions |
1.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 1.2 +++ b/webalizer/webalizer.patch Tue Apr 14 13:13:43 2009 +0200 1.3 @@ -0,0 +1,29 @@ 1.4 +Index: graphs.c 1.5 +diff -Nau graphs.c.orig graphs.c 1.6 +--- graphs.c.orig 2009-04-14 11:58:01.576710518 +0200 1.7 ++++ graphs.c 2009-04-14 12:16:00.411207613 +0200 1.8 +@@ -114,7 +114,7 @@ 1.9 + double fmaxval=0.0; 1.10 + 1.11 + /* initalize the graph */ 1.12 +- init_graph(title,512,256); /* init as 512 x 256 */ 1.13 ++ init_graph(title,@l_gwidth@,256); /* init as @l_gwidth@ x 256 */ 1.14 + 1.15 + gdImageLine(im, 305,25,305,233,black); /* draw section lines */ 1.16 + gdImageLine(im, 304,25,304,233,white); 1.17 +Index: output.c 1.18 +diff -Nau output.c.orig output.c 1.19 +--- output.c.orig 2009-01-13 06:34:04.000000000 +0100 1.20 ++++ output.c 2009-04-14 12:46:38.913442401 +0200 1.21 +@@ -2431,9 +2431,9 @@ 1.22 + 1.23 + /* year graph */ 1.24 + fprintf(out_fp,"<IMG SRC=\"usage.png\" ALT=\"%s\" " \ 1.25 +- "HEIGHT=256 WIDTH=512><P>\n",buffer); 1.26 ++ "HEIGHT=256 WIDTH=@l_gwidth@><P>\n",buffer); 1.27 + /* month table */ 1.28 +- fprintf(out_fp,"<TABLE WIDTH=600 BORDER=2 CELLSPACING=1 CELLPADDING=1>\n"); 1.29 ++ fprintf(out_fp,"<TABLE WIDTH=@l_gwidth@ BORDER=2 CELLSPACING=1 CELLPADDING=1>\n"); 1.30 + fprintf(out_fp,"<TR><TH HEIGHT=4></TH></TR>\n"); 1.31 + fprintf(out_fp,"<TR><TH COLSPAN=11 BGCOLOR=\"%s\" ALIGN=center>",GREY); 1.32 + fprintf(out_fp,"%s</TH></TR>\n",msg_main_sum);
2.1 --- a/webalizer/webalizer.spec Thu Apr 09 15:05:22 2009 +0200 2.2 +++ b/webalizer/webalizer.spec Tue Apr 14 13:13:43 2009 +0200 2.3 @@ -37,17 +37,19 @@ 2.4 Group: Logfile 2.5 License: GPL 2.6 Version: %{V_here} 2.7 -Release: 20090408 2.8 +Release: 20090414 2.9 2.10 # package options 2.11 %option with_dns no 2.12 %option with_geoip no 2.13 +%option with_gwidth 512 2.14 2.15 # list of sources 2.16 Source0: ftp://ftp.mrunix.net/pub/webalizer/webalizer-%{V_real}-src.tgz 2.17 Source1: ftp://ftp.mrunix.net/pub/webalizer/geodb/webalizer-geodb-%{V_geodb}.tgz 2.18 Source2: ftp://ftp.mrunix.net/pub/webalizer/webalizer-flags.tgz 2.19 Source3: rc.webalizer 2.20 +Patch0: webalizer.patch 2.21 2.22 # build information 2.23 Prefix: %{l_prefix} 2.24 @@ -85,6 +87,11 @@ 2.25 %{l_gzip} -d -c %{SOURCE1} | %{l_tar} xf - 2.26 %{l_gzip} -d -c %{SOURCE2} | %{l_tar} xf - 2.27 ) || exit $? 2.28 + %patch -p0 2.29 + %{l_shtool} subst \ 2.30 + -e "s;@l_gwidth@;%{with_gwidth};g" \ 2.31 + graphs.c \ 2.32 + output.c 2.33 2.34 %build 2.35 CC="%{l_cc}" \