rpms/w3c-markup-validator/devel w3c-markup-validator-1.0-config.patch, NONE, 1.1 w3c-markup-validator-1.0-hanextra.patch, NONE, 1.1 w3c-markup-validator-1.0-syspaths.patch, NONE, 1.1 w3c-markup-validator-1.0-valid-icons.patch, NONE, 1.1 .cvsignore, 1.14, 1.15 sources, 1.14, 1.15 w3c-markup-validator.spec, 1.26, 1.27 w3c-markup-validator-0.8.6-config.patch, 1.1, NONE w3c-markup-validator-0.8.6-hanextra.patch, 1.1, NONE w3c-markup-validator-0.8.6-syspaths.patch, 1.1, NONE w3c-markup-validator-0.8.6-valid-icons.patch, 1.1, NONE w3c-markup-validator-0.8.6-xmlenc.patch, 1.1, NONE
Ville Skyttä
scop at fedoraproject.org
Fri Jun 18 20:29:09 UTC 2010
Author: scop
Update of /cvs/pkgs/rpms/w3c-markup-validator/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv7595
Modified Files:
.cvsignore sources w3c-markup-validator.spec
Added Files:
w3c-markup-validator-1.0-config.patch
w3c-markup-validator-1.0-hanextra.patch
w3c-markup-validator-1.0-syspaths.patch
w3c-markup-validator-1.0-valid-icons.patch
Removed Files:
w3c-markup-validator-0.8.6-config.patch
w3c-markup-validator-0.8.6-hanextra.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
Log Message:
* Fri Jun 18 2010 Ville Skyttä <ville.skytta at iki.fi> - 1.0-1
- Update to 1.0, XML encoding fix applied upstream.
w3c-markup-validator-1.0-config.patch:
validator.conf | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
--- NEW FILE w3c-markup-validator-1.0-config.patch ---
diff -up validator-1.0/htdocs/config/validator.conf~ validator-1.0/htdocs/config/validator.conf
--- validator-1.0/htdocs/config/validator.conf~ 2010-06-15 01:11:45.000000000 +0300
+++ validator-1.0/htdocs/config/validator.conf 2010-06-18 00:39:30.953851443 +0300
@@ -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 = validator
+ #Cache = w3c-markup-validator
# configuration file for HTML Tidy Module, if available
TidyConf = $Base/htdocs/config/tidy.conf
@@ -79,11 +79,11 @@ Max Recursion = 0
#
# Email address of the maintainer of this service.
-Maintainer = www-validator at w3.org
+Maintainer = root at localhost
#
# The "Home Page" for the service. Make sure this ends with a slash.
-Home Page = http://validator.w3.org/
+Home Page = http://localhost/w3c-validator/
# Localization
# only English available for now
w3c-markup-validator-1.0-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-1.0-hanextra.patch ---
diff -up validator-1.0/htdocs/charset-select.html~ validator-1.0/htdocs/charset-select.html
--- validator-1.0/htdocs/charset-select.html~ 2007-07-20 04:24:59.000000000 +0300
+++ validator-1.0/htdocs/charset-select.html 2010-06-18 00:42:18.466848243 +0300
@@ -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-1.0/htdocs/config/charset.cfg~ validator-1.0/htdocs/config/charset.cfg
--- validator-1.0/htdocs/config/charset.cfg~ 2010-06-15 01:11:45.000000000 +0300
+++ validator-1.0/htdocs/config/charset.cfg 2010-06-18 00:42:20.376848069 +0300
@@ -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-1.0/httpd/cgi-bin/check~ validator-1.0/httpd/cgi-bin/check
--- validator-1.0/httpd/cgi-bin/check~ 2010-06-15 01:11:55.000000000 +0300
+++ validator-1.0/httpd/cgi-bin/check 2010-06-18 00:42:14.927845641 +0300
@@ -47,8 +47,6 @@ use Config qw(%Config);
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::HeadParser 3.60 qw(); # Needed for HTML5 meta charset workaround
@@ -205,6 +203,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-1.0/share/templates/en_US/popup_charset.tmpl~ validator-1.0/share/templates/en_US/popup_charset.tmpl
--- validator-1.0/share/templates/en_US/popup_charset.tmpl~ 2007-07-20 04:25:00.000000000 +0300
+++ validator-1.0/share/templates/en_US/popup_charset.tmpl 2010-06-18 00:42:13.143847994 +0300
@@ -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-1.0-syspaths.patch:
check | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
--- NEW FILE w3c-markup-validator-1.0-syspaths.patch ---
diff -up validator-1.0/httpd/cgi-bin/check~ validator-1.0/httpd/cgi-bin/check
--- validator-1.0/httpd/cgi-bin/check~ 2010-06-15 01:11:55.000000000 +0300
+++ validator-1.0/httpd/cgi-bin/check 2010-06-18 00:58:25.646846413 +0300
@@ -219,7 +219,7 @@ EOF
# SGML open catalogs but they don't seem to work (again as of 1.70 and
# 2.7.7); if we use xml.soc here, no entities seem to end up being resolved
# from it - so we use a (redundant) XML catalog which works.
- local $ENV{XML_CATALOG_FILES} =
+ local $ENV{XML_CATALOG_FILES} = "/etc/xml/catalog:" .
catfile($CFG->{Paths}->{SGML}->{Library}, 'catalog.xml');
require XML::LibXML;
XML::LibXML->VERSION(1.70); # Need 1.70 for (working) structured errors
@@ -1386,7 +1386,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);
@@ -2048,6 +2049,7 @@ sub xml_jail_match
# Do not trap file URIs within our jail.
for my $dir ($CFG->{Paths}->{SGML}->{Library},
+ '/etc/xml', '/usr/share/xml', '/usr/share/sgml',
split(/\Q$Config{path_sep}\E/o, $ENV{SGML_SEARCH_PATH} || ''))
{
next unless $dir;
w3c-markup-validator-1.0-valid-icons.patch:
config/types.conf | 46 ----------------------------------------------
docs/help.html | 2 +-
2 files changed, 1 insertion(+), 47 deletions(-)
--- NEW FILE w3c-markup-validator-1.0-valid-icons.patch ---
diff -up validator-1.0/htdocs/config/types.conf~ validator-1.0/htdocs/config/types.conf
--- validator-1.0/htdocs/config/types.conf~ 2010-06-15 01:11:45.000000000 +0300
+++ validator-1.0/htdocs/config/types.conf 2010-06-18 00:48:40.806847363 +0300
@@ -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
@@ -637,8 +599,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
@@ -667,8 +627,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
@@ -695,8 +653,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
@@ -722,8 +678,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-1.0/htdocs/docs/help.html~ validator-1.0/htdocs/docs/help.html
--- validator-1.0/htdocs/docs/help.html~ 2007-07-06 08:45:50.000000000 +0300
+++ validator-1.0/htdocs/docs/help.html 2010-06-18 00:48:38.679847453 +0300
@@ -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
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/w3c-markup-validator/devel/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- .cvsignore 9 Mar 2010 19:47:09 -0000 1.14
+++ .cvsignore 18 Jun 2010 20:29:08 -0000 1.15
@@ -1 +1 @@
-w3c-markup-validator-0.8.6.tar.xz
+w3c-markup-validator-1.0.tar.xz
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/w3c-markup-validator/devel/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- sources 9 Mar 2010 19:47:09 -0000 1.14
+++ sources 18 Jun 2010 20:29:08 -0000 1.15
@@ -1 +1 @@
-a420893da42384c0a5d9fb02a0d1e8b1 w3c-markup-validator-0.8.6.tar.xz
+5de17a8d57ebe79f51170d09865d5a5c w3c-markup-validator-1.0.tar.xz
Index: w3c-markup-validator.spec
===================================================================
RCS file: /cvs/pkgs/rpms/w3c-markup-validator/devel/w3c-markup-validator.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- w3c-markup-validator.spec 9 Mar 2010 19:47:10 -0000 1.26
+++ w3c-markup-validator.spec 18 Jun 2010 20:29:09 -0000 1.27
@@ -1,5 +1,5 @@
Name: w3c-markup-validator
-Version: 0.8.6
+Version: 1.0
Release: 1%{?dist}
Summary: W3C Markup Validator
@@ -10,25 +10,25 @@ URL: http://validator.w3.org/
Source0: %{name}-%{version}.tar.xz
Source99: %{name}-prepare-tarball.sh
# Not upstreamable
-Patch0: %{name}-0.8.6-config.patch
+Patch0: %{name}-1.0-config.patch
# Not upstreamable
-Patch1: %{name}-0.8.6-syspaths.patch
+Patch1: %{name}-1.0-syspaths.patch
# Not upstreamable,
# https://www.redhat.com/archives/fedora-legal-list/2009-February/msg00015.html
-Patch2: %{name}-0.8.6-valid-icons.patch
+Patch2: %{name}-1.0-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
+Patch4: %{name}-1.0-hanextra.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
BuildRequires: %{__perl}
Requires: httpd
Requires: %{name}-libs = %{version}
+# Not autodetected
+Requires: perl(XML::LibXML) >= 1.70
Requires(hint): perl(HTML::Tidy)
%description
@@ -54,7 +54,6 @@ rm -r htdocs/sgml-lib/REC-html401-199912
rm -r htdocs/sgml-lib/REC-xhtml1-20020801
rm htdocs/images/markup_validation_service.psd
-%patch5 -p1
%patch0 -p1
%patch1 -p1
%patch2 -p1
@@ -146,6 +145,9 @@ done
%changelog
+* Fri Jun 18 2010 Ville Skyttä <ville.skytta at iki.fi> - 1.0-1
+- Update to 1.0, XML encoding fix applied upstream.
+
* Tue Mar 9 2010 Ville Skyttä <ville.skytta at iki.fi> - 0.8.6-1
- Update to 0.8.6 + upstream XML encoding fix.
--- w3c-markup-validator-0.8.6-config.patch DELETED ---
--- w3c-markup-validator-0.8.6-hanextra.patch DELETED ---
--- w3c-markup-validator-0.8.6-syspaths.patch DELETED ---
--- w3c-markup-validator-0.8.6-valid-icons.patch DELETED ---
--- w3c-markup-validator-0.8.6-xmlenc.patch DELETED ---
More information about the perl-devel
mailing list