Author: gnat Update of /cvs/pkgs/rpms/w3c-markup-validator/EL-5 In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv11972 Modified Files: .cvsignore sources w3c-markup-validator.spec Added Files: w3c-markup-validator-0.8.6-config.patch w3c-markup-validator-0.8.6-hanextra.patch w3c-markup-validator-0.8.6-iso-html.patch w3c-markup-validator-0.8.6-syspaths.patch w3c-markup-validator-0.8.6-valid-icons.patch w3c-markup-validator-0.8.6-xmlenc.patch Removed Files: w3c-markup-validator-0.7.2-config.patch w3c-markup-validator-0.7.3-html401.patch w3c-markup-validator-0.7.3-syspaths.patch w3c-markup-validator-0.7.3-xhtml1.patch Log Message: sync up with devel w3c-markup-validator-0.8.6-config.patch: validator.conf | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) --- NEW FILE w3c-markup-validator-0.8.6-config.patch --- diff -up validator-0.8.6/htdocs/config/validator.conf~ validator-0.8.6/htdocs/config/validator.conf --- validator-0.8.6/htdocs/config/validator.conf~ 2009-12-11 20:58:48.000000000 +0200 +++ validator-0.8.6/htdocs/config/validator.conf 2010-03-09 20:50:10.000000000 +0200 @@ -21,7 +21,7 @@ # # Base path. Defaults to the value of the W3C_VALIDATOR_HOME environment # variable or /usr/local/validator if the variable does not exist. - Base = /home/link/web/HEAD + #Base = /usr/local/validator # # Location of template files @@ -33,7 +33,7 @@ # are not cached at all if this option is empty or not set, except # with mod_perl setups where this option has no effect and templates # are always cached in memory. - Cache = /var/tmp/wmvs-HEAD + #Cache = w3c-markup-validator # configuration file for HTML Tidy Module, if available TidyConf = $Base/htdocs/config/tidy.conf @@ -56,7 +56,7 @@ Enable Debug = no # # Whether private RFC1918 addresses are allowed. -Allow Private IPs = yes +Allow Private IPs = no # # Enable (or not) the web service API for this validator @@ -68,22 +68,22 @@ Enable SOAP = yes # Whether the validator will check its own output. # 0 means it will refuse to check its own output, 1 means it will but it will # refuse to check the results of it checking itself. Etc. -Max Recursion = 2 +Max Recursion = 0 # # Protocols the validator is allowed to use for retrieving documents. # The default is to allow http and https. <Protocols> - Allow = data,http,https + Allow = data,http,https,ftp </Protocols> # # Email address of the maintainer of this service. -Maintainer = www-validator@xxxxxx +Maintainer = root@localhost # # The "Home Page" for the service. Make sure this ends with a slash. -Home Page = http://qa-dev.w3.org/wmvs/HEAD/ +Home Page = http://localhost/w3c-validator/ # Localization # only English available for now @@ -133,7 +133,6 @@ Languages = en ## The example config below assumes that you have installed the validator.nu ## engine on the same machine as the markup validator. ## See http://about.validator.nu/ for installation instructions. -HTML5 = http://localhost:8888/html5/ -#HTML5 = http://validator.nu/ +#HTML5 = http://localhost:8888/html5/ #CompoundXML = http://localhost:8888/ </External> w3c-markup-validator-0.8.6-hanextra.patch: htdocs/charset-select.html | 2 +- htdocs/config/charset.cfg | 2 +- httpd/cgi-bin/check | 6 ++++-- share/templates/en_US/popup_charset.tmpl | 2 +- 4 files changed, 7 insertions(+), 5 deletions(-) --- NEW FILE w3c-markup-validator-0.8.6-hanextra.patch --- diff -up validator-0.8.6/htdocs/charset-select.html~ validator-0.8.6/htdocs/charset-select.html --- validator-0.8.6/htdocs/charset-select.html~ 2007-07-20 04:30:06.000000000 +0300 +++ validator-0.8.6/htdocs/charset-select.html 2010-03-09 20:53:10.000000000 +0200 @@ -25,7 +25,7 @@ <option value="euc-kr">euc-kr (Korean)</option> <option value="ksc_5601">ksc_5601 (Korean)</option> <option value="gb2312">gb2312 (Chinese, simplified)</option> - <option value="gb18030">gb18030 (Chinese, simplified)</option> + <!--option value="gb18030">gb18030 (Chinese, simplified)</option--> <option value="big5">big5 (Chinese, traditional)</option> <option value="big5-HKSCS">Big5-HKSCS (Chinese, Hong Kong)</option> <option value="tis-620">tis-620 (Thai)</option> diff -up validator-0.8.6/htdocs/config/charset.cfg~ validator-0.8.6/htdocs/config/charset.cfg --- validator-0.8.6/htdocs/config/charset.cfg~ 2009-09-15 11:59:31.000000000 +0300 +++ validator-0.8.6/htdocs/config/charset.cfg 2010-03-09 20:53:22.000000000 +0200 @@ -54,7 +54,7 @@ big5 = 1 big5-hkscs = 1 iso-2022-kr = 1 euc-kr = 1 -gb18030 = 1 +#gb18030 = 1 # 0xA0 is U+00A0 in ISO-8859-11 but undefined in tis-620 # other than that the character encodings are equivalent tis-620 = A iso-8859-11 diff -up validator-0.8.6/httpd/cgi-bin/check~ validator-0.8.6/httpd/cgi-bin/check --- validator-0.8.6/httpd/cgi-bin/check~ 2010-01-26 22:30:11.000000000 +0200 +++ validator-0.8.6/httpd/cgi-bin/check 2010-03-09 20:54:21.000000000 +0200 @@ -46,8 +46,6 @@ use CGI::Carp qw(carp croak fatalsToBrow use Config::General 2.32 qw(); # Need 2.32 for <msg 0>, rt.cpan.org#17852 use Encode qw(); use Encode::Alias qw(); -use Encode::HanExtra qw(); # for some chinese character encodings, - # e.g gb18030 use File::Spec::Functions qw(catfile rel2abs tmpdir); use HTML::Encoding 0.52 qw(); use HTML::Parser 3.24 qw(); # Need 3.24 for $p->parse($code_ref) @@ -203,6 +201,10 @@ EOF eval { local $SIG{__DIE__} = undef; + require Encode::HanExtra; # for some chinese character encodings, e.g gb18030 + }; + eval { + local $SIG{__DIE__} = undef; require Encode::JIS2K; # for optional extra Japanese encodings }; diff -up validator-0.8.6/share/templates/en_US/popup_charset.tmpl~ validator-0.8.6/share/templates/en_US/popup_charset.tmpl --- validator-0.8.6/share/templates/en_US/popup_charset.tmpl~ 2007-07-20 04:30:07.000000000 +0300 +++ validator-0.8.6/share/templates/en_US/popup_charset.tmpl 2010-03-09 20:54:30.000000000 +0200 @@ -24,7 +24,7 @@ <option value="iso-2022-jp" <TMPL_IF NAME="override charset iso-2022-jp">selected="selected"</TMPL_IF>>iso-2022-jp (Japanese, email)</option> <option value="euc-kr" <TMPL_IF NAME="override charset euc-kr">selected="selected"</TMPL_IF>>euc-kr (Korean)</option> <option value="gb2312" <TMPL_IF NAME="override charset gb2312">selected="selected"</TMPL_IF>>gb2312 (Chinese, simplified)</option> - <option value="gb18030" <TMPL_IF NAME="override charset gb18030">selected="selected"</TMPL_IF>>gb18030 (Chinese, simplified)</option> + <!--option value="gb18030" <TMPL_IF NAME="override charset gb18030">selected="selected"</TMPL_IF>>gb18030 (Chinese, simplified)</option--> <option value="big5" <TMPL_IF NAME="override charset big5">selected="selected"</TMPL_IF>>big5 (Chinese, traditional)</option> <option value="big5-HKSCS" <TMPL_IF NAME="override charset big5-HKSCS">selected="selected"</TMPL_IF>>Big5-HKSCS (Chinese, Hong Kong)</option> <option value="tis-620" <TMPL_IF NAME="override charset tis-620">selected="selected"</TMPL_IF>>tis-620 (Thai)</option> w3c-markup-validator-0.8.6-iso-html.patch: sgml.soc | 4 ---- 1 file changed, 4 deletions(-) --- NEW FILE w3c-markup-validator-0.8.6-iso-html.patch --- diff -up validator-0.8.6/htdocs/sgml-lib/sgml.soc~ validator-0.8.6/htdocs/sgml-lib/sgml.soc --- validator-0.8.6/htdocs/sgml-lib/sgml.soc~ 2009-09-15 11:59:31.000000000 +0300 +++ validator-0.8.6/htdocs/sgml-lib/sgml.soc 2010-03-09 20:56:00.000000000 +0200 @@ -107,10 +107,6 @@ PUBLIC "-//W3C//ENTITIES Symbols//EN//HT -- ISO-HTML -- -PUBLIC "ISO/IEC 15445:2000//DTD HyperText Markup Language//EN" - "ISO-HTML/15445.dtd" -PUBLIC "ISO/IEC 15445:2000//DTD HTML//EN" - "ISO-HTML/15445.dtd" PUBLIC "-//W3C//ENTITIES Full Latin 1//EN//HTML" "REC-html401-19991224/HTMLlat1.ent" PUBLIC "-//W3C//ENTITIES Symbolic//EN//HTML" w3c-markup-validator-0.8.6-syspaths.patch: check | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) --- NEW FILE w3c-markup-validator-0.8.6-syspaths.patch --- diff -up validator-0.8.6/httpd/cgi-bin/check.orig validator-0.8.6/httpd/cgi-bin/check --- validator-0.8.6/httpd/cgi-bin/check.orig 2010-01-26 22:30:11.000000000 +0200 +++ validator-0.8.6/httpd/cgi-bin/check 2010-03-09 21:10:04.000000000 +0200 @@ -1371,7 +1371,8 @@ sub dtd_validate (\$) # # Parser configuration - $opensp->search_dirs($CFG->{Paths}->{SGML}->{Library}); + $opensp->search_dirs($CFG->{Paths}->{SGML}->{Library}, + '/usr/share/xml', '/usr/share/sgml'); $opensp->catalogs($catalog); $opensp->show_error_numbers(1); $opensp->warnings(@spopt); w3c-markup-validator-0.8.6-valid-icons.patch: config/types.conf | 46 ---------------------------------------------- docs/help.html | 2 +- 2 files changed, 1 insertion(+), 47 deletions(-) --- NEW FILE w3c-markup-validator-0.8.6-valid-icons.patch --- diff -up validator-0.8.6/htdocs/config/types.conf~ validator-0.8.6/htdocs/config/types.conf --- validator-0.8.6/htdocs/config/types.conf~ 2009-11-13 21:24:17.000000000 +0200 +++ validator-0.8.6/htdocs/config/types.conf 2010-03-09 20:59:14.000000000 +0200 @@ -31,8 +31,6 @@ <Badge> URI = http://www.w3.org/Icons/valid-html20 ALT URI = http://www.w3.org/Icons/valid-html20-blue - Local URI = images/valid_icons/valid-html20 - Local ALT URI = images/valid_icons/valid-html20-blue </Badge> </HTML_2_0> @@ -49,8 +47,6 @@ <Badge> URI = http://www.w3.org/Icons/valid-html20 ALT URI = http://www.w3.org/Icons/valid-html20-blue - Local URI = images/valid_icons/valid-html20 - Local ALT URI = images/valid_icons/valid-html20-blue </Badge> </HTML_2_0_Level_2> @@ -67,8 +63,6 @@ <Badge> URI = http://www.w3.org/Icons/valid-html20 ALT URI = http://www.w3.org/Icons/valid-html20-blue - Local URI = images/valid_icons/valid-html20 - Local ALT URI = images/valid_icons/valid-html20-blue </Badge> </HTML_2_0_Strict> @@ -85,8 +79,6 @@ <Badge> URI = http://www.w3.org/Icons/valid-html20 ALT URI = http://www.w3.org/Icons/valid-html20-blue - Local URI = images/valid_icons/valid-html20 - Local ALT URI = images/valid_icons/valid-html20-blue </Badge> </HTML_2_0_Level_1> @@ -103,8 +95,6 @@ <Badge> URI = http://www.w3.org/Icons/valid-html20 ALT URI = http://www.w3.org/Icons/valid-html20-blue - Local URI = images/valid_icons/valid-html20 - Local ALT URI = images/valid_icons/valid-html20-blue </Badge> </HTML_2_0_Strict_Level_1> @@ -124,8 +114,6 @@ <Badge> URI = http://www.w3.org/Icons/valid-html32 ALT URI = http://www.w3.org/Icons/valid-html32-blue - Local URI = images/valid_icons/valid-html32 - Local ALT URI = images/valid_icons/valid-html32-blue Height = 31 Width = 88 </Badge> @@ -149,8 +137,6 @@ <Badge> URI = http://www.w3.org/Icons/valid-html40 ALT URI = http://www.w3.org/Icons/valid-html40-blue - Local URI = images/valid_icons/valid-html40 - Local ALT URI = images/valid_icons/valid-html40-blue Height = 31 Width = 88 Alt = Valid HTML 4.0 Strict @@ -171,8 +157,6 @@ <Badge> URI = http://www.w3.org/Icons/valid-html40 ALT URI = http://www.w3.org/Icons/valid-html40-blue - Local URI = images/valid_icons/valid-html40 - Local ALT URI = images/valid_icons/valid-html40-blue Height = 31 Width = 88 Alt = Valid HTML 4.0 Transitional @@ -193,8 +177,6 @@ <Badge> URI = http://www.w3.org/Icons/valid-html40 ALT URI = http://www.w3.org/Icons/valid-html40-blue - Local URI = images/valid_icons/valid-html40 - Local ALT URI = images/valid_icons/valid-html40-blue Height = 31 Width = 88 Alt = Valid HTML 4.0 Frameset @@ -215,8 +197,6 @@ <Badge> URI = http://www.w3.org/Icons/valid-html401 ALT URI = http://www.w3.org/Icons/valid-html401-blue - Local URI = images/valid_icons/valid-html401 - Local ALT URI = images/valid_icons/valid-html401-blue Height = 31 Width = 88 Alt = Valid HTML 4.01 Strict @@ -237,8 +217,6 @@ <Badge> URI = http://www.w3.org/Icons/valid-html401 ALT URI = http://www.w3.org/Icons/valid-html401-blue - Local URI = images/valid_icons/valid-html401 - Local ALT URI = images/valid_icons/valid-html401-blue Height = 31 Width = 88 Alt = Valid HTML 4.01 Transitional @@ -259,8 +237,6 @@ <Badge> URI = http://www.w3.org/Icons/valid-html401 ALT URI = http://www.w3.org/Icons/valid-html401-blue - Local URI = images/valid_icons/valid-html401 - Local ALT URI = images/valid_icons/valid-html401-blue Height = 31 Width = 88 Alt = Valid HTML 4.01 Frameset @@ -297,8 +273,6 @@ <Badge> URI = http://www.w3.org/Icons/valid-xhtml10 ALT URI = http://www.w3.org/Icons/valid-xhtml10-blue - Local URI = images/valid_icons/valid-xhtml10 - Local ALT URI = images/valid_icons/valid-xhtml10-blue Height = 31 Width = 88 Alt = Valid XHTML 1.0 Strict @@ -322,8 +296,6 @@ <Badge> URI = http://www.w3.org/Icons/valid-xhtml10 ALT URI = http://www.w3.org/Icons/valid-xhtml10-blue - Local URI = images/valid_icons/valid-xhtml10 - Local ALT URI = images/valid_icons/valid-xhtml10-blue Height = 31 Width = 88 Alt = Valid XHTML 1.0 Transitional @@ -347,8 +319,6 @@ <Badge> URI = http://www.w3.org/Icons/valid-xhtml10 ALT URI = http://www.w3.org/Icons/valid-xhtml10-blue - Local URI = images/valid_icons/valid-xhtml10 - Local ALT URI = images/valid_icons/valid-xhtml10-blue Height = 31 Width = 88 Alt = Valid XHTML 1.0 Frameset @@ -373,8 +343,6 @@ <Badge> URI = http://www.w3.org/Icons/valid-xhtmlbasic10 ALT URI = http://www.w3.org/Icons/valid-xhtmlbasic10-blue - Local URI = images/valid_icons/valid-xhtmlbasic10 - Local ALT URI = images/valid_icons/valid-xhtmlbasic10-blue Height = 31 Width = 88 Alt = Valid XHTML Basic 1.0 @@ -465,8 +433,6 @@ <Badge> URI = http://www.w3.org/Icons/valid-xhtmlprint10 ALT URI = http://www.w3.org/Icons/valid-xhtmlprint10-blue - Local URI = images/valid_icons/valid-xhtmlprint10 - Local ALT URI = images/valid_icons/valid-xhtmlprint10-blue Height = 31 Width = 88 Alt = Valid XHTML-Print 1.0 @@ -490,8 +456,6 @@ <Badge> URI = http://www.w3.org/Icons/valid-xhtml11 ALT URI = http://www.w3.org/Icons/valid-xhtml11-blue - Local URI = images/valid_icons/valid-xhtml11 - Local ALT URI = images/valid_icons/valid-xhtml11-blue Height = 31 Width = 88 Alt = Valid XHTML 1.1 @@ -564,8 +528,6 @@ <Badge> URI = http://www.w3.org/Icons/valid-mathml20 ALT URI = http://www.w3.org/Icons/valid-mathml20-blue - Local URI = images/valid_icons/valid-mathml20 - Local ALT URI = images/valid_icons/valid-mathml20-blue Height = 31 Width = 88 Alt = Valid MathML 2.0 @@ -621,8 +583,6 @@ <Badge> URI = http://www.w3.org/Icons/valid-xhtml-rdfa ALT URI = http://www.w3.org/Icons/valid-xhtml-rdfa-blue - Local URI = images/valid_icons/valid-xhtml-rdfa - Local ALT URI = images/valid_icons/valid-xhtml-rdfa-blue Height = 31 Width = 88 Alt = Valid XHTML + RDFa @@ -651,8 +611,6 @@ <Badge> URI = http://www.w3.org/Icons/valid-svg10 ALT URI = http://www.w3.org/Icons/valid-svg10-blue - Local URI = images/valid_icons/valid-svg10 - Local ALT URI = images/valid_icons/valid-svg10-blue Height = 31 Width = 88 Alt = Valid SVG 1.0 @@ -679,8 +637,6 @@ <Badge> URI = http://www.w3.org/Icons/valid-svg11 ALT URI = http://www.w3.org/Icons/valid-svg11-blue - Local URI = images/valid_icons/valid-svg11 - Local ALT URI = images/valid_icons/valid-svg11-blue Height = 31 Width = 88 Alt = Valid SVG 1.1 @@ -706,8 +662,6 @@ <Badge> URI = http://www.w3.org/Icons/valid-svgtiny11 ALT URI = http://www.w3.org/Icons/valid-svgtiny11-blue - Local URI = images/valid_icons/valid-svgtiny11 - Local ALT URI = images/valid_icons/valid-svgtiny11-blue Height = 31 Width = 88 Alt = Valid SVG 1.1 Tiny diff -up validator-0.8.6/htdocs/docs/help.html~ validator-0.8.6/htdocs/docs/help.html --- validator-0.8.6/htdocs/docs/help.html~ 2007-07-06 09:00:06.000000000 +0300 +++ validator-0.8.6/htdocs/docs/help.html 2010-03-09 21:00:00.000000000 +0200 @@ -333,7 +333,7 @@ mailing-list.</p> <h4 id="icon">"valid" icons</h4> <h5 id="icon-usage">My document is valid, can I use your "valid" icon?</h5> <p> - <img class="inline-badge" src="<!--#echo var="relroot" -->images/valid_icons/valid-xhtml10" alt="Valid XHTML 1.0!" height="31" width="88" /> + <img class="inline-badge" src="http://www.w3.org/Icons/valid-xhtml10"; alt="Valid XHTML 1.0!" height="31" width="88" /> Yes. To show readers that one has taken some care to create an interoperable Web page, a "W3C valid" badge may be displayed (here, the "valid XHTML 1.0" badge) <strong>on any page w3c-markup-validator-0.8.6-xmlenc.patch: check | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- NEW FILE w3c-markup-validator-0.8.6-xmlenc.patch --- diff -up validator-0.8.6/httpd/cgi-bin/check~ validator-0.8.6/httpd/cgi-bin/check --- validator-0.8.6/httpd/cgi-bin/check~ 2010-01-26 22:30:11.000000000 +0200 +++ validator-0.8.6/httpd/cgi-bin/check 2010-03-09 21:31:28.000000000 +0200 @@ -619,7 +619,7 @@ if (&is_xml($File)) { (encoding${xmlws}*=${xmlws}* (?:(["'])[A-Za-z][a-zA-Z0-9_-]+\3) ) - ([^>].*\?>) + (.*?\?>) /$1encoding="UTF-8"$4/sox; # Is the document standalone? Need to check with a regex because Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/w3c-markup-validator/EL-5/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -p -r1.6 -r1.7 --- .cvsignore 15 Nov 2006 18:01:56 -0000 1.6 +++ .cvsignore 12 Apr 2010 20:52:21 -0000 1.7 @@ -1,2 +1 @@ -validator-0_7_4.tar.gz -sgml-lib-0_7_4.tar.gz +w3c-markup-validator-0.8.6.tar.xz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/w3c-markup-validator/EL-5/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -p -r1.6 -r1.7 --- sources 15 Nov 2006 18:01:56 -0000 1.6 +++ sources 12 Apr 2010 20:52:21 -0000 1.7 @@ -1,2 +1 @@ -e5fbda9e67c6d904fca2b80f7052c1e5 validator-0_7_4.tar.gz -bb72a0bb7d31b2ceff13ac966a0ff62f sgml-lib-0_7_4.tar.gz +a420893da42384c0a5d9fb02a0d1e8b1 w3c-markup-validator-0.8.6.tar.xz Index: w3c-markup-validator.spec =================================================================== RCS file: /cvs/pkgs/rpms/w3c-markup-validator/EL-5/w3c-markup-validator.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -p -r1.13 -r1.14 --- w3c-markup-validator.spec 15 Nov 2006 18:01:56 -0000 1.13 +++ w3c-markup-validator.spec 12 Apr 2010 20:52:21 -0000 1.14 @@ -1,26 +1,35 @@ -%{expand: %%define tbver %(echo %{version} | tr . _)} - Name: w3c-markup-validator -Version: 0.7.4 -Release: 1%{?dist} +Version: 0.8.6 +Release: 2%{?dist} Summary: W3C Markup Validator Group: Applications/Internet -License: W3C License +License: W3C URL: http://validator.w3.org/ -Source0: http://validator.w3.org/dist/validator-%{tbver}.tar.gz -Source1: http://validator.w3.org/dist/sgml-lib-%{tbver}.tar.gz -Patch0: %{name}-0.7.2-config.patch -Patch1: %{name}-0.7.3-syspaths.patch -Patch2: %{name}-0.7.3-html401.patch -Patch3: %{name}-0.7.3-xhtml1.patch +# Source0 created with Source99 +Source0: %{name}-%{version}.tar.xz +Source99: %{name}-prepare-tarball.sh +# Not upstreamable +Patch0: %{name}-0.8.6-config.patch +# Not upstreamable +Patch1: %{name}-0.8.6-syspaths.patch +# Not upstreamable, +# https://www.redhat.com/archives/fedora-legal-list/2009-February/msg00015.html +Patch2: %{name}-0.8.6-valid-icons.patch +# Not upstreamable, +# https://www.redhat.com/archives/fedora-legal-list/2009-February/msg00020.html +Patch3: %{name}-0.8.6-iso-html.patch +# Not upstreamable, kept until Encode::HanExtra is packaged +Patch4: %{name}-0.8.6-hanextra.patch +# Post 0.8.6 upstream +Patch5: %{name}-0.8.6-xmlenc.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: %{__perl} Requires: httpd -Requires: opensp >= 1.5 Requires: %{name}-libs = %{version} +Requires(hint): perl(HTML::Tidy) %description The W3C Markup Validator checks documents like HTML and XHTML for @@ -30,31 +39,38 @@ conformance to W3C Recommendations and o Summary: SGML and XML DTDs for the W3C Markup Validator Group: Applications/Text Requires: sgml-common -Requires: html401-dtds /usr/share/sgml/html/4.01 -Requires: xhtml1-dtds /usr/share/sgml/xhtml1/xhtml1-20020801/DTD +Requires: html401-dtds +Requires: xhtml1-dtds >= 1.0-20020801.1 %description libs SGML and XML DTDs for the W3C Markup Validator. %prep -%setup -q -a 1 -n validator-%{version} -rm -rf validator-%{version}/htdocs/sgml-lib/REC-html401-19991224 -rm -rf validator-%{version}/htdocs/sgml-lib/REC-xhtml1-20020801 -mv validator-%{version}/htdocs/sgml-lib . +%setup -q -n validator-%{version} + +# Remove not needed stuff +rm -r htdocs/sgml-lib/REC-html401-19991224 +rm -r htdocs/sgml-lib/REC-xhtml1-20020801 +rm htdocs/images/markup_validation_service.psd + +%patch5 -p1 %patch0 -p1 %patch1 -p1 -%patch2 -p2 -%patch3 -p2 -find . -name "*.orig" -print0 | xargs -0 rm +%patch2 -p1 +%patch3 -p1 +%patch4 -p1 + +mv htdocs/sgml-lib . # Localize configs. %{__perl} -pi -e \ 's|/usr/local/validator\b|%{_datadir}/%{name}|' \ htdocs/config/validator.conf httpd/conf/httpd.conf httpd/cgi-bin/* %{__perl} -pi -e \ - 's|\$base(_path)?/htdocs/sgml-lib|%{_datadir}/sgml/%{name}|i' \ - htdocs/config/validator.conf httpd/cgi-bin/check + 's|\$Base/htdocs/sgml-lib|%{_datadir}/sgml/%{name}| ; + s|\$Base/htdocs/config/tidy\.conf|%{_sysconfdir}/w3c/tidy.conf|' \ + htdocs/config/validator.conf # Move config out of the way mv htdocs/config __config @@ -79,6 +95,9 @@ cp -pR httpd/cgi-bin htdocs share $RPM_B # SGML library install -dm 755 $RPM_BUILD_ROOT%{_datadir}/sgml cp -pR sgml-lib $RPM_BUILD_ROOT%{_datadir}/sgml/%{name} +ln -s ../html/4.01 $RPM_BUILD_ROOT%{_datadir}/sgml/%{name}/REC-html401-19991224 +ln -s ../../xml/xhtml/1.0 \ + $RPM_BUILD_ROOT%{_datadir}/sgml/%{name}/REC-xhtml1-20020801 install -dm 755 $RPM_BUILD_ROOT%{_sysconfdir}/sgml touch $RPM_BUILD_ROOT%{_sysconfdir}/sgml/%{name}-%{version}-%{release}.cat @@ -111,7 +130,13 @@ done %files %defattr(-,root,root,-) %config(noreplace) %{_sysconfdir}/httpd/conf.d/%{name}.conf -%config(noreplace) %{_sysconfdir}/w3c/ +%dir %{_sysconfdir}/w3c/ +%config(noreplace) %{_sysconfdir}/w3c/charset.cfg +%config(noreplace) %{_sysconfdir}/w3c/tidy.conf +%config(noreplace) %{_sysconfdir}/w3c/tips.cfg +# These are incompatible to some extent between releases, check noreplace +%config %{_sysconfdir}/w3c/types.conf +%config(noreplace) %{_sysconfdir}/w3c/validator.conf %{_datadir}/%{name}/ %files libs @@ -121,6 +146,10 @@ done %changelog +* Mon Apr 12 2010 Nathanael Noblet <nathanael@xxxxxxx> - 0.8.5-2 +- Initial EL5 build +- fix symlink to xhtml1-dtds + * Wed Nov 15 2006 Ville Skyttä <ville.skytta at iki.fi> - 0.7.4-1 - 0.7.4. --- w3c-markup-validator-0.7.2-config.patch DELETED --- --- w3c-markup-validator-0.7.3-html401.patch DELETED --- --- w3c-markup-validator-0.7.3-syspaths.patch DELETED --- --- w3c-markup-validator-0.7.3-xhtml1.patch DELETED --- -- Fedora Extras Perl SIG http://www.fedoraproject.org/wiki/Extras/SIGs/Perl perl-devel mailing list perl-devel@xxxxxxxxxxxxxxxxxxxxxxx https://admin.fedoraproject.org/mailman/listinfo/perl-devel
